git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2071 further refactoring, optimisation, and house keeping for the generic Free...
[jalview.git]
/
src
/
jalview
/
gui
/
StructureChooser.java
diff --git
a/src/jalview/gui/StructureChooser.java
b/src/jalview/gui/StructureChooser.java
index
2d9028a
..
d924e73
100644
(file)
--- a/
src/jalview/gui/StructureChooser.java
+++ b/
src/jalview/gui/StructureChooser.java
@@
-29,7
+29,6
@@
import jalview.datamodel.SequenceI;
import jalview.fts.api.FTSData;
import jalview.fts.api.FTSDataColumnI;
import jalview.fts.api.FTSRestClientI;
import jalview.fts.api.FTSData;
import jalview.fts.api.FTSDataColumnI;
import jalview.fts.api.FTSRestClientI;
-import jalview.fts.core.FTSDataColumnPreferences;
import jalview.fts.core.FTSRestRequest;
import jalview.fts.core.FTSRestResponse;
import jalview.fts.service.pdb.PDBFTSRestClient;
import jalview.fts.core.FTSRestRequest;
import jalview.fts.core.FTSRestResponse;
import jalview.fts.service.pdb.PDBFTSRestClient;
@@
-147,8
+146,9
@@
public class StructureChooser extends GStructureChooser implements
public void fetchStructuresMetaData()
{
long startTime = System.currentTimeMillis();
public void fetchStructuresMetaData()
{
long startTime = System.currentTimeMillis();
- Collection<FTSDataColumnI> wantedFields = FTSDataColumnPreferences
- .getStructureSummaryFields();
+ pdbRestCleint = PDBFTSRestClient.getInstance();
+ Collection<FTSDataColumnI> wantedFields = pdbRestCleint
+ .getAllDefaulDisplayedDataColumns();
discoveredStructuresSet = new LinkedHashSet<FTSData>();
HashSet<String> errors = new HashSet<String>();
discoveredStructuresSet = new LinkedHashSet<FTSData>();
HashSet<String> errors = new HashSet<String>();
@@
-161,7
+161,6
@@
public class StructureChooser extends GStructureChooser implements
pdbRequest.setWantedFields(wantedFields);
pdbRequest.setSearchTerm(buildQuery(seq) + ")");
pdbRequest.setAssociatedSequence(seq);
pdbRequest.setWantedFields(wantedFields);
pdbRequest.setSearchTerm(buildQuery(seq) + ")");
pdbRequest.setAssociatedSequence(seq);
- pdbRestCleint = PDBFTSRestClient.getInstance();
FTSRestResponse resultList;
try
{
FTSRestResponse resultList;
try
{
@@
-395,9
+394,10
@@
public class StructureChooser extends GStructureChooser implements
public void run()
{
long startTime = System.currentTimeMillis();
public void run()
{
long startTime = System.currentTimeMillis();
+ pdbRestCleint = PDBFTSRestClient.getInstance();
lbl_loading.setVisible(true);
lbl_loading.setVisible(true);
- Collection<FTSDataColumnI> wantedFields = FTSDataColumnPreferences
- .getStructureSummaryFields();
+ Collection<FTSDataColumnI> wantedFields = pdbRestCleint
+ .getAllDefaulDisplayedDataColumns();
Collection<FTSData> filteredResponse = new HashSet<FTSData>();
HashSet<String> errors = new HashSet<String>();
Collection<FTSData> filteredResponse = new HashSet<FTSData>();
HashSet<String> errors = new HashSet<String>();
@@
-428,7
+428,6
@@
public class StructureChooser extends GStructureChooser implements
pdbRequest.setWantedFields(wantedFields);
pdbRequest.setAssociatedSequence(seq);
}
pdbRequest.setWantedFields(wantedFields);
pdbRequest.setAssociatedSequence(seq);
}
- pdbRestCleint = PDBFTSRestClient.getInstance();
FTSRestResponse resultList;
try
{
FTSRestResponse resultList;
try
{