X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTextColourChooser.java;h=53e2deef647887ac138a8bda1fcd58d5d2c0de9b;hb=0efc6021e63ff62bb2e275501586c1900561b303;hp=91e05c6507c68efb75dacf9de4246548ca665402;hpb=9debcac658224e1a84ddff4c4fd9f696e812913f;p=jalview.git diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java index 91e05c6..53e2dee 100644 --- a/src/jalview/gui/TextColourChooser.java +++ b/src/jalview/gui/TextColourChooser.java @@ -64,7 +64,8 @@ public class TextColourChooser * @param sequenceGroup * the SequenceGroup context (only for group pop-menu option) */ - public void chooseColour(AlignmentPanel alignPanel, SequenceGroup sequenceGroup) + public void chooseColour(AlignmentPanel alignPanel, + SequenceGroup sequenceGroup) { this.ap = alignPanel; this.sg = sequenceGroup; @@ -86,11 +87,11 @@ public class TextColourChooser JPanel panel = new JPanel(); bigpanel.add(panel, BorderLayout.CENTER); bigpanel.add( - new JLabel( - "" - + MessageManager - .getString("label.select_dark_light_set_threshold") - + ""), BorderLayout.NORTH); + new JLabel("" + + MessageManager.getString( + "label.select_dark_light_set_threshold") + + ""), + BorderLayout.NORTH); panel.add(col1); panel.add(slider); panel.add(col2); @@ -136,14 +137,11 @@ public class TextColourChooser } }); - int reply = JvOptionPane - .showInternalOptionDialog( - alignPanel, - bigpanel, - MessageManager - .getString("label.adjunst_foreground_text_colour_threshold"), - JvOptionPane.OK_CANCEL_OPTION, - JvOptionPane.QUESTION_MESSAGE, null, null, null); + int reply = JvOptionPane.showInternalOptionDialog(alignPanel, bigpanel, + MessageManager.getString( + "label.adjunst_foreground_text_colour_threshold"), + JvOptionPane.OK_CANCEL_OPTION, JvOptionPane.QUESTION_MESSAGE, + null, null, null); if (reply == JvOptionPane.CANCEL_OPTION) { @@ -186,9 +184,9 @@ public class TextColourChooser */ protected void saveInitialSettings() { - groupColour1 = new HashMap(); - groupColour2 = new HashMap(); - groupThreshold = new HashMap(); + groupColour1 = new HashMap<>(); + groupColour2 = new HashMap<>(); + groupThreshold = new HashMap<>(); if (sg == null) { @@ -239,7 +237,7 @@ public class TextColourChooser sg.textColour = col; } - ap.paintAlignment(true); + ap.paintAlignment(false, false); } void colour2Changed(Color col) @@ -257,7 +255,7 @@ public class TextColourChooser sg.textColour2 = col; } - ap.paintAlignment(true); + ap.paintAlignment(false, false); } void thresholdChanged(int value) @@ -275,7 +273,7 @@ public class TextColourChooser sg.thresholdTextColour = value; } - ap.paintAlignment(true); + ap.paintAlignment(false, false); } void setGroupTextColour()