updateUserColourMenu

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index a41fb36..22c0a1d 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1553,7 +1553,50 @@ public class AlignFrame extends GAlignFrame
      */\r
     public void userDefinedColour_actionPerformed(ActionEvent e)\r
     {\r
+      if(e.getActionCommand().equals("User Defined..."))\r
         new UserDefinedColours(alignPanel, null);\r
+      else\r
+      {\r
+        UserColourScheme udc = (UserColourScheme)UserDefinedColours.\r
+            getUserColourSchemes().get(e.getActionCommand());\r
+\r
+        changeColour(udc);\r
+      }\r
+    }\r
+\r
+    public void updateUserColourMenu()\r
+    {\r
+\r
+      Component [] menuItems = colourMenu.getMenuComponents();\r
+      int i, iSize = menuItems.length;\r
+      for(i=0; i<iSize; i++)\r
+      {\r
+        if( menuItems[i].getName()!=null && menuItems[i].getName().equals("USER_DEFINED"))\r
+        {\r
+          colourMenu.remove(menuItems[i]);\r
+          iSize--;\r
+        }\r
+      }\r
+      if(jalview.gui.UserDefinedColours.getUserColourSchemes()!=null)\r
+      {\r
+        java.util.Enumeration userColours = jalview.gui.UserDefinedColours.\r
+            getUserColourSchemes().keys();\r
+\r
+        while (userColours.hasMoreElements())\r
+        {\r
+          JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(userColours.\r
+              nextElement().toString());\r
+          radioItem.addActionListener(new ActionListener()\r
+          {\r
+            public void actionPerformed(ActionEvent evt)\r
+            {\r
+              userDefinedColour_actionPerformed(evt);\r
+            }\r
+          });\r
+          colourMenu.insert(radioItem, 15);\r
+          colours.add(radioItem);\r
+        }\r
+    }\r
     }\r
 \r
     /**\r