X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fservice%2Fthreedbeacons%2FTDBeaconsFTSRestClient.java;fp=src%2Fjalview%2Ffts%2Fservice%2Fthreedbeacons%2FTDBeaconsFTSRestClient.java;h=ccdc525b3187efbad87c2e85e41aebe2a12ec628;hb=3f60a0d59ec67599e75d55055e8aaf7576020d07;hp=c05306a01b80127c63a48b3604bdb1aea021a81d;hpb=78b7c57226592b75777d7409088ccf820d3328db;p=jalview.git diff --git a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java index c05306a..ccdc525 100644 --- a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java +++ b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java @@ -219,8 +219,6 @@ public class TDBeaconsFTSRestClient extends FTSRestClient private static FTSData getFTSData(Map tdbJsonStructure, FTSRestRequest tdbRequest) { - // TODO: consider reusing PDBFTSRestClient.getFTSData ? - String primaryKey = null; Object[] summaryRowData; @@ -275,52 +273,7 @@ public class TDBeaconsFTSRestClient extends FTSRestClient final String primaryKey1 = primaryKey; final Object[] summaryRowData1 = summaryRowData; - return new FTSData() - { - - @Override - public Object[] getSummaryData() - { - return summaryRowData1; - } - - @Override - public Object getPrimaryKey() - { - return primaryKey1; - } - - /** - * Returns a string representation of this object; - */ - @Override - public String toString() - { - StringBuilder summaryFieldValues = new StringBuilder(); - for (Object summaryField : summaryRowData1) - { - summaryFieldValues.append( - summaryField == null ? " " : summaryField.toString()) - .append("\t"); - } - return summaryFieldValues.toString(); - } - - /** - * Returns hash code value for this object - */ - @Override - public int hashCode() - { - return Objects.hash(primaryKey1, this.toString()); - } - - @Override - public boolean equals(Object that) - { - return this.toString().equals(that.toString()); - } - }; + return new TDB_FTSData(primaryKey, tdbJsonStructure, summaryRowData1); } // private static FTSData getFTSData(Map doc,