Merge branch 'alpha/JAL-3362_Jalview_212_alpha' into alpha/merge_212_JalviewJS_2112

[jalview.git] / src / jalview / jbgui / GUserDefinedColours.java

diff --git a/src/jalview/jbgui/GUserDefinedColours.java b/src/jalview/jbgui/GUserDefinedColours.java
index c3645a8..27a068c 100755 (executable)
--- a/src/jalview/jbgui/GUserDefinedColours.java
+++ b/src/jalview/jbgui/GUserDefinedColours.java
@@ -74,7 +74,7 @@ public class GUserDefinedColours extends JPanel
 
   JLabel jLabel1 = new JLabel();
 
-  protected JTextField schemeName = new JTextField();
+  public JTextField schemeName = new JTextField();
 
   BorderLayout borderLayout1 = new BorderLayout();
 
@@ -102,9 +102,9 @@ public class GUserDefinedColours extends JPanel
 
   protected JPanel casePanel = new JPanel();
 
-  protected JCheckBox caseSensitive = new JCheckBox();
+  public JCheckBox caseSensitive = new JCheckBox();
 
-  protected JCheckBox lcaseColour = new JCheckBox();
+  public JCheckBox lcaseColour = new JCheckBox();
 
   protected List<JButton> selectedButtons;
 
@@ -207,11 +207,10 @@ public class GUserDefinedColours extends JPanel
     label.setFont(new java.awt.Font("Verdana", Font.ITALIC, 10));
     label.setOpaque(false);
     label.setPreferredSize(new Dimension(260, 34));
-    label.setText(MessageManager
-            .formatMessage(
-                    "label.html_content",
-                    new String[] { MessageManager
-                            .getString("label.save_colour_scheme_with_unique_name_added_to_colour_menu") }));
+    label.setText(
+            MessageManager.formatMessage("label.html_content", new String[]
+            { MessageManager.getString(
+                    "label.save_colour_scheme_with_unique_name_added_to_colour_menu") }));
     caseSensitive.setText(MessageManager.getString("label.case_sensitive"));
     caseSensitive.addActionListener(new ActionListener()
     {
@@ -223,8 +222,8 @@ public class GUserDefinedColours extends JPanel
     });
     lcaseColour
             .setText(MessageManager.getString("label.lower_case_colour"));
-    lcaseColour.setToolTipText(MessageManager
-            .getString("label.lower_case_tip"));
+    lcaseColour.setToolTipText(
+            MessageManager.getString("label.lower_case_tip"));
 
     saveLoadPanel.add(savebutton);
     saveLoadPanel.add(loadbutton);
@@ -256,7 +255,8 @@ public class GUserDefinedColours extends JPanel
       // Java 7 default has 5 options rather than 3 for choosing colours; keep
       // the first only
       colorChooser
-              .setChooserPanels(new AbstractColorChooserPanel[] { choosers[0] });
+              .setChooserPanels(new AbstractColorChooserPanel[]
+              { choosers[0] });
     }
 
     selectedButtons = new ArrayList<JButton>();