Merge develop to Release_2_8_3_Branch
[jalview.git] / src / jalview / jbgui / GAlignFrame.java
index 78aaca6..befa3b1 100755 (executable)
  */
 package jalview.jbgui;
 
-import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder;
-import jalview.bin.Cache;
-import jalview.gui.JvSwingUtils;
-import jalview.gui.Preferences;
-import jalview.schemes.ColourSchemeProperty;
-import jalview.util.MessageManager;
-
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.GridLayout;
@@ -35,8 +28,11 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
@@ -50,77 +46,40 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JRadioButtonMenuItem;
 import javax.swing.JTabbedPane;
+import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
 
+import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder;
+import jalview.api.SplitContainerI;
+import jalview.bin.Cache;
+import jalview.gui.JvSwingUtils;
+import jalview.gui.Preferences;
+import jalview.schemes.ColourSchemeProperty;
+import jalview.util.MessageManager;
+
 public class GAlignFrame extends JInternalFrame
 {
   protected JMenuBar alignFrameMenuBar = new JMenuBar();
 
-  protected JMenu fileMenu = new JMenu();
-
   protected JMenuItem closeMenuItem = new JMenuItem();
 
-  protected JMenu editMenu = new JMenu();
-
-  protected JMenu viewMenu = new JMenu();
-
-  protected JMenu annotationsMenu = new JMenu();
-
   protected JMenu colourMenu = new JMenu();
 
-  protected JMenu calculateMenu = new JMenu();
-
   protected JMenu webService = new JMenu();
 
   protected JMenuItem webServiceNoServices;
 
-  protected JMenuItem selectAllSequenceMenuItem = new JMenuItem();
-
-  protected JMenuItem deselectAllSequenceMenuItem = new JMenuItem();
-
-  protected JMenuItem invertSequenceMenuItem = new JMenuItem();
-
-  protected JMenuItem remove2LeftMenuItem = new JMenuItem();
-
-  protected JMenuItem remove2RightMenuItem = new JMenuItem();
-
-  protected JMenuItem removeGappedColumnMenuItem = new JMenuItem();
-
-  protected JMenuItem removeAllGapsMenuItem = new JMenuItem();
-
   public JCheckBoxMenuItem viewBoxesMenuItem = new JCheckBoxMenuItem();
 
   public JCheckBoxMenuItem viewTextMenuItem = new JCheckBoxMenuItem();
 
-  protected JMenuItem sortPairwiseMenuItem = new JMenuItem();
-
-  protected JMenuItem sortIDMenuItem = new JMenuItem();
-
-  protected JMenuItem sortLengthMenuItem = new JMenuItem();
-
-  protected JMenuItem sortGroupMenuItem = new JMenuItem();
-
   protected JMenu sortByAnnotScore = new JMenu();
 
-  protected JMenuItem removeRedundancyMenuItem = new JMenuItem();
-
-  protected JMenuItem pairwiseAlignmentMenuItem = new JMenuItem();
-
-  protected JMenuItem PCAMenuItem = new JMenuItem();
-
-  protected JMenuItem averageDistanceTreeMenuItem = new JMenuItem();
-
-  protected JMenuItem neighbourTreeMenuItem = new JMenuItem();
-
-  BorderLayout borderLayout1 = new BorderLayout();
-
   public JLabel statusBar = new JLabel();
 
-  protected JMenuItem saveAs = new JMenuItem();
-
   protected JMenu outputTextboxMenu = new JMenu();
 
   protected JRadioButtonMenuItem clustalColour = new JRadioButtonMenuItem();
@@ -156,20 +115,12 @@ public class GAlignFrame extends JInternalFrame
 
   protected JRadioButtonMenuItem tcoffeeColour = new JRadioButtonMenuItem();
 
-  JMenuItem njTreeBlosumMenuItem = new JMenuItem();
-
-  JMenuItem avDistanceTreeBlosumMenuItem = new JMenuItem();
-
   public JCheckBoxMenuItem annotationPanelMenuItem = new JCheckBoxMenuItem();
 
   public JCheckBoxMenuItem colourTextMenuItem = new JCheckBoxMenuItem();
 
   public JCheckBoxMenuItem showNonconservedMenuItem = new JCheckBoxMenuItem();
 
-  JMenuItem htmlMenuItem = new JMenuItem();
-
-  JMenuItem overviewMenuItem = new JMenuItem();
-
   protected JMenuItem undoMenuItem = new JMenuItem();
 
   protected JMenuItem redoMenuItem = new JMenuItem();
@@ -180,60 +131,30 @@ public class GAlignFrame extends JInternalFrame
 
   public JCheckBoxMenuItem wrapMenuItem = new JCheckBoxMenuItem();
 
-  JMenuItem printMenuItem = new JMenuItem();
-
   public JCheckBoxMenuItem renderGapsMenuItem = new JCheckBoxMenuItem();
 
-  JMenuItem findMenuItem = new JMenuItem();
-
   public JCheckBoxMenuItem abovePIDThreshold = new JCheckBoxMenuItem();
 
   public JCheckBoxMenuItem showSeqFeatures = new JCheckBoxMenuItem();
 
   public JCheckBoxMenuItem showSeqFeaturesHeight = new JCheckBoxMenuItem();
 
-  JMenuItem deleteGroups = new JMenuItem();
-
-  JMenuItem createGroup = new JMenuItem();
-
-  JMenuItem unGroup = new JMenuItem();
-
-  JMenuItem delete = new JMenuItem();
-
   JMenuItem copy = new JMenuItem();
 
   JMenuItem cut = new JMenuItem();
 
   JMenu pasteMenu = new JMenu();
 
-  JMenuItem pasteNew = new JMenuItem();
-
-  JMenuItem pasteThis = new JMenuItem();
-
   public JCheckBoxMenuItem applyToAllGroups = new JCheckBoxMenuItem();
 
-  JMenuItem createPNG = new JMenuItem();
-
-  JMenuItem createBioJS = new JMenuItem();
-
-  JMenuItem createSVG = new JMenuItem();
-
-  protected JMenuItem font = new JMenuItem();
-
   public JCheckBoxMenuItem seqLimits = new JCheckBoxMenuItem();
 
-  JMenuItem epsFile = new JMenuItem();
-
-  JMenuItem LoadtreeMenuItem = new JMenuItem();
-
   public JCheckBoxMenuItem scaleAbove = new JCheckBoxMenuItem();
 
   public JCheckBoxMenuItem scaleLeft = new JCheckBoxMenuItem();
 
   public JCheckBoxMenuItem scaleRight = new JCheckBoxMenuItem();
 
-  protected JMenuItem modifyPID = new JMenuItem();
-
   protected JMenuItem modifyConservation = new JMenuItem();
 
   protected JMenu sortByTreeMenu = new JMenu();
@@ -242,8 +163,6 @@ public class GAlignFrame extends JInternalFrame
 
   protected JMenu calculateTree = new JMenu();
 
-  JMenu jMenu2 = new JMenu();
-
   protected JCheckBoxMenuItem padGapsMenuitem = new JCheckBoxMenuItem();
 
   protected JCheckBoxMenuItem showNpFeatsMenuitem = new JCheckBoxMenuItem();
@@ -252,68 +171,20 @@ public class GAlignFrame extends JInternalFrame
 
   protected ButtonGroup colours = new ButtonGroup();
 
-  JMenuItem vamsasStore = new JMenuItem();
-
   protected JMenuItem showTranslation = new JMenuItem();
 
-  protected JMenuItem extractScores = new JMenuItem();
-
-  protected JMenuItem expandAlignment = new JMenuItem();
-
   protected JMenu showProducts = new JMenu();
 
-  public JMenuItem openFeatureSettings = new JMenuItem();
-
-  JMenuItem fetchSequence = new JMenuItem();
-
-  JMenuItem annotationColour = new JMenuItem();
-
-  JMenuItem annotationColumn = new JMenuItem();
-
   protected JMenuItem rnahelicesColour = new JMenuItem();
 
-  JMenuItem associatedData = new JMenuItem();
-
   protected JCheckBoxMenuItem autoCalculate = new JCheckBoxMenuItem();
 
   protected JCheckBoxMenuItem sortByTree = new JCheckBoxMenuItem();
 
   protected JCheckBoxMenuItem listenToViewSelections = new JCheckBoxMenuItem();
 
-  JMenu addSequenceMenu = new JMenu();
-
-  JMenuItem addFromFile = new JMenuItem();
-
-  JMenuItem addFromText = new JMenuItem();
-
-  JMenuItem addFromURL = new JMenuItem();
-
-  JMenuItem exportAnnotations = new JMenuItem();
-
-  JMenuItem exportFeatures = new JMenuItem();
-
   protected JPanel statusPanel = new JPanel();
 
-  GridLayout gridLayout1 = new GridLayout();
-
-  JMenu jMenu3 = new JMenu();
-
-  JMenuItem showAllSeqs = new JMenuItem();
-
-  JMenuItem showAllColumns = new JMenuItem();
-
-  JMenu hideMenu = new JMenu();
-
-  JMenuItem hideSelSequences = new JMenuItem();
-
-  JMenuItem hideSelColumns = new JMenuItem();
-
-  JMenuItem hideAllButSelection = new JMenuItem();
-
-  JMenuItem hideAllSelection = new JMenuItem();
-
-  JMenuItem showAllhidden = new JMenuItem();
-
   protected JMenuItem showAllSeqAnnotations = new JMenuItem();
 
   protected JMenuItem hideAllSeqAnnotations = new JMenuItem();
@@ -322,27 +193,15 @@ public class GAlignFrame extends JInternalFrame
 
   protected JMenuItem hideAllAlAnnotations = new JMenuItem();
 
-  protected JCheckBoxMenuItem sortAnnBySequence = new JCheckBoxMenuItem();
-
-  protected JCheckBoxMenuItem sortAnnByLabel = new JCheckBoxMenuItem();
+  protected JCheckBoxMenuItem showComplementMenuItem = new JCheckBoxMenuItem();
 
   protected JCheckBoxMenuItem hiddenMarkers = new JCheckBoxMenuItem();
 
-  JMenuItem invertColSel = new JMenuItem();
-
   protected JTabbedPane tabbedPane = new JTabbedPane();
 
-  JMenuItem save = new JMenuItem();
-
   protected JMenuItem reload = new JMenuItem();
 
-  JMenuItem newView = new JMenuItem();
-
-  JMenuItem textColour = new JMenuItem();
-
-  JMenu formatMenu = new JMenu();
-
-  JMenu selectMenu = new JMenu();
+  protected JMenu formatMenu = new JMenu();
 
   protected JCheckBoxMenuItem idRightAlign = new JCheckBoxMenuItem();
 
@@ -354,18 +213,6 @@ public class GAlignFrame extends JInternalFrame
 
   protected JMenuItem expandViews = new JMenuItem();
 
-  JMenuItem pageSetup = new JMenuItem();
-
-  JMenuItem alignmentProperties = new JMenuItem();
-
-  JMenu tooltipSettingsMenu = new JMenu();
-
-  private JMenuItem justifyLeftMenuItem = new JMenuItem();
-
-  private JMenuItem justifyRightMenuItem = new JMenuItem();
-
-  JMenu autoAnnMenu = new JMenu();
-
   protected JCheckBoxMenuItem showGroupConsensus = new JCheckBoxMenuItem();
 
   protected JCheckBoxMenuItem showGroupConservation = new JCheckBoxMenuItem();
@@ -378,16 +225,14 @@ public class GAlignFrame extends JInternalFrame
 
   protected JCheckBoxMenuItem applyAutoAnnotationSettings = new JCheckBoxMenuItem();
 
-  protected JRadioButtonMenuItem showAutoFirst = new JRadioButtonMenuItem();
-
-  protected JRadioButtonMenuItem showAutoLast = new JRadioButtonMenuItem();
-
-  private JMenuItem grpsFromSelection = new JMenuItem();
-
   private SequenceAnnotationOrder annotationSortOrder;
 
   private boolean showAutoCalculatedAbove = false;
 
+  private Map<KeyStroke, JMenuItem> accelerators = new HashMap<KeyStroke, JMenuItem>();
+
+  private SplitContainerI splitFrame;
+
   public GAlignFrame()
   {
     try
@@ -401,7 +246,7 @@ public class GAlignFrame extends JInternalFrame
         JMenuItem item = new JMenuItem(
                 jalview.io.FormatAdapter.WRITEABLE_FORMATS[i]);
 
-        item.addActionListener(new java.awt.event.ActionListener()
+        item.addActionListener(new ActionListener()
         {
           @Override
           public void actionPerformed(ActionEvent e)
@@ -505,9 +350,8 @@ public class GAlignFrame extends JInternalFrame
     // colours.add(covariationColour);
     colours.add(tcoffeeColour);
     colours.add(RNAInteractionColour);
-    setColourSelected(jalview.bin.Cache
-            .getDefault("DEFAULT_COLOUR", "None"));
-
+    setColourSelected(jalview.bin.Cache.getDefault(
+            Preferences.DEFAULT_COLOUR, "None"));
   }
 
   public void setColourSelected(String defaultColour)
@@ -609,82 +453,88 @@ public class GAlignFrame extends JInternalFrame
 
   private void jbInit() throws Exception
   {
-    fileMenu.setText(MessageManager.getString("action.file"));
-    saveAs.setText(MessageManager.getString("action.save_as") + "...");
-    saveAs.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_S, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask()
-                    | java.awt.event.KeyEvent.SHIFT_MASK, false));
-    saveAs.addActionListener(new ActionListener()
+    JMenuItem saveAs = new JMenuItem(
+            MessageManager.getString("action.save_as") + "...");
+    ActionListener al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         saveAs_actionPerformed(e);
       }
-    });
+    };
+    KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask()
+            | KeyEvent.SHIFT_MASK, false);
+    addMenuActionAndAccelerator(keyStroke, saveAs, al);
+
     closeMenuItem.setText(MessageManager.getString("action.close"));
