X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fcore%2FFTSDataColumnPreferences.java;h=0335d6505e3ba0c64d2980b9e923c85c576585a4;hb=aa96618cbd41b40e2377f3f1f105aea90a5a86e0;hp=c0b6d0578066f77ee4b73e10d234de1cfc782627;hpb=cc055fb81c5c80a8876ebaad387be35653852d8d;p=jalview.git diff --git a/src/jalview/fts/core/FTSDataColumnPreferences.java b/src/jalview/fts/core/FTSDataColumnPreferences.java index c0b6d05..0335d65 100644 --- a/src/jalview/fts/core/FTSDataColumnPreferences.java +++ b/src/jalview/fts/core/FTSDataColumnPreferences.java @@ -23,6 +23,7 @@ package jalview.fts.core; import jalview.fts.api.FTSDataColumnI; import jalview.fts.api.FTSDataColumnI.FTSDataColumnGroupI; import jalview.fts.api.FTSRestClientI; +import jalview.fts.api.StructureFTSRestClientI; import jalview.fts.service.pdb.PDBFTSRestClient; import java.util.ArrayList; @@ -76,7 +77,7 @@ public class FTSDataColumnPreferences extends JScrollPane if (source.equals(PreferenceSource.STRUCTURE_CHOOSER) || source.equals(PreferenceSource.PREFERENCES)) { - structSummaryColumns = ((PDBFTSRestClient) ftsRestClient) + structSummaryColumns = ((StructureFTSRestClientI) ftsRestClient) .getAllDefaultDisplayedStructureDataColumns(); } allFTSDataColumns.addAll(ftsRestClient.getAllFTSDataColumns()); @@ -85,22 +86,7 @@ public class FTSDataColumnPreferences extends JScrollPane this.getViewport().add(tbl_FTSDataColumnPrefs); this.currentSource = source; - String[] columnNames = null; - switch (source) - { - case SEARCH_SUMMARY: - columnNames = new String[] { "", "Display", "Group" }; - break; - case STRUCTURE_CHOOSER: - columnNames = new String[] { "", "Display", "Group" }; - break; - case PREFERENCES: - columnNames = new String[] { "PDB Field", "Show in search summary", - "Show in structure summary" }; - break; - default: - break; - } + String[] columnNames = ftsRestClient.getPreferencesColumnsFor(source); Object[][] data = new Object[allFTSDataColumns.size()][3];