Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371colle...

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

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index e186145..37cd8b3 100644 (file)
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -1261,7 +1261,7 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        abovePIDColour_actionPerformed();
+        abovePIDColour_actionPerformed(abovePIDColour.isSelected());
       }
     });
 
@@ -1283,7 +1283,8 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        conservationMenuItem_actionPerformed();
+        conservationMenuItem_actionPerformed(conservationMenuItem
+                .isSelected());
       }
     });
 
@@ -1528,10 +1529,12 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
   /**
    * DOCUMENT ME!
    * 
+   * @param selected
+   * 
    * @param e
    *          DOCUMENT ME!
    */
-  protected void abovePIDColour_actionPerformed()
+  protected void abovePIDColour_actionPerformed(boolean selected)
   {
     SequenceGroup sg = getGroup();
     if (sg.cs == null)
@@ -1539,7 +1542,6 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
       return;
     }
 
-    boolean selected = abovePIDColour.isSelected();
     if (selected)
     {
       sg.cs.setConsensus(AAFrequency.calculate(
@@ -1583,7 +1585,7 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
    * @param e
    *          DOCUMENT ME!
    */
-  protected void conservationMenuItem_actionPerformed()
+  protected void conservationMenuItem_actionPerformed(boolean selected)
   {
     SequenceGroup sg = getGroup();
     if (sg.cs == null)
@@ -1591,7 +1593,6 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
       return;
     }
 
-    boolean selected = conservationMenuItem.isSelected();
     if (selected)
     {
       // JBPNote: Conservation name shouldn't be i18n translated
@@ -1999,6 +2000,8 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
   /**
    * Action on user selecting an item from the colour menu (that does not have
    * its bespoke action handler)
+   * 
+   * @return
    */
   @Override
   public void changeColour_actionPerformed(String colourSchemeName)