X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fuimodel%2FPDBRestRequest.java;h=58d7aeb1071b716eb441d79fbb7dae9a98f6c888;hb=8640b64eb136e01473d6e4331d3ceac8b2e9a1b5;hp=168811f7ee950b98e1f79d43a1ccf5d2b85de9ab;hpb=d9cedb863c0d5b665b8cdde3f8791d8a96030c6b;p=jalview.git

diff --git a/src/jalview/ws/uimodel/PDBRestRequest.java b/src/jalview/ws/uimodel/PDBRestRequest.java
index 168811f..58d7aeb 100644
--- a/src/jalview/ws/uimodel/PDBRestRequest.java
+++ b/src/jalview/ws/uimodel/PDBRestRequest.java
@@ -24,8 +24,7 @@ package jalview.ws.uimodel;
 
 import jalview.ws.dbsources.PDBRestClient.PDBDocField;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Collection;
 
 /**
  * Represents the PDB request to be consumed by the PDBRestClient
@@ -49,7 +48,8 @@ public class PDBRestRequest
 
   private boolean isSortAscending;
 
-  private List<PDBDocField> wantedFields = new ArrayList<PDBDocField>();
+  private Collection<PDBDocField> wantedFields;// = new
+                                               // Collection<PDBDocField>();
 
   public String getFieldToSearchBy()
   {
@@ -91,12 +91,12 @@ public class PDBRestRequest
     this.responseSize = responseSize;
   }
 
-  public List<PDBDocField> getWantedFields()
+  public Collection<PDBDocField> getWantedFields()
   {
     return wantedFields;
   }
 
-  public void setWantedFields(List<PDBDocField> wantedFields)
+  public void setWantedFields(Collection<PDBDocField> wantedFields)
   {
     this.wantedFields = wantedFields;
   }
@@ -127,4 +127,16 @@ public class PDBRestRequest
     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;
+  }
 }