JAL-3148 add all options to colour menu

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 94b38ed..764ba54 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -5568,8 +5568,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     colourMenu.add(textColour);
     colourMenu.addSeparator();
 
-    ColourMenuHelper.addMenuItems(colourMenu, this, viewport.getAlignment(),
-            false);
+       ColourMenuHelper.addMenuItems(colourMenu, this, viewport.getAlignment());
 
     colourMenu.addSeparator();
     colourMenu.add(conservationMenuItem);

diff --git a/src/jalview/gui/ColourMenuHelper.java b/src/jalview/gui/ColourMenuHelper.java
index 8f0b88c..fd5f080 100644 (file)
--- a/src/jalview/gui/ColourMenuHelper.java
+++ b/src/jalview/gui/ColourMenuHelper.java
@@ -72,12 +72,9 @@ public class ColourMenuHelper
    *          a callback to handle menu selection
    * @param coll
    *          the data the menu is being built for
-   * @param simpleOnly
-   *          if true, only simple per-residue colour schemes are included
    */
   public static ButtonGroup addMenuItems(final JMenu colourMenu,
-          final ColourChangeListener client, AnnotatedCollectionI coll,
-          boolean simpleOnly)
+                       final ColourChangeListener client, AnnotatedCollectionI coll)
   {
     /*
      * ButtonGroup groups those items whose 
@@ -85,22 +82,18 @@ public class ColourMenuHelper
      */
     ButtonGroup colours = new ButtonGroup();
 
-    if (!simpleOnly)
-    {
-      JRadioButtonMenuItem noColourmenuItem = new JRadioButtonMenuItem(
-              MessageManager.getString("label.none"));
-      noColourmenuItem.setName(ResidueColourScheme.NONE);
-      noColourmenuItem.addActionListener(new ActionListener()
-      {
-        @Override
-        public void actionPerformed(ActionEvent e)
-        {
-          client.changeColour_actionPerformed(ResidueColourScheme.NONE);
-        }
-      });
-      colourMenu.add(noColourmenuItem);
-      colours.add(noColourmenuItem);
-    }
+       JRadioButtonMenuItem noColourmenuItem = new JRadioButtonMenuItem(MessageManager.getString("label.none"));
+       noColourmenuItem.setName(ResidueColourScheme.NONE);
+       noColourmenuItem.addActionListener(new ActionListener() 
+       {
+         @Override
+         public void actionPerformed(ActionEvent e) 
+         {
+           client.changeColour_actionPerformed(ResidueColourScheme.NONE);
+         }
+       });
+       colourMenu.add(noColourmenuItem);
+       colours.add(noColourmenuItem);
 
     /*
      * scan registered colour schemes (built-in or user-defined)
@@ -110,11 +103,6 @@ public class ColourMenuHelper
             .getColourSchemes();
     for (ColourSchemeI scheme : colourSchemes)
     {
-      if (simpleOnly && !scheme.isSimple())
-      {
-        continue;
-      }
-
       /*
        * button text is i18n'd but the name is the canonical name of
        * the colour scheme (inspected in setColourSelected())

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index ed3d29a..b2d0428 100644 (file)
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -1431,7 +1431,7 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
     colourMenu.add(textColour);
     colourMenu.addSeparator();
 
-    ColourMenuHelper.addMenuItems(colourMenu, this, sg, false);
+               ColourMenuHelper.addMenuItems(colourMenu, this, sg);
 
     colourMenu.addSeparator();
     colourMenu.add(conservationMenuItem);