JAL-3851 allow multiple instances of Endpoints. Fixes to naming of IGV colour scheme

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

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 168f6c5..237e0c6 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -20,8 +20,6 @@
  */
 package jalview.gui;
 
-import java.util.Locale;
-
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -60,6 +58,7 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Vector;
 import java.util.concurrent.CompletableFuture;
@@ -3076,11 +3075,17 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   @Override
   public void wrapMenuItem_actionPerformed(ActionEvent e)
   {
-    scaleAbove.setVisible(wrapMenuItem.isSelected());
-    scaleLeft.setVisible(wrapMenuItem.isSelected());
-    scaleRight.setVisible(wrapMenuItem.isSelected());
-    viewport.setWrapAlignment(wrapMenuItem.isSelected());
+    wrapMenuItem_actionPerformed(e, wrapMenuItem.isSelected());
+  }
+
+  public void wrapMenuItem_actionPerformed(ActionEvent e, boolean select)
+  {
+    scaleAbove.setVisible(select);
+    scaleLeft.setVisible(select);
+    scaleRight.setVisible(select);
+    viewport.setWrapAlignment(select);
     alignPanel.updateLayout();
+    wrapMenuItem.setSelected(select);
   }
 
   @Override
@@ -3372,12 +3377,19 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   @Override
   public void annotationPanelMenuItem_actionPerformed(ActionEvent e)
   {
-    final boolean setVisible = annotationPanelMenuItem.isSelected();
+    annotationPanelMenuItem_actionPerformed(e,
+            annotationPanelMenuItem.isSelected());
+  }
+
+  public void annotationPanelMenuItem_actionPerformed(ActionEvent e,
+          boolean setVisible)
+  {
     viewport.setShowAnnotation(setVisible);
     this.showAllSeqAnnotations.setEnabled(setVisible);
     this.hideAllSeqAnnotations.setEnabled(setVisible);
     this.showAllAlAnnotations.setEnabled(setVisible);
     this.hideAllAlAnnotations.setEnabled(setVisible);
+    annotationPanelMenuItem.setSelected(setVisible);
     alignPanel.updateLayout();
   }