-    closeMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_W, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask(), false));
-    closeMenuItem.addActionListener(new java.awt.event.ActionListener()
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_W, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         closeMenuItem_actionPerformed(false);
       }
-    });
-    editMenu.setText(MessageManager.getString("action.edit"));
-    viewMenu.setText(MessageManager.getString("action.view"));
-    annotationsMenu.setText(MessageManager.getString("action.annotations"));
+    };
+    addMenuActionAndAccelerator(keyStroke, closeMenuItem, al);
+
+    JMenu editMenu = new JMenu(MessageManager.getString("action.edit"));
+    JMenu viewMenu = new JMenu(MessageManager.getString("action.view"));
+    JMenu annotationsMenu = new JMenu(
+            MessageManager.getString("action.annotations"));
+    JMenu showMenu = new JMenu(MessageManager.getString("action.show"));
     colourMenu.setText(MessageManager.getString("action.colour"));
-    calculateMenu.setText(MessageManager.getString("action.calculate"));
+    JMenu calculateMenu = new JMenu(
+            MessageManager.getString("action.calculate"));
     webService.setText(MessageManager.getString("action.web_service"));
-    selectAllSequenceMenuItem.setText(MessageManager
+    JMenuItem selectAllSequenceMenuItem = new JMenuItem(
+            MessageManager
             .getString("action.select_all"));
-    selectAllSequenceMenuItem.setAccelerator(javax.swing.KeyStroke
-            .getKeyStroke(java.awt.event.KeyEvent.VK_A, Toolkit
-                    .getDefaultToolkit().getMenuShortcutKeyMask(), false));
-    selectAllSequenceMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                selectAllSequenceMenuItem_actionPerformed(e);
-              }
-            });
-    deselectAllSequenceMenuItem.setText(MessageManager
-            .getString("action.deselect_all"));
-    deselectAllSequenceMenuItem.setAccelerator(javax.swing.KeyStroke
-            .getKeyStroke(java.awt.event.KeyEvent.VK_ESCAPE, 0, false));
-    deselectAllSequenceMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                deselectAllSequenceMenuItem_actionPerformed(e);
-              }
-            });
-    invertSequenceMenuItem.setText(MessageManager
-            .getString("action.invert_sequence_selection"));
-    invertSequenceMenuItem.setAccelerator(javax.swing.KeyStroke
-            .getKeyStroke(java.awt.event.KeyEvent.VK_I, Toolkit
-                    .getDefaultToolkit().getMenuShortcutKeyMask(), false));
-    invertSequenceMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                invertSequenceMenuItem_actionPerformed(e);
-              }
-            });
-    grpsFromSelection.setText(MessageManager
-            .getString("action.make_groups_selection"));
-    grpsFromSelection.addActionListener(new java.awt.event.ActionListener()
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_A, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        selectAllSequenceMenuItem_actionPerformed(e);
+      }
+    };
+    addMenuActionAndAccelerator(keyStroke, selectAllSequenceMenuItem, al);
+
+    JMenuItem deselectAllSequenceMenuItem = new JMenuItem(
+            MessageManager.getString("action.deselect_all"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0, false);
+    al = new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        deselectAllSequenceMenuItem_actionPerformed(e);
+      }
+    };
+    addMenuActionAndAccelerator(keyStroke, deselectAllSequenceMenuItem, al);
+
+    JMenuItem invertSequenceMenuItem = new JMenuItem(
+            MessageManager.getString("action.invert_sequence_selection"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_I, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        invertSequenceMenuItem_actionPerformed(e);
+      }
+    };
+    addMenuActionAndAccelerator(keyStroke, invertSequenceMenuItem, al);
+
+    JMenuItem grpsFromSelection = new JMenuItem(
+            MessageManager.getString("action.make_groups_selection"));
+    grpsFromSelection.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -692,11 +542,11 @@ public class GAlignFrame extends JInternalFrame
         makeGrpsFromSelection_actionPerformed(e);
       }
     });
-    expandAlignment.setText(MessageManager
-            .getString("action.view_flanking_regions"));
+    JMenuItem expandAlignment = new JMenuItem(
+            MessageManager.getString("action.view_flanking_regions"));
     expandAlignment.setToolTipText(MessageManager
             .getString("label.view_flanking_regions"));
