X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureTypeSettings.java;h=09bb2a3c7a27a972b7ba931c8885d19b47ac1dd3;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=a2a2700ca58ac4e555f64b87858cf1abec06162e;hpb=e7338a61f3ce96dadf44ac80b2b32cc5ba4b94c8;p=jalview.git diff --git a/src/jalview/gui/FeatureTypeSettings.java b/src/jalview/gui/FeatureTypeSettings.java index a2a2700..09bb2a3 100644 --- a/src/jalview/gui/FeatureTypeSettings.java +++ b/src/jalview/gui/FeatureTypeSettings.java @@ -155,7 +155,7 @@ public class FeatureTypeSettings extends JalviewDialog JRadioButton graduatedColour = new JRadioButton(); JPanel coloursPanel; - + JPanel filtersPanel; JPanel singleColour = new JPanel(); @@ -217,9 +217,9 @@ public class FeatureTypeSettings extends JalviewDialog ap = fr.ap; originalFilter = fr.getFeatureFilter(theType); originalColour = fr.getFeatureColours().get(theType); - + adjusting = true; - + try { initialise(); @@ -228,15 +228,15 @@ public class FeatureTypeSettings extends JalviewDialog ex.printStackTrace(); return; } - + updateColoursPanel(); - + updateFiltersPanel(); - + adjusting = false; - + colourChanged(false); - + String title = MessageManager .formatMessage("label.display_settings_for", new String[] { theType }); @@ -245,8 +245,8 @@ public class FeatureTypeSettings extends JalviewDialog } /** - * Configures the widgets on the Colours panel according to the current feature - * colour scheme + * Configures the widgets on the Colours panel according to the current + * feature colour scheme */ private void updateColoursPanel() { @@ -537,7 +537,8 @@ public class FeatureTypeSettings extends JalviewDialog { if (minColour.isEnabled()) { - String ttl = MessageManager.getString("label.select_colour_minimum_value"); + String ttl = MessageManager + .getString("label.select_colour_minimum_value"); showColourChooser(minColour, ttl); } } @@ -554,7 +555,8 @@ public class FeatureTypeSettings extends JalviewDialog { if (maxColour.isEnabled()) { - String ttl = MessageManager.getString("label.select_colour_maximum_value"); + String ttl = MessageManager + .getString("label.select_colour_maximum_value"); showColourChooser(maxColour, ttl); } } @@ -762,8 +764,8 @@ public class FeatureTypeSettings extends JalviewDialog // } // else // { - singleColour.setBackground(originalColour.getColour()); - singleColour.setForeground(originalColour.getColour()); + singleColour.setBackground(originalColour.getColour()); + singleColour.setForeground(originalColour.getColour()); // } singleColour.addMouseListener(new MouseAdapter() { @@ -772,7 +774,8 @@ public class FeatureTypeSettings extends JalviewDialog { if (simpleColour.isSelected()) { - String ttl = MessageManager.formatMessage("label.select_colour_for", featureType); + String ttl = MessageManager + .formatMessage("label.select_colour_for", featureType); showColourChooser(singleColour, ttl); } } @@ -857,8 +860,8 @@ public class FeatureTypeSettings extends JalviewDialog colourChanged(true); } }; - JalviewColourChooser.showColourChooser(this, title, - colourPanel.getBackground(), listener); + JalviewColourChooser.showColourChooser(this, title, + colourPanel.getBackground(), listener); } /** @@ -1045,7 +1048,7 @@ public class FeatureTypeSettings extends JalviewDialog */ adjusting = true; float f = Float.parseFloat(thresholdValue.getText()); - f = Float.max(f, this.min); + f = Float.max(f, this.min); f = Float.min(f, this.max); setThresholdValueText(f); slider.setSliderValue(f); @@ -1061,7 +1064,8 @@ public class FeatureTypeSettings extends JalviewDialog } /** - * Sets the text field for threshold value, rounded to four significant figures + * Sets the text field for threshold value, rounded to four significant + * figures * * @param f */ @@ -1160,7 +1164,7 @@ public class FeatureTypeSettings extends JalviewDialog List displayAttsObjects = new ArrayList<>(displayAtts); JComboBox attCombo = JvSwingUtils .buildComboWithTooltips(displayAttsObjects, tooltips); - + return attCombo; }