User colours

[jalview.git] / src / jalview / gui / PopupMenu.java

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 26fc93c..40c51cb 100755 (executable)
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -339,6 +339,28 @@ public class PopupMenu extends JPopupMenu
         colourMenu.add(buriedColour);\r
         colourMenu.add(nucleotideMenuItem);\r
         colourMenu.add(userDefinedColour);\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
+            JMenuItem item = new JMenuItem(userColours.\r
+                nextElement().toString());\r
+            item.addActionListener(new ActionListener()\r
+            {\r
+              public void actionPerformed(ActionEvent evt)\r
+              {\r
+                userDefinedColour_actionPerformed(evt);\r
+              }\r
+            });\r
+            colourMenu.add(item);\r
+          }\r
+        }\r
+\r
+\r
         colourMenu.addSeparator();\r
         colourMenu.add(abovePIDColour);\r
         colourMenu.add(conservationMenuItem);\r
@@ -423,7 +445,7 @@ public class PopupMenu extends JPopupMenu
                     abovePIDColour_actionPerformed(e);\r
                 }\r
             });\r
-        userDefinedColour.setText("User Defined");\r
+        userDefinedColour.setText("User Defined...");\r
         userDefinedColour.addActionListener(new java.awt.event.ActionListener()\r
             {\r
                 public void actionPerformed(ActionEvent e)\r
@@ -621,9 +643,18 @@ public class PopupMenu extends JPopupMenu
      */\r
     protected void userDefinedColour_actionPerformed(ActionEvent e)\r
     {\r
-        new UserDefinedColours(ap, getGroup());\r
-    }\r
-\r
+       SequenceGroup sg = getGroup();\r
+\r
+       if (e.getActionCommand().equals("User Defined..."))\r
+         new UserDefinedColours(ap, sg);\r
+       else\r
+       {\r
+         UserColourScheme udc = (UserColourScheme) UserDefinedColours.\r
+             getUserColourSchemes().get(e.getActionCommand());\r
+\r
+         sg.cs = udc;\r
+       }\r
+     }\r
     /**\r
      * DOCUMENT ME!\r
      *\r