X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FStructureChooser.java;fp=src%2Fjalview%2Fgui%2FStructureChooser.java;h=d924e735e916834f9144c4f1d96160893f7b014c;hb=007af0c9001900071f6d8e9214143f79e10f4938;hp=2d9028a4620f695bd8ee0225d446aa77e519e79d;hpb=64dd25185d2caf389946bb7e70053183d5aa31a6;p=jalview.git diff --git a/src/jalview/gui/StructureChooser.java b/src/jalview/gui/StructureChooser.java index 2d9028a..d924e73 100644 --- 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.core.FTSDataColumnPreferences; 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(); - Collection wantedFields = FTSDataColumnPreferences - .getStructureSummaryFields(); + pdbRestCleint = PDBFTSRestClient.getInstance(); + Collection wantedFields = pdbRestCleint + .getAllDefaulDisplayedDataColumns(); discoveredStructuresSet = new LinkedHashSet(); HashSet errors = new HashSet(); @@ -161,7 +161,6 @@ public class StructureChooser extends GStructureChooser implements pdbRequest.setWantedFields(wantedFields); pdbRequest.setSearchTerm(buildQuery(seq) + ")"); pdbRequest.setAssociatedSequence(seq); - pdbRestCleint = PDBFTSRestClient.getInstance(); FTSRestResponse resultList; try { @@ -395,9 +394,10 @@ public class StructureChooser extends GStructureChooser implements public void run() { long startTime = System.currentTimeMillis(); + pdbRestCleint = PDBFTSRestClient.getInstance(); lbl_loading.setVisible(true); - Collection wantedFields = FTSDataColumnPreferences - .getStructureSummaryFields(); + Collection wantedFields = pdbRestCleint + .getAllDefaulDisplayedDataColumns(); Collection filteredResponse = new HashSet(); HashSet errors = new HashSet(); @@ -428,7 +428,6 @@ public class StructureChooser extends GStructureChooser implements pdbRequest.setWantedFields(wantedFields); pdbRequest.setAssociatedSequence(seq); } - pdbRestCleint = PDBFTSRestClient.getInstance(); FTSRestResponse resultList; try {