Merge remote-tracking branch 'origin/develop' into features/JAL-2316

[jalview.git] / src / jalview / appletgui / APopupMenu.java

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index a1670ea..8487104 100644 (file)
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -244,8 +244,12 @@ public class APopupMenu extends java.awt.PopupMenu implements
       {
         menu1.setLabel(MessageManager.getString("action.edit_group"));
         groupMenu.remove(createGroupMenuItem);
+        if (sg.cs != null)
+        {
+          abovePIDColour.setState(sg.cs.getThreshold() > 0);
+          conservationMenuItem.setState(sg.cs.conservationApplied());
+        }
       }
-
     }
     else
     {
@@ -500,23 +504,28 @@ public class APopupMenu extends java.awt.PopupMenu implements
   @Override
   public void itemStateChanged(ItemEvent evt)
   {
-    if (evt.getSource() == abovePIDColour)
+    Object source = evt.getSource();
+    if (source == abovePIDColour)
     {
       abovePIDColour_itemStateChanged();
     }
-    else if (evt.getSource() == showColourText)
+    else if (source == conservationMenuItem)
+    {
+      conservationMenuItem_itemStateChanged();
+    }
+    else if (source == showColourText)
     {
       showColourText_itemStateChanged();
     }
-    else if (evt.getSource() == showText)
+    else if (source == showText)
     {
       showText_itemStateChanged();
     }
-    else if (evt.getSource() == showBoxes)
+    else if (source == showBoxes)
     {
       showBoxes_itemStateChanged();
     }
-    else if (evt.getSource() == displayNonconserved)
+    else if (source == displayNonconserved)
     {
       this.showNonconserved_itemStateChanged();
     }
@@ -579,10 +588,6 @@ public class APopupMenu extends java.awt.PopupMenu implements
     {
       noColourmenuItem_actionPerformed();
     }
-    else if (source == conservationMenuItem)
-    {
-      conservationMenuItem_itemStateChanged();
-    }
     else if (source == unGroupMenuItem)
     {
       unGroupMenuItem_actionPerformed();