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 3d2efb2..0f38e9f 100644 (file)
--- a/src/jalview/gui/structurechooser/PDBStructureChooserQuerySource.java
+++ b/src/jalview/gui/structurechooser/PDBStructureChooserQuerySource.java
@@ -1,5 +1,6 @@
 package jalview.gui.structurechooser;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -22,7 +23,8 @@ import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
 import jalview.fts.core.FTSRestRequest;
 import jalview.fts.core.FTSRestResponse;
 import jalview.fts.service.pdb.PDBFTSRestClient;
-import jalview.jbgui.GStructureChooser.FilterOption;
+import jalview.jbgui.FilterOption;
+import jalview.util.MessageManager;
 
 /**
  * logic for querying the PDBe API for structures of sequences
@@ -35,6 +37,10 @@ public class PDBStructureChooserQuerySource
 
   private static int MAX_QLENGTH = 7820;
 
+  protected FTSRestRequest lastPdbRequest;
+
+  protected FTSRestClientI pdbRestClient;
+
   public PDBStructureChooserQuerySource()
   {
     pdbRestClient = PDBFTSRestClient.getInstance();
@@ -229,6 +235,34 @@ public class PDBStructureChooserQuerySource
     lastPdbRequest = pdbRequest;
     return resultList;
   }
+  public List<FilterOption> getAvailableFilterOptions(String VIEWS_FILTER)
+  {
+    List<FilterOption> filters = new ArrayList<FilterOption>();
+    filters.add(new FilterOption(
+            MessageManager.getString("label.best_quality"),
+            "overall_quality", VIEWS_FILTER, false,this));
+    filters.add(new FilterOption(
+            MessageManager.getString("label.best_resolution"),
+            "resolution", VIEWS_FILTER, false,this));
+    filters.add(new FilterOption(
+            MessageManager.getString("label.most_protein_chain"),
+            "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,this));
+    filters.add(new FilterOption(
+            MessageManager.getString("label.most_polymer_residues"),
+            "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
@@ -245,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
   {
@@ -321,4 +355,17 @@ public class PDBStructureChooserQuerySource
     return pdbEntriesToView;
   }
 
+
+  @Override
+  protected FTSRestRequest getLastFTSRequest()
+  {
+    return lastPdbRequest;
+  }
+
+
+  public FTSRestResponse executePDBFTSRestRequest(FTSRestRequest pdbRequest) throws Exception
+  {
+    return pdbRestClient.executeRequest(pdbRequest);
+  }
+
 }
\ No newline at end of file