X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTextColourChooser.java;h=c0f3916cfee6c4af63ea97a84b008b715aec1763;hb=2253f31565d4e96edffce2fac596e2ef0578d596;hp=2f887cb79a6aafe404b088cf95bf44fef11267dc;hpb=d1f6cf53b29322601c621da9a6b3cb09dd28235e;p=jalview.git diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java index 2f887cb..c0f3916 100644 --- a/src/jalview/gui/TextColourChooser.java +++ b/src/jalview/gui/TextColourChooser.java @@ -30,6 +30,7 @@ import jalview.datamodel.*; public class TextColourChooser { AlignmentPanel ap; + SequenceGroup sg; public void chooseColour(AlignmentPanel ap, SequenceGroup sg) @@ -65,10 +66,12 @@ public class TextColourChooser final JPanel bigpanel = new JPanel(new BorderLayout()); JPanel panel = new JPanel(); bigpanel.add(panel, BorderLayout.CENTER); - bigpanel.add(new JLabel( - "Select a dark and light text colour, then set the threshold to" - + "
switch between colours, based on background colour
"), - BorderLayout.NORTH); + bigpanel + .add( + new JLabel( + "Select a dark and light text colour, then set the threshold to" + + "
switch between colours, based on background colour
"), + BorderLayout.NORTH); panel.add(col1); panel.add(slider); panel.add(col2); @@ -78,8 +81,7 @@ public class TextColourChooser public void mousePressed(MouseEvent e) { Color col = JColorChooser.showDialog(bigpanel, - "Select Colour for Text", - col1.getBackground()); + "Select Colour for Text", col1.getBackground()); if (col != null) { colour1Changed(col); @@ -93,8 +95,7 @@ public class TextColourChooser public void mousePressed(MouseEvent e) { Color col = JColorChooser.showDialog(bigpanel, - "Select Colour for Text", - col2.getBackground()); + "Select Colour for Text", col2.getBackground()); if (col != null) { colour2Changed(col); @@ -111,14 +112,10 @@ public class TextColourChooser } }); - int reply = JOptionPane.showInternalOptionDialog( - ap, - bigpanel, - "Adjust Foreground Text Colour Threshold", - JOptionPane.OK_CANCEL_OPTION, - JOptionPane.QUESTION_MESSAGE, - null, - null, null); + int reply = JOptionPane.showInternalOptionDialog(ap, bigpanel, + "Adjust Foreground Text Colour Threshold", + JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, + null, null, null); if (reply == JOptionPane.CANCEL_OPTION) {