-    expandAlignment.addActionListener(new java.awt.event.ActionListener()
+    expandAlignment.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -704,88 +554,86 @@ public class GAlignFrame extends JInternalFrame
         expand_newalign(e);
       }
     });
-    remove2LeftMenuItem.setText(MessageManager
-            .getString("action.remove_left"));
-    remove2LeftMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_L, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask(), false));
-    remove2LeftMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                remove2LeftMenuItem_actionPerformed(e);
-              }
-            });
-    remove2RightMenuItem.setText(MessageManager
-            .getString("action.remove_right"));
-    remove2RightMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_R, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask(), false));
-    remove2RightMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                remove2RightMenuItem_actionPerformed(e);
-              }
-            });
-    removeGappedColumnMenuItem.setText(MessageManager
-            .getString("action.remove_empty_columns"));
-    removeGappedColumnMenuItem.setAccelerator(javax.swing.KeyStroke
-            .getKeyStroke(java.awt.event.KeyEvent.VK_E, Toolkit
-                    .getDefaultToolkit().getMenuShortcutKeyMask(), false));
-    removeGappedColumnMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                removeGappedColumnMenuItem_actionPerformed(e);
-              }
-            });
-    removeAllGapsMenuItem.setText(MessageManager
-            .getString("action.remove_all_gaps"));
-    removeAllGapsMenuItem.setAccelerator(javax.swing.KeyStroke
-            .getKeyStroke(java.awt.event.KeyEvent.VK_E, Toolkit
-                    .getDefaultToolkit().getMenuShortcutKeyMask()
-                    | java.awt.event.KeyEvent.SHIFT_MASK, false));
-    removeAllGapsMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                removeAllGapsMenuItem_actionPerformed(e);
-              }
-            });
-    justifyLeftMenuItem.setText(MessageManager
-            .getString("action.left_justify_alignment"));
-    justifyLeftMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                justifyLeftMenuItem_actionPerformed(e);
-              }
-            });
-    justifyRightMenuItem.setText(MessageManager
-            .getString("action.right_justify_alignment"));
-    justifyRightMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                justifyRightMenuItem_actionPerformed(e);
-              }
-            });
+    JMenuItem remove2LeftMenuItem = new JMenuItem(
+            MessageManager.getString("action.remove_left"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_L, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        remove2LeftMenuItem_actionPerformed(e);
+      }
+    };
+    addMenuActionAndAccelerator(keyStroke, remove2LeftMenuItem, al);
+
+    JMenuItem remove2RightMenuItem = new JMenuItem(
+            MessageManager.getString("action.remove_right"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        remove2RightMenuItem_actionPerformed(e);
+      }
+    };
+    addMenuActionAndAccelerator(keyStroke, remove2RightMenuItem, al);
+
+    JMenuItem removeGappedColumnMenuItem = new JMenuItem(
+            MessageManager.getString("action.remove_empty_columns"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        removeGappedColumnMenuItem_actionPerformed(e);
+      }
+    };
+    addMenuActionAndAccelerator(keyStroke, removeGappedColumnMenuItem, al);
+
+    JMenuItem removeAllGapsMenuItem = new JMenuItem(
+            MessageManager.getString("action.remove_all_gaps"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask()
+            | KeyEvent.SHIFT_MASK, false);
+    al = new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        removeAllGapsMenuItem_actionPerformed(e);
+      }
+    };
+    addMenuActionAndAccelerator(keyStroke, removeAllGapsMenuItem, al);
+
+    JMenuItem justifyLeftMenuItem = new JMenuItem(
+            MessageManager.getString("action.left_justify_alignment"));
+    justifyLeftMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        justifyLeftMenuItem_actionPerformed(e);
+      }
+    });
+    JMenuItem justifyRightMenuItem = new JMenuItem(
+            MessageManager.getString("action.right_justify_alignment"));
+    justifyRightMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        justifyRightMenuItem_actionPerformed(e);
+      }
+    });
     viewBoxesMenuItem.setText(MessageManager.getString("action.boxes"));
     viewBoxesMenuItem.setState(true);
-    viewBoxesMenuItem.addActionListener(new java.awt.event.ActionListener()
+    viewBoxesMenuItem.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -795,7 +643,7 @@ public class GAlignFrame extends JInternalFrame
     });
     viewTextMenuItem.setText(MessageManager.getString("action.text"));
     viewTextMenuItem.setState(true);
-    viewTextMenuItem.addActionListener(new java.awt.event.ActionListener()
+    viewTextMenuItem.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -806,28 +654,27 @@ public class GAlignFrame extends JInternalFrame
     showNonconservedMenuItem.setText(MessageManager
             .getString("label.show_non_conversed"));
     showNonconservedMenuItem.setState(false);
-    showNonconservedMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                showUnconservedMenuItem_actionPerformed(e);
-              }
-            });
-    sortPairwiseMenuItem.setText(MessageManager
-            .getString("action.by_pairwise_id"));
-    sortPairwiseMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                sortPairwiseMenuItem_actionPerformed(e);
-              }
-            });
-    sortIDMenuItem.setText(MessageManager.getString("action.by_id"));
-    sortIDMenuItem.addActionListener(new java.awt.event.ActionListener()
+    showNonconservedMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        showUnconservedMenuItem_actionPerformed(e);
+      }
+    });
+    JMenuItem sortPairwiseMenuItem = new JMenuItem(
+            MessageManager.getString("action.by_pairwise_id"));
+    sortPairwiseMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        sortPairwiseMenuItem_actionPerformed(e);
+      }
+    });
+    JMenuItem sortIDMenuItem = new JMenuItem(
+            MessageManager.getString("action.by_id"));
+    sortIDMenuItem.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -835,19 +682,19 @@ public class GAlignFrame extends JInternalFrame
         sortIDMenuItem_actionPerformed(e);
       }
     });
-    sortLengthMenuItem
-            .setText(MessageManager.getString("action.by_length"));
-    sortLengthMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                sortLengthMenuItem_actionPerformed(e);
-              }
-            });
-    sortGroupMenuItem.setText(MessageManager.getString("action.by_group"));
-    sortGroupMenuItem.addActionListener(new java.awt.event.ActionListener()
+    JMenuItem sortLengthMenuItem = new JMenuItem(
+            MessageManager.getString("action.by_length"));
+    sortLengthMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        sortLengthMenuItem_actionPerformed(e);
+      }
+    });
+    JMenuItem sortGroupMenuItem = new JMenuItem(
+            MessageManager.getString("action.by_group"));
+    sortGroupMenuItem.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -855,34 +702,34 @@ public class GAlignFrame extends JInternalFrame
         sortGroupMenuItem_actionPerformed(e);
       }
     });
-    removeRedundancyMenuItem.setText(MessageManager
+
+    JMenuItem removeRedundancyMenuItem = new JMenuItem(MessageManager
             .getString("action.remove_redundancy").concat("..."));
-    removeRedundancyMenuItem.setAccelerator(javax.swing.KeyStroke
-            .getKeyStroke(java.awt.event.KeyEvent.VK_D, Toolkit
-                    .getDefaultToolkit().getMenuShortcutKeyMask(), false));
-    removeRedundancyMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                removeRedundancyMenuItem_actionPerformed(e);
-              }
-            });
-    pairwiseAlignmentMenuItem.setText(MessageManager
-            .getString("action.pairwise_alignment"));
-    pairwiseAlignmentMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                pairwiseAlignmentMenuItem_actionPerformed(e);
-              }
-            });
-    PCAMenuItem.setText(MessageManager
-            .getString("label.principal_component_analysis"));
-    PCAMenuItem.addActionListener(new java.awt.event.ActionListener()
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        removeRedundancyMenuItem_actionPerformed(e);
+      }
+    };
+    addMenuActionAndAccelerator(keyStroke, removeRedundancyMenuItem, al);
+
+    JMenuItem pairwiseAlignmentMenuItem = new JMenuItem(
+            MessageManager.getString("action.pairwise_alignment"));
+    pairwiseAlignmentMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        pairwiseAlignmentMenuItem_actionPerformed(e);
+      }
+    });
+    JMenuItem PCAMenuItem = new JMenuItem(
+            MessageManager.getString("label.principal_component_analysis"));
+    PCAMenuItem.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -890,29 +737,28 @@ public class GAlignFrame extends JInternalFrame
         PCAMenuItem_actionPerformed(e);
       }
     });
