JAL-1645 source formatting and organise imports

[jalview.git] / src / jalview / ws / uimodel / PDBRestRequest.java

diff --git a/src/jalview/ws/uimodel/PDBRestRequest.java b/src/jalview/ws/uimodel/PDBRestRequest.java
index 2b9a7f3..7826fbd 100644 (file)
--- a/src/jalview/ws/uimodel/PDBRestRequest.java
+++ b/src/jalview/ws/uimodel/PDBRestRequest.java
@@ -21,7 +21,7 @@
 
 package jalview.ws.uimodel;
 
-
+import jalview.datamodel.SequenceI;
 import jalview.ws.dbsources.PDBRestClient.PDBDocField;
 
 import java.util.Collection;
@@ -40,7 +40,7 @@ public class PDBRestRequest
 
   private String fieldToSortBy;
 
-  private String associatedSequence;
+  private SequenceI associatedSequence;
 
   private boolean allowEmptySequence;
 
@@ -117,14 +117,26 @@ public class PDBRestRequest
     return isSortAscending;
   }
 
-  public String getAssociatedSequence()
+  public SequenceI getAssociatedSequence()
   {
     return associatedSequence;
   }
 
-  public void setAssociatedSequence(String associatedSequence)
+  public void setAssociatedSequence(SequenceI associatedSequence)
   {
     this.associatedSequence = associatedSequence;
   }
 
+  public String getQuery()
+  {
+    return fieldToSearchBy + searchTerm
+            + (isAllowEmptySeq() ? "" : " AND molecule_sequence:['' TO *]");
+  }
+
+  public String toString()
+  {
+    return "Query : " + getQuery() + " sort field: " + fieldToSortBy
+            + " isAsc: " + isAscending() + " Associated Seq : "
+            + associatedSequence;
+  }
 }