JAL-2416 order score models by order of addition rather than name

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

diff --git a/src/jalview/jbgui/GUserDefinedColours.java b/src/jalview/jbgui/GUserDefinedColours.java
index 65deb5e..aa5319c 100755 (executable)
--- a/src/jalview/jbgui/GUserDefinedColours.java
+++ b/src/jalview/jbgui/GUserDefinedColours.java
@@ -32,6 +32,8 @@ import java.awt.GridBagLayout;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -102,7 +104,9 @@ public class GUserDefinedColours extends JPanel
 
   protected JCheckBox caseSensitive = new JCheckBox();
 
-  protected JButton lcaseColour = new JButton();
+  protected JCheckBox lcaseColour = new JCheckBox();
+
+  protected List<JButton> selectedButtons;
 
   /**
    * Creates a new GUserDefinedColours object.
@@ -219,14 +223,8 @@ public class GUserDefinedColours extends JPanel
     });
     lcaseColour
             .setText(MessageManager.getString("label.lower_case_colour"));
-    lcaseColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        lcaseColour_actionPerformed(e);
-      }
-    });
+    lcaseColour.setToolTipText(MessageManager
+            .getString("label.lower_case_tip"));
 
     saveLoadPanel.add(savebutton);
     saveLoadPanel.add(loadbutton);
@@ -260,6 +258,8 @@ public class GUserDefinedColours extends JPanel
       colorChooser
               .setChooserPanels(new AbstractColorChooserPanel[] { choosers[0] });
     }
+
+    selectedButtons = new ArrayList<JButton>();
   }
 
   /**