-    averageDistanceTreeMenuItem.setText(MessageManager
-            .getString("label.average_distance_identity"));
-    averageDistanceTreeMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                averageDistanceTreeMenuItem_actionPerformed(e);
-              }
-            });
-    neighbourTreeMenuItem.setText(MessageManager
-            .getString("label.neighbour_joining_identity"));
-    neighbourTreeMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                neighbourTreeMenuItem_actionPerformed(e);
-              }
-            });
-    this.getContentPane().setLayout(borderLayout1);
+    JMenuItem averageDistanceTreeMenuItem = new JMenuItem(
+            MessageManager.getString("label.average_distance_identity"));
+    averageDistanceTreeMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        averageDistanceTreeMenuItem_actionPerformed(e);
+      }
+    });
+    JMenuItem neighbourTreeMenuItem = new JMenuItem(
+            MessageManager.getString("label.neighbour_joining_identity"));
+    neighbourTreeMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        neighbourTreeMenuItem_actionPerformed(e);
+      }
+    });
+
+    this.getContentPane().setLayout(new BorderLayout());
     alignFrameMenuBar.setFont(new java.awt.Font("Verdana", 0, 11));
     statusBar.setBackground(Color.white);
     statusBar.setFont(new java.awt.Font("Verdana", 0, 11));
@@ -921,8 +767,7 @@ public class GAlignFrame extends JInternalFrame
     outputTextboxMenu.setText(MessageManager
             .getString("label.out_to_textbox"));
     clustalColour.setText(MessageManager.getString("label.clustalx"));
-
-    clustalColour.addActionListener(new java.awt.event.ActionListener()
+    clustalColour.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -931,7 +776,7 @@ public class GAlignFrame extends JInternalFrame
       }
     });
     zappoColour.setText(MessageManager.getString("label.zappo"));
-    zappoColour.addActionListener(new java.awt.event.ActionListener()
+    zappoColour.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -940,7 +785,7 @@ public class GAlignFrame extends JInternalFrame
       }
     });
     taylorColour.setText(MessageManager.getString("label.taylor"));
-    taylorColour.addActionListener(new java.awt.event.ActionListener()
+    taylorColour.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -950,17 +795,16 @@ public class GAlignFrame extends JInternalFrame
     });
     hydrophobicityColour.setText(MessageManager
             .getString("label.hydrophobicity"));
-    hydrophobicityColour
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                hydrophobicityColour_actionPerformed(e);
-              }
-            });
+    hydrophobicityColour.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        hydrophobicityColour_actionPerformed(e);
+      }
+    });
     helixColour.setText(MessageManager.getString("label.helix_propensity"));
-    helixColour.addActionListener(new java.awt.event.ActionListener()
+    helixColour.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -970,7 +814,7 @@ public class GAlignFrame extends JInternalFrame
     });
     strandColour.setText(MessageManager
             .getString("label.strand_propensity"));
-    strandColour.addActionListener(new java.awt.event.ActionListener()
+    strandColour.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -979,7 +823,7 @@ public class GAlignFrame extends JInternalFrame
       }
     });
     turnColour.setText(MessageManager.getString("label.turn_propensity"));
-    turnColour.addActionListener(new java.awt.event.ActionListener()
+    turnColour.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -988,7 +832,7 @@ public class GAlignFrame extends JInternalFrame
       }
     });
     buriedColour.setText(MessageManager.getString("label.buried_index"));
-    buriedColour.addActionListener(new java.awt.event.ActionListener()
+    buriedColour.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -998,7 +842,7 @@ public class GAlignFrame extends JInternalFrame
     });
     userDefinedColour.setText(MessageManager
             .getString("action.user_defined"));
-    userDefinedColour.addActionListener(new java.awt.event.ActionListener()
+    userDefinedColour.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1008,7 +852,7 @@ public class GAlignFrame extends JInternalFrame
     });
     PIDColour
             .setText(MessageManager.getString("label.percentage_identity"));
-    PIDColour.addActionListener(new java.awt.event.ActionListener()
+    PIDColour.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1018,7 +862,7 @@ public class GAlignFrame extends JInternalFrame
     });
     BLOSUM62Colour
             .setText(MessageManager.getString("label.blosum62_score"));
-    BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener()
+    BLOSUM62Colour.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1027,7 +871,7 @@ public class GAlignFrame extends JInternalFrame
       }
     });
     nucleotideColour.setText(MessageManager.getString("label.nucleotide"));
-    nucleotideColour.addActionListener(new java.awt.event.ActionListener()
+    nucleotideColour.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1038,55 +882,51 @@ public class GAlignFrame extends JInternalFrame
 
     purinePyrimidineColour.setText(MessageManager
             .getString("label.purine_pyrimidine"));
-    purinePyrimidineColour
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                purinePyrimidineColour_actionPerformed(e);
-              }
-            });
+    purinePyrimidineColour.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        purinePyrimidineColour_actionPerformed(e);
+      }
+    });
 
     RNAInteractionColour.setText("RNA Interaction type");
-    RNAInteractionColour
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                RNAInteractionColour_actionPerformed(e);
-              }
-            });
+    RNAInteractionColour.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        RNAInteractionColour_actionPerformed(e);
+      }
+    });
     /*
      * covariationColour.setText("Covariation");
-     * covariationColour.addActionListener(new java.awt.event.ActionListener() {
-     * public void actionPerformed(ActionEvent e) {
-     * covariationColour_actionPerformed(e); } });
+     * covariationColour.addActionListener(new ActionListener() { public void
+     * actionPerformed(ActionEvent e) { covariationColour_actionPerformed(e); }
+     * });
      */
 
-    avDistanceTreeBlosumMenuItem.setText(MessageManager
-            .getString("label.average_distance_bloslum62"));
-    avDistanceTreeBlosumMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                avTreeBlosumMenuItem_actionPerformed(e);
-              }
-            });
-    njTreeBlosumMenuItem.setText(MessageManager
-            .getString("label.neighbour_blosum62"));
-    njTreeBlosumMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                njTreeBlosumMenuItem_actionPerformed(e);
-              }
-            });
+    JMenuItem avDistanceTreeBlosumMenuItem = new JMenuItem(
+            MessageManager.getString("label.average_distance_bloslum62"));
+    avDistanceTreeBlosumMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        avTreeBlosumMenuItem_actionPerformed(e);
+      }
+    });
+    JMenuItem njTreeBlosumMenuItem = new JMenuItem(
+            MessageManager.getString("label.neighbour_blosum62"));
+    njTreeBlosumMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        njTreeBlosumMenuItem_actionPerformed(e);
+      }
+    });
     annotationPanelMenuItem.setActionCommand("");
     annotationPanelMenuItem.setText(MessageManager
             .getString("label.show_annotations"));
@@ -1149,8 +989,11 @@ public class GAlignFrame extends JInternalFrame
     SequenceAnnotationOrder sortAnnotationsBy = SequenceAnnotationOrder
             .valueOf(Cache.getDefault(Preferences.SORT_ANNOTATIONS,
                     SequenceAnnotationOrder.NONE.name()));
-    sortAnnBySequence.setText(MessageManager
-            .getString("label.sort_annotations_by_sequence"));
+    final JCheckBoxMenuItem sortAnnBySequence = new JCheckBoxMenuItem(
+            MessageManager.getString("label.sort_annotations_by_sequence"));
+    final JCheckBoxMenuItem sortAnnByLabel = new JCheckBoxMenuItem(
+            MessageManager.getString("label.sort_annotations_by_label"));
+
     sortAnnBySequence
             .setSelected(sortAnnotationsBy == SequenceAnnotationOrder.SEQUENCE_AND_LABEL);
     sortAnnBySequence.addActionListener(new ActionListener()
@@ -1165,8 +1008,6 @@ public class GAlignFrame extends JInternalFrame
         sortAnnotations_actionPerformed();
       }
     });
-    sortAnnByLabel.setText(MessageManager
-            .getString("label.sort_annotations_by_label"));
     sortAnnByLabel
             .setSelected(sortAnnotationsBy == SequenceAnnotationOrder.LABEL_AND_SEQUENCE);
     sortAnnByLabel.addActionListener(new ActionListener()
@@ -1183,17 +1024,18 @@ public class GAlignFrame extends JInternalFrame
     });
     colourTextMenuItem.setText(MessageManager
             .getString("label.colour_text"));
-    colourTextMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                colourTextMenuItem_actionPerformed(e);
-              }
-            });
-    htmlMenuItem.setText(MessageManager.getString("label.html"));
-    htmlMenuItem.addActionListener(new java.awt.event.ActionListener()
+    colourTextMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        colourTextMenuItem_actionPerformed(e);
+      }
+    });
+
+    JMenuItem htmlMenuItem = new JMenuItem(
+            MessageManager.getString("label.html"));
+    htmlMenuItem.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1202,9 +1044,8 @@ public class GAlignFrame extends JInternalFrame
       }
     });
 
-    // TODO uncomment when supported by MassageManager
-    // createBioJS.setText(MessageManager.getString("label.biojs_html_export"));
-    createBioJS.setText("BioJS");
+    JMenuItem createBioJS = new JMenuItem(
+            MessageManager.getString("label.biojs_html_export"));
     createBioJS.addActionListener(new java.awt.event.ActionListener()
     {
       @Override
@@ -1214,9 +1055,9 @@ public class GAlignFrame extends JInternalFrame
       }
     });
 
-    overviewMenuItem.setText(MessageManager
-            .getString("label.overview_window"));
-    overviewMenuItem.addActionListener(new java.awt.event.ActionListener()
+    JMenuItem overviewMenuItem = new JMenuItem(
+            MessageManager.getString("label.overview_window"));
+    overviewMenuItem.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1224,45 +1065,47 @@ public class GAlignFrame extends JInternalFrame
         overviewMenuItem_actionPerformed(e);
       }
     });
