JAL-3829 provide both PDBe queries and 3D-Beacons queries in the filter combo box

[jalview.git] / src / jalview / gui / structurechooser / PDBStructureChooserQuerySource.java

diff --git a/src/jalview/gui/structurechooser/PDBStructureChooserQuerySource.java b/src/jalview/gui/structurechooser/PDBStructureChooserQuerySource.java
index 3d1b982..0f38e9f 100644 (file)
--- a/src/jalview/gui/structurechooser/PDBStructureChooserQuerySource.java
+++ b/src/jalview/gui/structurechooser/PDBStructureChooserQuerySource.java
@@ -240,23 +240,30 @@ public class PDBStructureChooserQuerySource
     List<FilterOption> filters = new ArrayList<FilterOption>();
     filters.add(new FilterOption(
             MessageManager.getString("label.best_quality"),
-            "overall_quality", VIEWS_FILTER, false));
+            "overall_quality", VIEWS_FILTER, false,this));
     filters.add(new FilterOption(
             MessageManager.getString("label.best_resolution"),
-            "resolution", VIEWS_FILTER, false));
+            "resolution", VIEWS_FILTER, false,this));
     filters.add(new FilterOption(
             MessageManager.getString("label.most_protein_chain"),
-            "number_of_protein_chains", VIEWS_FILTER, false));
+            "number_of_protein_chains", VIEWS_FILTER, false,this));
     filters.add(new FilterOption(
             MessageManager.getString("label.most_bound_molecules"),
-            "number_of_bound_molecules", VIEWS_FILTER, false));
+            "number_of_bound_molecules", VIEWS_FILTER, false,this));
     filters.add(new FilterOption(
             MessageManager.getString("label.most_polymer_residues"),
-            "number_of_polymer_residues", VIEWS_FILTER, true));
+            "number_of_polymer_residues", VIEWS_FILTER, true,this));
   
     return filters;
   }
 
+  @Override
+  public boolean needsRefetch(FilterOption selectedFilterOpt)
+  {
+    // PDBe queries never need a refetch first
+    return false;
+  }
+
   /**
    * FTSRestClient specific query builder to pick top ranked entry from a
    * fetchStructuresMetaData query
@@ -272,7 +279,7 @@ public class PDBStructureChooserQuerySource
    * @return
    * @throws Exception
    */
-  public FTSRestResponse selectFirstRankedQuery(SequenceI seq,
+  public FTSRestResponse selectFirstRankedQuery(SequenceI seq, Collection<FTSData> collectedResults,
           Collection<FTSDataColumnI> wantedFields, String fieldToFilterBy,
           boolean b) throws Exception
   {
@@ -355,4 +362,10 @@ public class PDBStructureChooserQuerySource
     return lastPdbRequest;
   }
 
+
+  public FTSRestResponse executePDBFTSRestRequest(FTSRestRequest pdbRequest) throws Exception
+  {
+    return pdbRestClient.executeRequest(pdbRequest);
+  }
+
 }
\ No newline at end of file