X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureSettings.java;h=6d8457412b414866ca8646372e3b40e925993309;hb=eb3e681d6e82ccdd5d312d1981dfb306e7f479f0;hp=57e5943a2fe9821ec91ceb18cdab1de47c91bec0;hpb=cb31e23d9138e481479623374aed7767bf8934d2;p=jalview.git diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java index 57e5943..6d84574 100644 --- a/src/jalview/gui/FeatureSettings.java +++ b/src/jalview/gui/FeatureSettings.java @@ -1919,7 +1919,8 @@ public class FeatureSettings extends JPanel */ String ttl = MessageManager .formatMessage("label.select_colour_for", type); - Object last=(Boolean)table.getValueAt(selectedRow, SHOW_COLUMN); + Object last = (Boolean) table.getValueAt(selectedRow, + SHOW_COLUMN); table.setValueAt(Boolean.TRUE, selectedRow, SHOW_COLUMN); ColourChooserListener listener = new ColourChooserListener() { @@ -1947,9 +1948,10 @@ public class FeatureSettings extends JPanel /* * variable colour and filters dialog */ - boolean last=(Boolean)table.getValueAt(selectedRow, SHOW_COLUMN); + boolean last = (Boolean) table.getValueAt(selectedRow, + SHOW_COLUMN); table.setValueAt(Boolean.TRUE, selectedRow, SHOW_COLUMN); - chooser = new FeatureTypeSettings(fr, type,last); + chooser = new FeatureTypeSettings(fr, type, last); if (!Platform.isJS()) /** * Java only @@ -2076,8 +2078,10 @@ public class FeatureSettings extends JPanel if (button == e.getSource()) { boolean last = fr.getFeaturesDisplayed().isVisible(type); - ((FeatureTableModel) table.getModel()).setValueAt(Boolean.TRUE, rowSelected, SHOW_COLUMN); - FeatureTypeSettings chooser = new FeatureTypeSettings(fr, type,last); + ((FeatureTableModel) table.getModel()).setValueAt(Boolean.TRUE, + rowSelected, SHOW_COLUMN); + FeatureTypeSettings chooser = new FeatureTypeSettings(fr, type, + last); chooser.addActionListener(this); chooser.setRequestFocusEnabled(true); chooser.requestFocus(); @@ -2110,7 +2114,7 @@ public class FeatureSettings extends JPanel data[COLOUR_COLUMN] = currentColor; data[FILTER_COLUMN] = currentFilter; data[SHOW_COLUMN] = fr.getFeaturesDisplayed().isVisible(type); - + fireEditingStopped(); // SwingJS needs an explicit repaint() here, // rather than relying upon no validation having @@ -2163,6 +2167,7 @@ public class FeatureSettings extends JPanel refreshDisplay(); } } + class FeatureIcon implements Icon { FeatureColourI gcol;