X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fuimodel%2FPDBRestResponse.java;fp=src%2Fjalview%2Fws%2Fuimodel%2FPDBRestResponse.java;h=b82b997835bdc535e5a6f19047cbdf4f90b7a92e;hb=f06554784411ddbf871d642e66c8dcb7f147d4a8;hp=2814a461cab4d6263ff5e8068dbd8ee4072605a9;hpb=cf06ee5d732af6cc874115aece1138adafca8ad7;p=jalview.git diff --git a/src/jalview/ws/uimodel/PDBRestResponse.java b/src/jalview/ws/uimodel/PDBRestResponse.java index 2814a46..b82b997 100644 --- a/src/jalview/ws/uimodel/PDBRestResponse.java +++ b/src/jalview/ws/uimodel/PDBRestResponse.java @@ -21,6 +21,7 @@ package jalview.ws.uimodel; +import jalview.datamodel.SequenceI; import jalview.ws.dbsources.PDBRestClient.PDBDocField; import java.util.Collection; @@ -101,7 +102,7 @@ public class PDBRestResponse }; if (request.getAssociatedSequence() != null) { - tableModel.addColumn("Sequence"); // Create sequence column header if + tableModel.addColumn("Ref Sequence"); // Create sequence column header if // exists in the request } for (PDBDocField field : request.getWantedFields()) @@ -127,21 +128,20 @@ public class PDBRestResponse { private String pdbId; - private String[] summaryRowData; + private Object[] summaryRowData; - private String associatedSequence; + private SequenceI associatedSequence; public PDBResponseSummary(JSONObject pdbJsonDoc, PDBRestRequest request) { Collection diplayFields = request.getWantedFields(); - String associatedSeq = request.getAssociatedSequence(); + SequenceI associatedSeq = request.getAssociatedSequence(); int colCounter = 0; - summaryRowData = new String[(associatedSeq != null) ? diplayFields + summaryRowData = new Object[(associatedSeq != null) ? diplayFields .size() + 1 : diplayFields.size()]; if (associatedSeq != null) { - this.associatedSequence = (associatedSeq.length() > 18) ? associatedSeq - .substring(0, 18) : associatedSeq; + this.associatedSequence = associatedSeq; summaryRowData[0] = associatedSequence; colCounter = 1; } @@ -173,7 +173,7 @@ public class PDBRestResponse this.pdbId = pdbId; } - public String[] getSummaryData() + public Object[] getSummaryData() { return summaryRowData; } @@ -190,9 +190,9 @@ public class PDBRestResponse public String toString() { StringBuilder summaryFieldValues = new StringBuilder(); - for (String summaryField : summaryRowData) + for (Object summaryField : summaryRowData) { - summaryFieldValues.append(summaryField).append("\t"); + summaryFieldValues.append(summaryField.toString()).append("\t"); } return summaryFieldValues.toString(); }