JAL-2360 refactoring for JalviewColourScheme enum,

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

diff --git a/src/jalview/gui/ChimeraViewFrame.java b/src/jalview/gui/ChimeraViewFrame.java
index 7a8f07c..048f441 100644 (file)
--- a/src/jalview/gui/ChimeraViewFrame.java
+++ b/src/jalview/gui/ChimeraViewFrame.java
@@ -40,6 +40,7 @@ import jalview.schemes.PurinePyrimidineColourScheme;
 import jalview.schemes.StrandColourScheme;
 import jalview.schemes.TaylorColourScheme;
 import jalview.schemes.TurnColourScheme;
+import jalview.schemes.UserColourScheme;
 import jalview.schemes.ZappoColourScheme;
 import jalview.structures.models.AAStructureBindingModel;
 import jalview.util.MessageManager;
@@ -925,10 +926,19 @@ public class ChimeraViewFrame extends StructureViewerBase
   }
 
   @Override
-  public void userColour_actionPerformed(ActionEvent actionEvent)
+  public void userColour_actionPerformed(ActionEvent e)
   {
-    userColour.setSelected(true);
-    new UserDefinedColours(this, null);
+    if (e.getActionCommand().equals(
+            MessageManager.getString("action.user_defined")))
+    {
+      new UserDefinedColours(this, null);
+    }
+    else
+    {
+      UserColourScheme udc = UserDefinedColours.getUserColourSchemes().get(
+              e.getActionCommand());
+      jmb.setJalviewColourScheme(udc);
+    }
   }
 
   @Override