git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
JAL-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git] / src / jalview / gui / TextColourChooser.java
diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java
index c8a4a08..39d9c1d 100644 (file)
--- a/src/jalview/gui/TextColourChooser.java
+++ b/src/jalview/gui/TextColourChooser.java
@@ -72,24 +72,29 @@ public class TextColourChooser
     final JPanel col2 = new JPanel();
     col2.setPreferredSize(new Dimension(40, 20));
     col2.setBorder(BorderFactory.createEtchedBorder());
-    col2.setToolTipText(MessageManager.getString("label.ligth_colour"));
+    col2.setToolTipText(MessageManager.getString("label.light_colour"));
     col2.setBackground(new Color(original2));
     final JPanel bigpanel = new JPanel(new BorderLayout());
     JPanel panel = new JPanel();
     bigpanel.add(panel, BorderLayout.CENTER);
     bigpanel.add(
-            new JLabel("<html>"+MessageManager.getString("label.select_dark_light_set_thereshold")+"</html>"),
-            BorderLayout.NORTH);
+            new JLabel(
+                    "<html>"
+                            + MessageManager
+                                    .getString("label.select_dark_light_set_threshold")
+                            + "</html>"), BorderLayout.NORTH);
     panel.add(col1);
     panel.add(slider);
     panel.add(col2);
 
     col1.addMouseListener(new MouseAdapter()
     {
+      @Override
       public void mousePressed(MouseEvent e)
       {
         Color col = JColorChooser.showDialog(bigpanel,
-                MessageManager.getString("label.select_colour_for_text"), col1.getBackground());
+                MessageManager.getString("label.select_colour_for_text"),
+                col1.getBackground());
         if (col != null)
         {
           colour1Changed(col);
@@ -100,10 +105,12 @@ public class TextColourChooser
 
     col2.addMouseListener(new MouseAdapter()
     {
+      @Override
       public void mousePressed(MouseEvent e)
       {
         Color col = JColorChooser.showDialog(bigpanel,
-                       MessageManager.getString("label.select_colour_for_text"), col2.getBackground());
+                MessageManager.getString("label.select_colour_for_text"),
+                col2.getBackground());
         if (col != null)
         {
           colour2Changed(col);
@@ -114,16 +121,21 @@ public class TextColourChooser
 
     slider.addChangeListener(new ChangeListener()
     {
+      @Override
       public void stateChanged(ChangeEvent evt)
       {
         thresholdChanged(slider.getValue());
       }
     });
 
-    int reply = JOptionPane.showInternalOptionDialog(ap, bigpanel,
-            MessageManager.getString("label.adjunst_foreground_text_colour_thereshold"),
-            JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE,
-            null, null, null);
+    int reply = JOptionPane
+            .showInternalOptionDialog(
+                    ap,
+                    bigpanel,
+                    MessageManager
+                            .getString("label.adjunst_foreground_text_colour_threshold"),
+                    JOptionPane.OK_CANCEL_OPTION,
+                    JOptionPane.QUESTION_MESSAGE, null, null, null);
 
     if (reply == JOptionPane.CANCEL_OPTION)
     {