X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=83a8d24a151545e5f13290b493b36229f933f13c;hb=74c5bd7b1f98214a6d57d7c64d0548013530d397;hp=e1a43d9439284cc73d9b4c5eebdd21c4d6179b47;hpb=e6e92a1314a7b7557401b829846ac55dcffbfbe2;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index e1a43d9..83a8d24 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -101,7 +101,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
    */
   public UserDefinedColours(AlignmentPanel ap, SequenceGroup sg)
   {
-    super();
+    this();
 
     lcaseColour.setEnabled(false);
 
@@ -142,7 +142,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
   public UserDefinedColours(JalviewStructureDisplayI viewer,
           ColourSchemeI oldcs)
   {
-    super();
+    this();
     this.structureViewer = viewer;
 
     colorChooser.getSelectionModel().addChangeListener(this);
@@ -161,6 +161,12 @@ public class UserDefinedColours extends GUserDefinedColours implements
 
   }
 
+  public UserDefinedColours()
+  {
+    super();
+    selectedButtons = new ArrayList<JButton>();
+  }
+
   void showFrame()
   {
     colorChooser.getSelectionModel().addChangeListener(this);
@@ -276,9 +282,8 @@ public class UserDefinedColours extends GUserDefinedColours implements
       button.setBackground(newColour);
       button.setForeground(ColorUtils.brighterThan(newColour));
     }
-    if (button == lcaseColour)
+    if (lcaseColour.isSelected())
     {
-      button.setForeground(Color.black);
       for (int i = 0; i < lowerCaseButtons.size(); i++)
       {
         button = lowerCaseButtons.get(i);
@@ -847,29 +852,5 @@ public class UserDefinedColours extends GUserDefinedColours implements
     boolean selected = caseSensitive.isSelected();
     resetButtonPanel(selected);
     lcaseColour.setEnabled(selected);
-    lcaseColour.setForeground(Color.GRAY);
-  }
-
-  /**
-   * Action on clicking 'Lower case colour', which results in changing colour of
-   * all lower-case buttons when a colour is picked. A second click of the
-   * button turns off this behaviour.
-   */
-  @Override
-  public void lcaseColour_actionPerformed(ActionEvent e)
-  {
-    boolean enable = !selectedButtons.contains(lcaseColour);
-    selectedButtons.clear();
-    if (enable)
-    {
-      selectedButtons.add(lcaseColour);
-      lcaseColour.setForeground(lowerCaseButtons.get(0).getForeground());
-      lcaseColour.setForeground(Color.black);
-    }
-    else
-    {
-      lcaseColour.setBackground(Color.white);
-      lcaseColour.setForeground(Color.gray);
-    }
   }
 }