X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fservice%2Fthreedbeacons%2FTDBeaconsFTSRestClient.java;fp=src%2Fjalview%2Ffts%2Fservice%2Fthreedbeacons%2FTDBeaconsFTSRestClient.java;h=b686c95318d1ff6621be9b0c28db8a923f5c6ea9;hp=ac02a5fa1705775e9bd87b2800e70e6cf34ce46f;hb=1bf6c31ad57e146c40fb46ac471caa0cb3b9b975;hpb=c10fb1cf26cf04916561a8f729fc9ccdb81c3f0a diff --git a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java index ac02a5f..b686c95 100644 --- a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java +++ b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java @@ -26,7 +26,6 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Objects; import javax.ws.rs.core.MediaType; @@ -42,11 +41,10 @@ import jalview.fts.api.FTSData; import jalview.fts.api.FTSDataColumnI; import jalview.fts.api.FTSRestClientI; import jalview.fts.api.StructureFTSRestClientI; +import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource; import jalview.fts.core.FTSRestClient; import jalview.fts.core.FTSRestRequest; import jalview.fts.core.FTSRestResponse; -import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource; -import jalview.fts.service.pdb.PDBFTSRestClient; import jalview.util.JSONUtils; import jalview.util.MessageManager; import jalview.util.Platform; @@ -243,7 +241,8 @@ public class TDBeaconsFTSRestClient extends FTSRestClient return searchResult; } - private static FTSData getFTSData(Map tdbJsonStructure, + private static FTSData getFTSData( + Map tdbJsonStructureSummary, FTSRestRequest tdbRequest) { String primaryKey = null; @@ -341,6 +340,7 @@ public class TDBeaconsFTSRestClient extends FTSRestClient private Collection allDefaultDisplayedStructureDataColumns; + @Override public Collection getAllDefaultDisplayedStructureDataColumns() { if (allDefaultDisplayedStructureDataColumns == null