+
     undoMenuItem.setEnabled(false);
     undoMenuItem.setText(MessageManager.getString("action.undo"));
-    undoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_Z, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask(), false));
-    undoMenuItem.addActionListener(new java.awt.event.ActionListener()
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         undoMenuItem_actionPerformed(e);
       }
-    });
+    };
+    addMenuActionAndAccelerator(keyStroke, undoMenuItem, al);
+
     redoMenuItem.setEnabled(false);
     redoMenuItem.setText(MessageManager.getString("action.redo"));
-    redoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_Y, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask(), false));
-    redoMenuItem.addActionListener(new java.awt.event.ActionListener()
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_Y, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         redoMenuItem_actionPerformed(e);
       }
-    });
+    };
+    addMenuActionAndAccelerator(keyStroke, redoMenuItem, al);
+
     conservationMenuItem.setText(MessageManager
             .getString("action.by_conservation"));
-    conservationMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                conservationMenuItem_actionPerformed(e);
-              }
-            });
+    conservationMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        conservationMenuItem_actionPerformed(e);
+      }
+    });
     noColourmenuItem.setText(MessageManager.getString("label.none"));
-    noColourmenuItem.addActionListener(new java.awt.event.ActionListener()
+    noColourmenuItem.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1271,7 +1114,7 @@ public class GAlignFrame extends JInternalFrame
       }
     });
     wrapMenuItem.setText(MessageManager.getString("label.wrap"));
-    wrapMenuItem.addActionListener(new java.awt.event.ActionListener()
+    wrapMenuItem.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1279,47 +1122,52 @@ public class GAlignFrame extends JInternalFrame
         wrapMenuItem_actionPerformed(e);
       }
     });
-    printMenuItem.setText(MessageManager.getString("action.print") + "...");
-    printMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_P, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask(), false));
-    printMenuItem.addActionListener(new java.awt.event.ActionListener()
+
+    JMenuItem printMenuItem = new JMenuItem(
+            MessageManager.getString("action.print") + "...");
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_P, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         printMenuItem_actionPerformed(e);
       }
-    });
+    };
+    addMenuActionAndAccelerator(keyStroke, printMenuItem, al);
+
     renderGapsMenuItem
             .setText(MessageManager.getString("action.show_gaps"));
     renderGapsMenuItem.setState(true);
-    renderGapsMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                renderGapsMenuItem_actionPerformed(e);
-              }
-            });
-    findMenuItem.setText(MessageManager.getString("action.find"));
-    findMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_F, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask(), false));
+    renderGapsMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        renderGapsMenuItem_actionPerformed(e);
+      }
+    });
+
+    JMenuItem findMenuItem = new JMenuItem(
+            MessageManager.getString("action.find"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
     findMenuItem.setToolTipText(JvSwingUtils.wrapTooltip(true,
             MessageManager.getString("label.find_tip")));
-    findMenuItem.addActionListener(new java.awt.event.ActionListener()
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         findMenuItem_actionPerformed(e);
       }
-    });
+    };
+    addMenuActionAndAccelerator(keyStroke, findMenuItem, al);
+
     abovePIDThreshold.setText(MessageManager
             .getString("label.above_identity_threshold"));
-    abovePIDThreshold.addActionListener(new java.awt.event.ActionListener()
+    abovePIDThreshold.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1442,12 +1290,14 @@ public class GAlignFrame extends JInternalFrame
     });
 
     ButtonGroup buttonGroup = new ButtonGroup();
+    final JRadioButtonMenuItem showAutoFirst = new JRadioButtonMenuItem(
+            MessageManager.getString("label.show_first"));
+    final JRadioButtonMenuItem showAutoLast = new JRadioButtonMenuItem(
+            MessageManager.getString("label.show_last"));
     buttonGroup.add(showAutoFirst);
     buttonGroup.add(showAutoLast);
-    showAutoFirst.setText(MessageManager.getString("label.show_first"));
     showAutoFirst.setSelected(Cache.getDefault(
-            Preferences.SHOW_AUTOCALC_ABOVE,
-            false));
+            Preferences.SHOW_AUTOCALC_ABOVE, false));
     showAutoFirst.addActionListener(new ActionListener()
     {
       @Override
@@ -1457,7 +1307,6 @@ public class GAlignFrame extends JInternalFrame
         sortAnnotations_actionPerformed();
       }
     });
-    showAutoLast.setText(MessageManager.getString("label.show_last"));
     showAutoLast.setSelected(!showAutoFirst.isSelected());
     showAutoLast.addActionListener(new ActionListener()
     {
@@ -1470,7 +1319,7 @@ public class GAlignFrame extends JInternalFrame
     });
 
     nucleotideColour.setText(MessageManager.getString("label.nucleotide"));
-    nucleotideColour.addActionListener(new java.awt.event.ActionListener()
+    nucleotideColour.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1491,71 +1340,79 @@ public class GAlignFrame extends JInternalFrame
       }
     });
 
-    deleteGroups
-            .setText(MessageManager.getString("action.undefine_groups"));
-    deleteGroups.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_U, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask(), false));
-    deleteGroups.addActionListener(new java.awt.event.ActionListener()
+    JMenuItem deleteGroups = new JMenuItem(
+            MessageManager.getString("action.undefine_groups"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_U, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         deleteGroups_actionPerformed(e);
       }
-    });
-    createGroup.setText(MessageManager.getString("action.create_groups"));
-    createGroup.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_G, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask(), false));
-    createGroup.addActionListener(new java.awt.event.ActionListener()
+    };
+    addMenuActionAndAccelerator(keyStroke, deleteGroups, al);
+
+    JMenuItem createGroup = new JMenuItem(
+            MessageManager.getString("action.create_groups"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         createGroup_actionPerformed(e);
       }
-    });
-    unGroup.setText(MessageManager.getString("action.remove_group"));
-    unGroup.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_G, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask()
-                    | java.awt.event.KeyEvent.SHIFT_MASK, false));
-    unGroup.addActionListener(new java.awt.event.ActionListener()
+    };
+    addMenuActionAndAccelerator(keyStroke, createGroup, al);
+
+    JMenuItem unGroup = new JMenuItem(
+            MessageManager.getString("action.remove_group"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask()
+            | KeyEvent.SHIFT_MASK, false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         unGroup_actionPerformed(e);
       }
-    });
+    };
+    addMenuActionAndAccelerator(keyStroke, unGroup, al);
+
     copy.setText(MessageManager.getString("action.copy"));
-    copy.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_C, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask(), false));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
 
-    copy.addActionListener(new java.awt.event.ActionListener()
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         copy_actionPerformed(e);
       }
-    });
+    };
+    addMenuActionAndAccelerator(keyStroke, copy, al);
+
     cut.setText(MessageManager.getString("action.cut"));
-    cut.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_X, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask(), false));
-    cut.addActionListener(new java.awt.event.ActionListener()
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         cut_actionPerformed(e);
       }
-    });
-    delete.setText(MessageManager.getString("action.delete"));
-    delete.addActionListener(new java.awt.event.ActionListener()
+    };
+    addMenuActionAndAccelerator(keyStroke, cut, al);
+
+    JMenuItem delete = new JMenuItem(
+            MessageManager.getString("action.delete"));
+    delete.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1563,35 +1420,40 @@ public class GAlignFrame extends JInternalFrame
         delete_actionPerformed(e);
       }
     });
+
     pasteMenu.setText(MessageManager.getString("action.paste"));
-    pasteNew.setText(MessageManager.getString("label.to_new_alignment"));
-    pasteNew.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_V, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask()
-                    | java.awt.event.KeyEvent.SHIFT_MASK, false));
-    pasteNew.addActionListener(new java.awt.event.ActionListener()
+    JMenuItem pasteNew = new JMenuItem(
+            MessageManager.getString("label.to_new_alignment"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask()
+            | KeyEvent.SHIFT_MASK, false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         pasteNew_actionPerformed(e);
       }
-    });
-    pasteThis.setText(MessageManager.getString("label.to_this_alignment"));
-    pasteThis.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_V, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask(), false));
-    pasteThis.addActionListener(new java.awt.event.ActionListener()
+    };
+    addMenuActionAndAccelerator(keyStroke, pasteNew, al);
+
+    JMenuItem pasteThis = new JMenuItem(
+            MessageManager.getString("label.to_this_alignment"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         pasteThis_actionPerformed(e);
       }
-    });
+    };
+    addMenuActionAndAccelerator(keyStroke, pasteThis, al);
+
     applyToAllGroups.setText(MessageManager
             .getString("label.apply_colour_to_all_groups"));
-    applyToAllGroups.addActionListener(new java.awt.event.ActionListener()
+    applyToAllGroups.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1599,7 +1461,8 @@ public class GAlignFrame extends JInternalFrame
         applyToAllGroups_actionPerformed(e);
       }
     });
