X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Ffts%2Fcore%2FFTSDataColumnPreferences.java;h=cb6249e78f7a6c1dbbc05a0a78e6b022a14c34ae;hb=4d959452a9c486b6d94291d8e819036ec19b09ef;hp=eb7455e9b573bbfd953e01dfcce2ce8d703393ec;hpb=7271c53b93e7834da8e86fc0a4d7b7fb57f5a9d7;p=jalview.git diff --git a/src/jalview/fts/core/FTSDataColumnPreferences.java b/src/jalview/fts/core/FTSDataColumnPreferences.java index eb7455e..cb6249e 100644 --- a/src/jalview/fts/core/FTSDataColumnPreferences.java +++ b/src/jalview/fts/core/FTSDataColumnPreferences.java @@ -40,7 +40,6 @@ import javax.swing.table.AbstractTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; - @SuppressWarnings("serial") public class FTSDataColumnPreferences extends JScrollPane { @@ -71,7 +70,7 @@ public class FTSDataColumnPreferences extends JScrollPane if (source.equals(PreferenceSource.STRUCTURE_CHOOSER) || source.equals(PreferenceSource.PREFERENCES)) { - structSummaryColumns = ((PDBFTSRestClient) ftsRestClient) + structSummaryColumns = ((PDBFTSRestClient) ftsRestClient) .getAllDefaultDisplayedStructureDataColumns(); } allFTSDataColumns.addAll(ftsRestClient.getAllFTSDataColumns()); @@ -110,9 +109,8 @@ public class FTSDataColumnPreferences extends JScrollPane switch (source) { case SEARCH_SUMMARY: - data[x++] = new Object[] { - ftsRestClient.getAllDefaultDisplayedFTSDataColumns() - .contains(field), + data[x++] = new Object[] { ftsRestClient + .getAllDefaultDisplayedFTSDataColumns().contains(field), field.getName(), field.getGroup() }; break; case STRUCTURE_CHOOSER: @@ -120,9 +118,9 @@ public class FTSDataColumnPreferences extends JScrollPane field.getName(), field.getGroup() }; break; case PREFERENCES: - data[x++] = new Object[] { field.getName(), - ftsRestClient.getAllDefaultDisplayedFTSDataColumns() - .contains(field), + data[x++] = new Object[] { + field.getName(), ftsRestClient + .getAllDefaultDisplayedFTSDataColumns().contains(field), structSummaryColumns.contains(field) }; break; default: @@ -131,7 +129,8 @@ public class FTSDataColumnPreferences extends JScrollPane map.put(field.getName(), field); } - FTSDataColumnPrefsTableModel model = new FTSDataColumnPrefsTableModel(columnNames, data); + FTSDataColumnPrefsTableModel model = new FTSDataColumnPrefsTableModel( + columnNames, data); tbl_FTSDataColumnPrefs.setModel(model); switch (source) @@ -147,8 +146,7 @@ public class FTSDataColumnPreferences extends JScrollPane tbl_FTSDataColumnPrefs.getColumnModel().getColumn(1).setMinWidth(150); tbl_FTSDataColumnPrefs.getColumnModel().getColumn(2) .setPreferredWidth(150); - tbl_FTSDataColumnPrefs.getColumnModel().getColumn(2) -.setMinWidth(150); + tbl_FTSDataColumnPrefs.getColumnModel().getColumn(2).setMinWidth(150); TableRowSorter sorter = new TableRowSorter<>( tbl_FTSDataColumnPrefs.getModel()); @@ -158,8 +156,7 @@ public class FTSDataColumnPreferences extends JScrollPane sortKeys.add(new RowSorter.SortKey(columnIndexToSort, SortOrder.ASCENDING)); sorter.setSortKeys(sortKeys); - sorter.setComparator( - columnIndexToSort, + sorter.setComparator(columnIndexToSort, new Comparator() { @Override @@ -189,7 +186,8 @@ public class FTSDataColumnPreferences extends JScrollPane class FTSDataColumnPrefsTableModel extends AbstractTableModel { - public FTSDataColumnPrefsTableModel(String[] columnNames, Object[][] data) + public FTSDataColumnPrefsTableModel(String[] columnNames, + Object[][] data) { this.data = data; this.columnNames = columnNames; @@ -301,9 +299,8 @@ public class FTSDataColumnPreferences extends JScrollPane if (currentSource == PreferenceSource.SEARCH_SUMMARY) { - updatePrefs(ftsRestClient - .getAllDefaultDisplayedFTSDataColumns(), ftsDataColumn, - selected); + updatePrefs(ftsRestClient.getAllDefaultDisplayedFTSDataColumns(), + ftsDataColumn, selected); } else if (currentSource == PreferenceSource.STRUCTURE_CHOOSER) { @@ -313,9 +310,8 @@ public class FTSDataColumnPreferences extends JScrollPane { if (col == 1) { - updatePrefs(ftsRestClient - .getAllDefaultDisplayedFTSDataColumns(), ftsDataColumn, - selected); + updatePrefs(ftsRestClient.getAllDefaultDisplayedFTSDataColumns(), + ftsDataColumn, selected); } else if (col == 2) { @@ -324,8 +320,7 @@ public class FTSDataColumnPreferences extends JScrollPane } } - private void updatePrefs( - Collection prefConfig, + private void updatePrefs(Collection prefConfig, FTSDataColumnI dataColumn, boolean selected) { if (prefConfig.contains(dataColumn) && !selected)