JAL-2360 ColourMenuHelper now builds and selects items in colour menu

[jalview.git] / src / jalview / jbgui / GAlignFrame.java

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index faa0d5d..dff20d3 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -31,7 +31,6 @@ import jalview.util.Platform;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.GridLayout;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
@@ -84,8 +83,6 @@ public class GAlignFrame extends JInternalFrame
 
   protected JRadioButtonMenuItem textColour;
 
-  protected JRadioButtonMenuItem userDefinedColour;
-
   protected JCheckBoxMenuItem annotationPanelMenuItem = new JCheckBoxMenuItem();
 
   protected JCheckBoxMenuItem colourTextMenuItem = new JCheckBoxMenuItem();
@@ -98,8 +95,6 @@ public class GAlignFrame extends JInternalFrame
 
   protected JCheckBoxMenuItem conservationMenuItem;
 
-  protected JRadioButtonMenuItem noColourmenuItem;
-
   protected JCheckBoxMenuItem wrapMenuItem = new JCheckBoxMenuItem();
 
   protected JCheckBoxMenuItem renderGapsMenuItem = new JCheckBoxMenuItem();
@@ -249,37 +244,6 @@ public class GAlignFrame extends JInternalFrame
     }
   }
 
-  /**
-   * Marks as selected the colour menu item matching the given name, or the
-   * first item ('None') if no match is found
-   * 
-   * @param colourName
-   */
-  protected void setColourSelected(String colourName)
-  {
-    noColourmenuItem.setSelected(true);
-    if (colourName == null)
-    {
-      return;
-    }
-
-    /*
-     * look for a radio button with a name that matches the colour name
-     * (note the button text may not as it may be internationalised)
-     */
-    for (Component menuItem : colourMenu.getMenuComponents())
-    {
-      if (menuItem instanceof JRadioButtonMenuItem)
-      {
-        if (colourName.equals(((JRadioButtonMenuItem) menuItem).getName()))
-        {
-          ((JRadioButtonMenuItem) menuItem).setSelected(true);
-          return;
-        }
-      }
-    }
-  }
-
   private void jbInit() throws Exception
   {
     initColourMenu();
@@ -1942,9 +1906,7 @@ public class GAlignFrame extends JInternalFrame
 
   /**
    * Constructs the entries on the Colour menu (but does not add them to the
-   * menu). The 'name' property of each item is set to the canonical name of the
-   * corresponding colour scheme (may not match the display name), to allow
-   * selection of items by colour scheme name.
+   * menu).
    */
   protected void initColourMenu()
   {
@@ -1970,18 +1932,6 @@ public class GAlignFrame extends JInternalFrame
       }
     });
 
-    userDefinedColour = new JRadioButtonMenuItem(
-            MessageManager
-            .getString("action.user_defined"));
-    userDefinedColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        userDefinedColour_actionPerformed(e);
-      }
-    });
-
     conservationMenuItem = new JCheckBoxMenuItem(
             MessageManager.getString("action.by_conservation"));
     conservationMenuItem.addActionListener(new ActionListener()
@@ -1992,17 +1942,6 @@ public class GAlignFrame extends JInternalFrame
         conservationMenuItem_actionPerformed();
       }
     });
-    noColourmenuItem = new JRadioButtonMenuItem(
-            MessageManager.getString("label.none"));
-    noColourmenuItem.setName("None");
-    noColourmenuItem.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        noColourmenuItem_actionPerformed();
-      }
-    });
 
     abovePIDThreshold = new JCheckBoxMenuItem(
             MessageManager.getString("label.above_identity_threshold"));
@@ -2403,20 +2342,6 @@ public class GAlignFrame extends JInternalFrame
   {
   }
 
-  protected void userDefinedColour_actionPerformed(ActionEvent e)
-  {
-  }
-
-  
-
-  /*
-   * protected void covariationColour_actionPerformed() { }
-   */
-
-  protected void noColourmenuItem_actionPerformed()
-  {
-  }
-
   protected void conservationMenuItem_actionPerformed()
   {
   }