-    createPNG.addActionListener(new java.awt.event.ActionListener()
+    JMenuItem createPNG = new JMenuItem("PNG");
+    createPNG.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1609,10 +1472,9 @@ public class GAlignFrame extends JInternalFrame
     });
     createPNG.setActionCommand(MessageManager
             .getString("label.save_png_image"));
-    createPNG.setText("PNG");
 
-    font.setText(MessageManager.getString("action.font"));
-    font.addActionListener(new java.awt.event.ActionListener()
+    JMenuItem font = new JMenuItem(MessageManager.getString("action.font"));
+    font.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1623,7 +1485,7 @@ public class GAlignFrame extends JInternalFrame
     seqLimits.setText(MessageManager
             .getString("label.show_sequence_limits"));
     seqLimits.setState(jalview.bin.Cache.getDefault("SHOW_JVSUFFIX", true));
-    seqLimits.addActionListener(new java.awt.event.ActionListener()
+    seqLimits.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1631,8 +1493,8 @@ public class GAlignFrame extends JInternalFrame
         seqLimit_actionPerformed(e);
       }
     });
-    epsFile.setText("EPS");
-    epsFile.addActionListener(new java.awt.event.ActionListener()
+    JMenuItem epsFile = new JMenuItem("EPS");
+    epsFile.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1641,8 +1503,8 @@ public class GAlignFrame extends JInternalFrame
       }
     });
 
-    createSVG.setText("SVG");
-    createSVG.addActionListener(new java.awt.event.ActionListener()
+    JMenuItem createSVG = new JMenuItem("SVG");
+    createSVG.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1651,22 +1513,22 @@ public class GAlignFrame extends JInternalFrame
       }
     });
 
-    LoadtreeMenuItem.setActionCommand(MessageManager
+    JMenuItem loadTreeMenuItem = new JMenuItem(
+            MessageManager.getString("label.load_associated_tree"));
+    loadTreeMenuItem.setActionCommand(MessageManager
             .getString("label.load_tree_for_sequence_set"));
-    LoadtreeMenuItem.setText(MessageManager
-            .getString("label.load_associated_tree"));
-    LoadtreeMenuItem.addActionListener(new java.awt.event.ActionListener()
+    loadTreeMenuItem.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        LoadtreeMenuItem_actionPerformed(e);
+        loadTreeMenuItem_actionPerformed(e);
       }
     });
 
     scaleAbove.setVisible(false);
     scaleAbove.setText(MessageManager.getString("action.scale_above"));
-    scaleAbove.addActionListener(new java.awt.event.ActionListener()
+    scaleAbove.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1677,7 +1539,7 @@ public class GAlignFrame extends JInternalFrame
     scaleLeft.setVisible(false);
     scaleLeft.setSelected(true);
     scaleLeft.setText(MessageManager.getString("action.scale_left"));
-    scaleLeft.addActionListener(new java.awt.event.ActionListener()
+    scaleLeft.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1688,7 +1550,7 @@ public class GAlignFrame extends JInternalFrame
     scaleRight.setVisible(false);
     scaleRight.setSelected(true);
     scaleRight.setText(MessageManager.getString("action.scale_right"));
-    scaleRight.addActionListener(new java.awt.event.ActionListener()
+    scaleRight.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1700,15 +1562,14 @@ public class GAlignFrame extends JInternalFrame
     centreColumnLabelsMenuItem.setState(false);
     centreColumnLabelsMenuItem.setText(MessageManager
             .getString("label.centre_column_labels"));
-    centreColumnLabelsMenuItem
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                centreColumnLabels_actionPerformed(e);
-              }
-            });
+    centreColumnLabelsMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        centreColumnLabels_actionPerformed(e);
+      }
+    });
     followHighlightMenuItem.setVisible(true);
     followHighlightMenuItem.setState(true);
     followHighlightMenuItem.setText(MessageManager
@@ -1724,9 +1585,9 @@ public class GAlignFrame extends JInternalFrame
 
     });
 
-    modifyPID.setText(MessageManager
-            .getString("label.modify_identity_thereshold"));
-    modifyPID.addActionListener(new java.awt.event.ActionListener()
+    JMenuItem modifyPID = new JMenuItem(
+            MessageManager.getString("label.modify_identity_thereshold"));
+    modifyPID.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1736,15 +1597,14 @@ public class GAlignFrame extends JInternalFrame
     });
     modifyConservation.setText(MessageManager
             .getString("label.modify_conservation_thereshold"));
-    modifyConservation
-            .addActionListener(new java.awt.event.ActionListener()
-            {
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                modifyConservation_actionPerformed(e);
-              }
-            });
+    modifyConservation.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        modifyConservation_actionPerformed(e);
+      }
+    });
     sortByTreeMenu
             .setText(MessageManager.getString("action.by_tree_order"));
     sort.setText(MessageManager.getString("action.sort"));
@@ -1793,7 +1653,6 @@ public class GAlignFrame extends JInternalFrame
     calculateTree
             .setText(MessageManager.getString("action.calculate_tree"));
 
-    jMenu2.setText(MessageManager.getString("label.export_image"));
     padGapsMenuitem.setText(MessageManager.getString("label.pad_gaps"));
     padGapsMenuitem.setState(jalview.bin.Cache
             .getDefault("PAD_GAPS", false));
@@ -1805,8 +1664,9 @@ public class GAlignFrame extends JInternalFrame
         padGapsMenuitem_actionPerformed(e);
       }
     });
+    JMenuItem vamsasStore = new JMenuItem(
+            MessageManager.getString("label.vamsas_store"));
     vamsasStore.setVisible(false);
-    vamsasStore.setText(MessageManager.getString("label.vamsas_store"));
     vamsasStore.addActionListener(new ActionListener()
     {
       @Override
@@ -1825,8 +1685,9 @@ public class GAlignFrame extends JInternalFrame
         showTranslation_actionPerformed(e);
       }
     });
-    extractScores.setText(MessageManager.getString("label.extract_scores")
-            + "...");
+
+    JMenuItem extractScores = new JMenuItem(
+            MessageManager.getString("label.extract_scores") + "...");
     extractScores.addActionListener(new ActionListener()
     {
       @Override
@@ -1835,17 +1696,14 @@ public class GAlignFrame extends JInternalFrame
         extractScores_actionPerformed(e);
       }
     });
-    extractScores.setVisible(true); // JBPNote: TODO: make gui for regex based
-    // score extraction
+    extractScores.setVisible(true);
+    // JBPNote: TODO: make gui for regex based score extraction
+
+    // for show products actions see AlignFrame.canShowProducts
     showProducts.setText(MessageManager.getString("label.get_cross_refs"));
-    /*
-     * showProducts.addActionListener(new ActionListener() {
-     * 
-     * public void actionPerformed(ActionEvent e) {
-     * showProducts_actionPerformed(e); } });
-     */
-    openFeatureSettings.setText(MessageManager
-            .getString("label.feature_settings"));
+
+    JMenuItem openFeatureSettings = new JMenuItem(
+            MessageManager.getString("label.feature_settings"));
     openFeatureSettings.addActionListener(new ActionListener()
     {
       @Override
@@ -1854,8 +1712,8 @@ public class GAlignFrame extends JInternalFrame
         featureSettings_actionPerformed(e);
       }
     });
-    fetchSequence
-            .setText(MessageManager.getString("label.fetch_sequences"));
+    JMenuItem fetchSequence = new JMenuItem(
+            MessageManager.getString("label.fetch_sequences"));
     fetchSequence.addActionListener(new ActionListener()
     {
       @Override
@@ -1865,8 +1723,8 @@ public class GAlignFrame extends JInternalFrame
       }
     });
 
-    annotationColour.setText(MessageManager
-            .getString("action.by_annotation"));
+    JMenuItem annotationColour = new JMenuItem(
+            MessageManager.getString("action.by_annotation"));
     annotationColour.addActionListener(new ActionListener()
     {
       @Override
@@ -1876,8 +1734,8 @@ public class GAlignFrame extends JInternalFrame
       }
     });
 
-    annotationColumn.setText(MessageManager
-            .getString("action.select_by_annotation"));
+    JMenuItem annotationColumn = new JMenuItem(
+            MessageManager.getString("action.select_by_annotation"));
     annotationColumn.addActionListener(new ActionListener()
     {
       @Override
@@ -1898,8 +1756,8 @@ public class GAlignFrame extends JInternalFrame
       }
     });
 
-    associatedData.setText(MessageManager
-            .getString("label.load_features_annotations"));
+    JMenuItem associatedData = new JMenuItem(
+            MessageManager.getString("label.load_features_annotations"));
     associatedData.addActionListener(new ActionListener()
     {
       @Override
@@ -1953,9 +1811,10 @@ public class GAlignFrame extends JInternalFrame
       }
     });
 
-    addSequenceMenu
-            .setText(MessageManager.getString("label.add_sequences"));
-    addFromFile.setText(MessageManager.getString("label.from_file"));
+    JMenu addSequenceMenu = new JMenu(
+            MessageManager.getString("label.add_sequences"));
+    JMenuItem addFromFile = new JMenuItem(
+            MessageManager.getString("label.from_file"));
     addFromFile.addActionListener(new ActionListener()
     {
       @Override
@@ -1964,7 +1823,8 @@ public class GAlignFrame extends JInternalFrame
         addFromFile_actionPerformed(e);
       }
     });
