From: Jim Procter Date: Fri, 20 Jan 2023 17:49:16 +0000 (+0000) Subject: JAL-4114 formatting X-Git-Tag: Release_2_11_2_6~2^2~6 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1bf6c31ad57e146c40fb46ac471caa0cb3b9b975;p=jalview.git JAL-4114 formatting --- 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