JAL-2361 select colour menu item by matching its name to colour scheme

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

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 9aed70d..a88b11f 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -880,7 +880,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
             .isApplicableTo(al));
     tcoffeeColour
             .setEnabled(new TCoffeeColourScheme(al).isApplicableTo(al));
-    RNAInteractionColour.setEnabled(nucleotide);
+    // RNAInteractionColour.setEnabled(nucleotide);
     showComplementMenuItem.setText(nucleotide ? MessageManager
             .getString("label.protein") : MessageManager
             .getString("label.nucleotide"));
@@ -3502,9 +3502,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   public void changeColour(ColourSchemeI cs)
   {
     // TODO: pull up to controller method
-
     if (cs != null)
     {
+      setColourSelected(cs.getSchemeName());
       // Make sure viewport is up to date w.r.t. any sliders
       if (viewport.getAbovePIDThreshold())
       {
@@ -3605,10 +3605,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   }
 
   /**
-   * DOCUMENT ME!
+   * Action on the user selecting either a named user-defined colour from the
+   * colour menu, or the option "User Defined" to create or load a new colour
+   * scheme.
    * 
    * @param e
-   *          DOCUMENT ME!
    */
   @Override
   public void userDefinedColour_actionPerformed(ActionEvent e)
@@ -3616,13 +3617,19 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     if (e.getActionCommand().equals(
             MessageManager.getString("action.user_defined")))
     {
+      /*
+       * User Defined... option; open panel to
+       * load / create / apply / save user defined colour
+       */
       new UserDefinedColours(alignPanel, null);
     }
     else
     {
+      /*
+       * User chose an existing user defined colour
+       */
       UserColourScheme udc = UserDefinedColours
               .getUserColourSchemes().get(e.getActionCommand());
-
       changeColour(udc);
     }
   }