-    addFromText.setText(MessageManager.getString("label.from_textbox"));
+    JMenuItem addFromText = new JMenuItem(
+            MessageManager.getString("label.from_textbox"));
     addFromText.addActionListener(new ActionListener()
     {
       @Override
@@ -1973,7 +1833,8 @@ public class GAlignFrame extends JInternalFrame
         addFromText_actionPerformed(e);
       }
     });
-    addFromURL.setText(MessageManager.getString("label.from_url"));
+    JMenuItem addFromURL = new JMenuItem(
+            MessageManager.getString("label.from_url"));
     addFromURL.addActionListener(new ActionListener()
     {
       @Override
@@ -1982,8 +1843,8 @@ public class GAlignFrame extends JInternalFrame
         addFromURL_actionPerformed(e);
       }
     });
-    exportFeatures.setText(MessageManager
-            .getString("label.export_features"));
+    JMenuItem exportFeatures = new JMenuItem(
+            MessageManager.getString("label.export_features"));
     exportFeatures.addActionListener(new ActionListener()
     {
       @Override
@@ -1992,8 +1853,8 @@ public class GAlignFrame extends JInternalFrame
         exportFeatures_actionPerformed(e);
       }
     });
-    exportAnnotations.setText(MessageManager
-            .getString("label.export_annotations"));
+    JMenuItem exportAnnotations = new JMenuItem(
+            MessageManager.getString("label.export_annotations"));
     exportAnnotations.addActionListener(new ActionListener()
     {
       @Override
@@ -2002,9 +1863,9 @@ public class GAlignFrame extends JInternalFrame
         exportAnnotations_actionPerformed(e);
       }
     });
-    statusPanel.setLayout(gridLayout1);
-    jMenu3.setText(MessageManager.getString("action.show"));
-    showAllSeqs.setText(MessageManager.getString("label.all_sequences"));
+    statusPanel.setLayout(new GridLayout());
+    JMenuItem showAllSeqs = new JMenuItem(
+            MessageManager.getString("label.all_sequences"));
     showAllSeqs.setToolTipText(MessageManager
             .getString("label.toggle_sequence_visibility"));
     showAllSeqs.addActionListener(new ActionListener()
@@ -2015,7 +1876,8 @@ public class GAlignFrame extends JInternalFrame
         showAllSeqs_actionPerformed(e);
       }
     });
-    showAllColumns.setText(MessageManager.getString("label.all_columns"));
+    JMenuItem showAllColumns = new JMenuItem(
+            MessageManager.getString("label.all_columns"));
     showAllColumns.setToolTipText(MessageManager
             .getString("label.toggle_columns_visibility"));
     showAllColumns.addActionListener(new ActionListener()
@@ -2026,9 +1888,9 @@ public class GAlignFrame extends JInternalFrame
         showAllColumns_actionPerformed(e);
       }
     });
-    hideMenu.setText(MessageManager.getString("action.hide"));
-    hideSelSequences.setText(MessageManager
-            .getString("label.selected_sequences"));
+    JMenu hideMenu = new JMenu(MessageManager.getString("action.hide"));
+    JMenuItem hideSelSequences = new JMenuItem(
+            MessageManager.getString("label.selected_sequences"));
     hideSelSequences.setToolTipText(MessageManager
             .getString("label.toggle_sequence_visibility"));
     hideSelSequences.addActionListener(new ActionListener()
@@ -2039,8 +1901,8 @@ public class GAlignFrame extends JInternalFrame
         hideSelSequences_actionPerformed(e);
       }
     });
-    hideSelColumns.setText(MessageManager
-            .getString("label.selected_columns"));
+    JMenuItem hideSelColumns = new JMenuItem(
+            MessageManager.getString("label.selected_columns"));
     hideSelColumns.setToolTipText(MessageManager
             .getString("label.toggle_columns_visibility"));
     hideSelColumns.addActionListener(new ActionListener()
@@ -2051,8 +1913,8 @@ public class GAlignFrame extends JInternalFrame
         hideSelColumns_actionPerformed(e);
       }
     });
-    hideAllSelection.setText(MessageManager
-            .getString("label.selected_region"));
+    JMenuItem hideAllSelection = new JMenuItem(
+            MessageManager.getString("label.selected_region"));
     hideAllSelection.addActionListener(new ActionListener()
     {
       @Override
@@ -2062,8 +1924,8 @@ public class GAlignFrame extends JInternalFrame
       }
     });
     // TODO: should be hidden if no selection exists.
-    hideAllButSelection.setText(MessageManager
-            .getString("label.all_but_selected_region"));
+    JMenuItem hideAllButSelection = new JMenuItem(
+            MessageManager.getString("label.all_but_selected_region"));
     hideAllButSelection.addActionListener(new ActionListener()
     {
       @Override
@@ -2072,8 +1934,8 @@ public class GAlignFrame extends JInternalFrame
         hideAllButSelection_actionPerformed(e);
       }
     });
-    showAllhidden.setText(MessageManager
-            .getString("label.all_sequences_columns"));
+    JMenuItem showAllhidden = new JMenuItem(
+            MessageManager.getString("label.all_sequences_columns"));
     showAllhidden.setToolTipText(MessageManager
             .getString("label.toggles_visibility_hidden_selected_regions"));
     showAllhidden.addActionListener(new ActionListener()
@@ -2094,20 +1956,32 @@ public class GAlignFrame extends JInternalFrame
         hiddenMarkers_actionPerformed(e);
       }
     });
-    invertColSel.setText(MessageManager
-            .getString("action.invert_column_selection"));
-    invertColSel.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_I, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask()
-                    | java.awt.event.KeyEvent.ALT_MASK, false));
-    invertColSel.addActionListener(new ActionListener()
+
+    JMenuItem invertColSel = new JMenuItem(
+            MessageManager.getString("action.invert_column_selection"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_I,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
+            | KeyEvent.ALT_MASK, false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         invertColSel_actionPerformed(e);
       }
+    };
+    addMenuActionAndAccelerator(keyStroke, invertColSel, al);
+
+    showComplementMenuItem.setVisible(false);
+    showComplementMenuItem.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        showComplement_actionPerformed(showComplementMenuItem.getState());
+      }
     });
+
     tabbedPane.addChangeListener(new javax.swing.event.ChangeListener()
     {
       @Override
@@ -2134,18 +2008,20 @@ public class GAlignFrame extends JInternalFrame
         tabbedPane_focusGained(e);
       }
     });
-    save.setText(MessageManager.getString("action.save"));
-    save.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_S, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask(), false));
-    save.addActionListener(new ActionListener()
+
+    JMenuItem save = new JMenuItem(MessageManager.getString("action.save"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         save_actionPerformed(e);
       }
-    });
+    };
+    addMenuActionAndAccelerator(keyStroke, save, al);
+
     reload.setEnabled(false);
     reload.setText(MessageManager.getString("action.reload"));
     reload.addActionListener(new ActionListener()
@@ -2156,23 +2032,26 @@ public class GAlignFrame extends JInternalFrame
         reload_actionPerformed(e);
       }
     });
-    newView.setText(MessageManager.getString("action.new_view"));
-    newView.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_T, Toolkit.getDefaultToolkit()
-                    .getMenuShortcutKeyMask(), false));
-    newView.addActionListener(new ActionListener()
+
+    JMenuItem newView = new JMenuItem(
+            MessageManager.getString("action.new_view"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit
+            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         newView_actionPerformed(e);
       }
-    });
+    };
+    addMenuActionAndAccelerator(keyStroke, newView, al);
+
     tabbedPane.setToolTipText("<html><i>"
             + MessageManager.getString("label.rename_tab_eXpand_reGroup")
             + "</i></html>");
-    textColour.setText(MessageManager.getString("label.colour_text")
-            + "...");
+    JMenuItem textColour = new JMenuItem(
+            MessageManager.getString("label.colour_text") + "...");
     textColour.addActionListener(new ActionListener()
     {
       @Override
@@ -2182,7 +2061,7 @@ public class GAlignFrame extends JInternalFrame
       }
     });
     formatMenu.setText(MessageManager.getString("action.format"));
-    selectMenu.setText(MessageManager.getString("action.select"));
+    JMenu selectMenu = new JMenu(MessageManager.getString("action.select"));
     idRightAlign.setText(MessageManager
             .getString("label.right_align_sequence_id"));
     idRightAlign.addActionListener(new ActionListener()
@@ -2193,32 +2072,35 @@ public class GAlignFrame extends JInternalFrame
         idRightAlign_actionPerformed(e);
       }
     });
+
     gatherViews.setEnabled(false);
     gatherViews.setText(MessageManager.getString("action.gather_views"));
-    gatherViews.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_G, 0, false));
-    gatherViews.addActionListener(new ActionListener()
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_G, 0, false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         gatherViews_actionPerformed(e);
       }
