X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fcore%2FFTSDataColumnPreferences.java;fp=src%2Fjalview%2Ffts%2Fcore%2FFTSDataColumnPreferences.java;h=1e382600f7c8048186cd04042dc1b6b658eade04;hb=2051c117e19e8b7c72bf5a9f1db48f2b4687f71e;hp=cddcc8e8e29dbcaecb2b1a228da7445254bace91;hpb=1070450e1afee97a5b4567416f5b7655fbfa59f1;p=jalview.git diff --git a/src/jalview/fts/core/FTSDataColumnPreferences.java b/src/jalview/fts/core/FTSDataColumnPreferences.java index cddcc8e..1e38260 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.service.pdb.PDBFTSRestClient; import java.util.ArrayList; import java.util.Collection; @@ -67,11 +68,8 @@ public class FTSDataColumnPreferences extends JScrollPane FTSRestClientI ftsRestClient) { this.ftsRestClient = ftsRestClient; - Collection defaultCols = ftsRestClient - .getAllDefaulDisplayedDataColumns(); - - structSummaryColumns.addAll(defaultCols); - + structSummaryColumns = ((PDBFTSRestClient) ftsRestClient) + .getAllDefaultDisplayedStructureDataColumns(); allFTSDataColumns.addAll(ftsRestClient.getAllFTSDataColumns()); tbl_FTSDataColumnPrefs.setAutoCreateRowSorter(true); @@ -109,7 +107,7 @@ public class FTSDataColumnPreferences extends JScrollPane { case SEARCH_SUMMARY: data[x++] = new Object[] { - ftsRestClient.getAllDefaulDisplayedDataColumns() + ftsRestClient.getAllDefaultDisplayedFTSDataColumns() .contains(field), field.getName(), field.getGroup() }; break; @@ -119,7 +117,7 @@ public class FTSDataColumnPreferences extends JScrollPane break; case PREFERENCES: data[x++] = new Object[] { field.getName(), - ftsRestClient.getAllDefaulDisplayedDataColumns() + ftsRestClient.getAllDefaultDisplayedFTSDataColumns() .contains(field), structSummaryColumns.contains(field) }; break; @@ -300,7 +298,7 @@ public class FTSDataColumnPreferences extends JScrollPane if (currentSource == PreferenceSource.SEARCH_SUMMARY) { updatePrefs(ftsRestClient - .getAllDefaulDisplayedDataColumns(), ftsDataColumn, + .getAllDefaultDisplayedFTSDataColumns(), ftsDataColumn, selected); } else if (currentSource == PreferenceSource.STRUCTURE_CHOOSER) @@ -312,7 +310,7 @@ public class FTSDataColumnPreferences extends JScrollPane if (col == 1) { updatePrefs(ftsRestClient - .getAllDefaulDisplayedDataColumns(), ftsDataColumn, + .getAllDefaultDisplayedFTSDataColumns(), ftsDataColumn, selected); } else if (col == 2)