-    });
+    };
+    addMenuActionAndAccelerator(keyStroke, gatherViews, al);
+
     expandViews.setEnabled(false);
     expandViews.setText(MessageManager.getString("action.expand_views"));
-    expandViews.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-            java.awt.event.KeyEvent.VK_X, 0, false));
-    expandViews.addActionListener(new ActionListener()
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_X, 0, false);
+    al = new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         expandViews_actionPerformed(e);
       }
-    });
-    pageSetup
-            .setText(MessageManager.getString("action.page_setup") + "...");
+    };
+    addMenuActionAndAccelerator(keyStroke, expandViews, al);
+
+    JMenuItem pageSetup = new JMenuItem(
+            MessageManager.getString("action.page_setup") + "...");
     pageSetup.addActionListener(new ActionListener()
     {
       @Override
@@ -2227,8 +2109,8 @@ public class GAlignFrame extends JInternalFrame
         pageSetup_actionPerformed(e);
       }
     });
-    alignmentProperties.setText(MessageManager
-            .getString("label.alignment_props") + "...");
+    JMenuItem alignmentProperties = new JMenuItem(
+            MessageManager.getString("label.alignment_props") + "...");
     alignmentProperties.addActionListener(new ActionListener()
     {
       @Override
@@ -2237,10 +2119,14 @@ public class GAlignFrame extends JInternalFrame
         alignmentProperties();
       }
     });
-    tooltipSettingsMenu.setText(MessageManager
-            .getString("label.sequence_id_tooltip"));
-    autoAnnMenu.setText(MessageManager
-            .getString("label.autocalculated_annotation"));
+    JMenu tooltipSettingsMenu = new JMenu(
+            MessageManager.getString("label.sequence_id_tooltip"));
+    JMenu autoAnnMenu = new JMenu(
+            MessageManager.getString("label.autocalculated_annotation"));
+
+    JMenu exportImageMenu = new JMenu(
+            MessageManager.getString("label.export_image"));
+    JMenu fileMenu = new JMenu(MessageManager.getString("action.file"));
     alignFrameMenuBar.add(fileMenu);
     alignFrameMenuBar.add(editMenu);
     alignFrameMenuBar.add(selectMenu);
@@ -2261,10 +2147,10 @@ public class GAlignFrame extends JInternalFrame
     fileMenu.add(pageSetup);
     fileMenu.add(printMenuItem);
     fileMenu.addSeparator();
-    fileMenu.add(jMenu2);
+    fileMenu.add(exportImageMenu);
     fileMenu.add(exportFeatures);
     fileMenu.add(exportAnnotations);
-    fileMenu.add(LoadtreeMenuItem);
+    fileMenu.add(loadTreeMenuItem);
     fileMenu.add(associatedData);
     fileMenu.addSeparator();
     fileMenu.add(closeMenuItem);
@@ -2287,14 +2173,28 @@ public class GAlignFrame extends JInternalFrame
     // editMenu.add(justifyRightMenuItem);
     // editMenu.addSeparator();
     editMenu.add(padGapsMenuitem);
+
     viewMenu.add(newView);
     viewMenu.add(expandViews);
     viewMenu.add(gatherViews);
     viewMenu.addSeparator();
-    viewMenu.add(jMenu3);
+    viewMenu.add(showMenu);
     viewMenu.add(hideMenu);
+    viewMenu.add(showComplementMenuItem);
     viewMenu.addSeparator();
     viewMenu.add(followHighlightMenuItem);
+    viewMenu.addSeparator();
+    viewMenu.add(showSeqFeatures);
+    // viewMenu.add(showSeqFeaturesHeight);
+    viewMenu.add(openFeatureSettings);
+    tooltipSettingsMenu.add(showDbRefsMenuitem);
+    tooltipSettingsMenu.add(showNpFeatsMenuitem);
+    viewMenu.add(tooltipSettingsMenu);
+    viewMenu.addSeparator();
+    viewMenu.add(alignmentProperties);
+    viewMenu.addSeparator();
+    viewMenu.add(overviewMenuItem);
+
     annotationsMenu.add(annotationPanelMenuItem);
     annotationsMenu.addSeparator();
     annotationsMenu.add(showAllAlAnnotations);
@@ -2316,18 +2216,7 @@ public class GAlignFrame extends JInternalFrame
     autoAnnMenu.add(showGroupConservation);
     autoAnnMenu.add(showGroupConsensus);
     annotationsMenu.add(autoAnnMenu);
-    viewMenu.addSeparator();
-    viewMenu.add(showSeqFeatures);
-    // viewMenu.add(showSeqFeaturesHeight);
 
-    viewMenu.add(openFeatureSettings);
-    tooltipSettingsMenu.add(showDbRefsMenuitem);
-    tooltipSettingsMenu.add(showNpFeatsMenuitem);
-    viewMenu.add(tooltipSettingsMenu);
-    viewMenu.addSeparator();
-    viewMenu.add(alignmentProperties);
-    viewMenu.addSeparator();
-    viewMenu.add(overviewMenuItem);
     colourMenu.add(applyToAllGroups);
     colourMenu.add(textColour);
     colourMenu.addSeparator();
@@ -2377,20 +2266,20 @@ public class GAlignFrame extends JInternalFrame
     sort.add(sortGroupMenuItem);
     sort.add(sortPairwiseMenuItem);
     sort.add(sortByTreeMenu);
-    jMenu2.add(htmlMenuItem);
-    jMenu2.add(epsFile);
-    jMenu2.add(createPNG);
-    jMenu2.add(createBioJS);
-    jMenu2.add(createSVG);
+    exportImageMenu.add(htmlMenuItem);
+    exportImageMenu.add(epsFile);
+    exportImageMenu.add(createPNG);
+    exportImageMenu.add(createBioJS);
+    exportImageMenu.add(createSVG);
     addSequenceMenu.add(addFromFile);
     addSequenceMenu.add(addFromText);
     addSequenceMenu.add(addFromURL);
     this.getContentPane().add(statusPanel, java.awt.BorderLayout.SOUTH);
     statusPanel.add(statusBar, null);
     this.getContentPane().add(tabbedPane, java.awt.BorderLayout.CENTER);
-    jMenu3.add(showAllColumns);
-    jMenu3.add(showAllSeqs);
-    jMenu3.add(showAllhidden);
+    showMenu.add(showAllColumns);
+    showMenu.add(showAllSeqs);
+    showMenu.add(showAllhidden);
     hideMenu.add(hideSelColumns);
     hideMenu.add(hideSelSequences);
     hideMenu.add(hideAllSelection);
@@ -2430,6 +2319,22 @@ public class GAlignFrame extends JInternalFrame
   }
 
   /**
+   * Adds the given action listener and key accelerator to the given menu item.
+   * Also saves in a lookup table to support lookup of action by key stroke.
+   * 
+   * @param keyStroke
+   * @param menuItem
+   * @param actionListener
+   */
+  protected void addMenuActionAndAccelerator(KeyStroke keyStroke,
+          JMenuItem menuItem, ActionListener actionListener)
+  {
+    menuItem.setAccelerator(keyStroke);
+    accelerators.put(keyStroke, menuItem);
+    menuItem.addActionListener(actionListener);
+  }
+
+  /**
    * Action on clicking sort annotations by type.
    * 
    * @param sortOrder
@@ -2595,10 +2500,6 @@ public class GAlignFrame extends JInternalFrame
   {
   }
 
-  protected void showProducts_actionPerformed(ActionEvent e)
-  {
-  }
-
   protected void buildSortByAnnotationScoresMenu()
   {
   }
@@ -2902,7 +2803,7 @@ public class GAlignFrame extends JInternalFrame
   {
 
   }
-  protected void LoadtreeMenuItem_actionPerformed(ActionEvent e)
+  protected void loadTreeMenuItem_actionPerformed(ActionEvent e)
   {
 
   }
@@ -3160,4 +3061,50 @@ public class GAlignFrame extends JInternalFrame
   {
     this.annotationSortOrder = annotationSortOrder;
   }
+
+  public Map<KeyStroke, JMenuItem> getAccelerators()
+  {
+    return this.accelerators;
+  }
+
+  /**
+   * Returns the selected index of the tabbed pane, or -1 if none selected
+   * (including the case where the tabbed pane has not been made visible).
+   * 
+   * @return
+   */
+  public int getTabIndex()
+  {
+    return tabbedPane.getSelectedIndex();
+  }
+
+  public JPanel getStatusPanel()
+  {
+    return statusPanel;
+  }
+
+  /**
+   * Sets a reference to the containing split frame. Also makes the 'toggle
+   * split view' menu item visible and checked.
+   * 
+   * @param sf
+   */
+  public void setSplitFrame(SplitContainerI sf)
+  {
+    this.splitFrame = sf;
+    if (sf != null)
+    {
+      this.showComplementMenuItem.setVisible(true);
+      this.showComplementMenuItem.setState(true);
+    }
+  }
+
+  public SplitContainerI getSplitViewContainer()
+  {
+    return this.splitFrame;
+  }
+
+  protected void showComplement_actionPerformed(boolean state)
+  {
+  }
 }