JAL-3048 todo and JAL-3026 disable VCF support
[jalview.git] / src / jalview / jbgui / GAlignFrame.java
index fba0efa..a64030b 100755 (executable)
@@ -23,21 +23,14 @@ package jalview.jbgui;
 import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder;
 import jalview.api.SplitContainerI;
 import jalview.bin.Cache;
-import jalview.gui.Desktop;
-import jalview.gui.JvOptionPane;
 import jalview.gui.JvSwingUtils;
 import jalview.gui.Preferences;
-import jalview.gui.UserDefinedColours;
-import jalview.io.FileFormat;
-import jalview.schemes.JalviewColourScheme;
-import jalview.schemes.ResidueColourScheme;
-import jalview.schemes.UserColourScheme;
+import jalview.io.FileFormats;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.GridLayout;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
@@ -72,8 +65,6 @@ public class GAlignFrame extends JInternalFrame
 
   protected JMenuItem closeMenuItem = new JMenuItem();
 
-  protected JMenu colourMenu = new JMenu();
-
   protected JMenu webService = new JMenu();
 
   protected JMenuItem webServiceNoServices;
@@ -88,40 +79,6 @@ public class GAlignFrame extends JInternalFrame
 
   protected JMenu outputTextboxMenu = new JMenu();
 
-  protected JRadioButtonMenuItem textColour;
-
-  protected JRadioButtonMenuItem clustalColour;
-
-  protected JRadioButtonMenuItem zappoColour;
-
-  protected JRadioButtonMenuItem taylorColour;
-
-  protected JRadioButtonMenuItem hydrophobicityColour;
-
-  protected JRadioButtonMenuItem helixColour;
-
-  protected JRadioButtonMenuItem strandColour;
-
-  protected JRadioButtonMenuItem turnColour;
-
-  protected JRadioButtonMenuItem buriedColour;
-
-  protected JRadioButtonMenuItem userDefinedColour;
-
-  protected JRadioButtonMenuItem PIDColour;
-
-  protected JRadioButtonMenuItem BLOSUM62Colour;
-
-  protected JRadioButtonMenuItem nucleotideColour;
-
-  protected JRadioButtonMenuItem purinePyrimidineColour;
-
-  protected JRadioButtonMenuItem RNAInteractionColour;
-
-  // protected JRadioButtonMenuItem covariationColour;
-
-  protected JRadioButtonMenuItem tcoffeeColour;
-
   protected JCheckBoxMenuItem annotationPanelMenuItem = new JCheckBoxMenuItem();
 
   protected JCheckBoxMenuItem colourTextMenuItem = new JCheckBoxMenuItem();
@@ -132,16 +89,10 @@ public class GAlignFrame extends JInternalFrame
 
   protected JMenuItem redoMenuItem = new JMenuItem();
 
-  protected JCheckBoxMenuItem conservationMenuItem;
-
-  JRadioButtonMenuItem noColourmenuItem;
-
   protected JCheckBoxMenuItem wrapMenuItem = new JCheckBoxMenuItem();
 
   protected JCheckBoxMenuItem renderGapsMenuItem = new JCheckBoxMenuItem();
 
-  protected JCheckBoxMenuItem abovePIDThreshold;
-
   public JCheckBoxMenuItem showSeqFeatures = new JCheckBoxMenuItem();
 
   JMenuItem copy = new JMenuItem();
@@ -150,8 +101,6 @@ public class GAlignFrame extends JInternalFrame
 
   JMenu pasteMenu = new JMenu();
 
-  protected JCheckBoxMenuItem applyToAllGroups;
-
   protected JCheckBoxMenuItem seqLimits = new JCheckBoxMenuItem();
 
   protected JCheckBoxMenuItem scaleAbove = new JCheckBoxMenuItem();
@@ -160,17 +109,27 @@ public class GAlignFrame extends JInternalFrame
 
   protected JCheckBoxMenuItem scaleRight = new JCheckBoxMenuItem();
 
-  protected JMenuItem modifyPID;
+  protected JCheckBoxMenuItem applyToAllGroups;
+
+  protected JMenu colourMenu = new JMenu();
+
+  protected JMenuItem textColour;
+
+  protected JCheckBoxMenuItem conservationMenuItem;
 
   protected JMenuItem modifyConservation;
 
+  protected JCheckBoxMenuItem abovePIDThreshold;
+
+  protected JMenuItem modifyPID;
+
   protected JMenuItem annotationColour;
 
   protected JMenu sortByTreeMenu = new JMenu();
 
   protected JMenu sort = new JMenu();
 
-  protected JMenu calculateTree = new JMenu();
+  protected JMenuItem calculateTree = new JMenuItem();
 
   protected JCheckBoxMenuItem padGapsMenuitem = new JCheckBoxMenuItem();
 
@@ -178,8 +137,6 @@ public class GAlignFrame extends JInternalFrame
 
   protected JCheckBoxMenuItem showDbRefsMenuitem = new JCheckBoxMenuItem();
 
-  protected ButtonGroup colours = new ButtonGroup();
-
   protected JMenuItem showTranslation = new JMenuItem();
 
   protected JMenuItem showReverse = new JMenuItem();
@@ -190,7 +147,7 @@ public class GAlignFrame extends JInternalFrame
 
   protected JMenuItem runGroovy = new JMenuItem();
 
-  protected JMenuItem rnahelicesColour;
+  protected JMenuItem loadVcf;
 
   protected JCheckBoxMenuItem autoCalculate = new JCheckBoxMenuItem();
 
@@ -256,7 +213,7 @@ public class GAlignFrame extends JInternalFrame
       setJMenuBar(alignFrameMenuBar);
 
       // dynamically fill save as menu with available formats
-      for (String ff : FileFormat.getWritableFormats(true))
+      for (String ff : FileFormats.getInstance().getWritableFormats(true))
       {
         JMenuItem item = new JMenuItem(ff);
 
@@ -289,41 +246,9 @@ public class GAlignFrame extends JInternalFrame
     }
   }
 
-  /**
-   * Marks as selected the colour menu item matching the given name, or the
-   * first item ('None') if no match is found
-   * 
-   * @param colourName
-   */
-  protected void setColourSelected(String colourName)
-  {
-    noColourmenuItem.setSelected(true);
-    if (colourName == null)
-    {
-      return;
-    }
-
-    /*
-     * look for a radio button with a name that matches the colour name
-     * (note the button text may not as it may be internationalised)
-     */
-    for (Component menuItem : colourMenu.getMenuComponents())
-    {
-      if (menuItem instanceof JRadioButtonMenuItem)
-      {
-        if (colourName.equals(((JRadioButtonMenuItem) menuItem).getName()))
-        {
-          ((JRadioButtonMenuItem) menuItem).setSelected(true);
-          return;
-        }
-      }
-    }
-  }
-
   private void jbInit() throws Exception
   {
     initColourMenu();
-    buildColourMenu();
 
     JMenuItem saveAs = new JMenuItem(
             MessageManager.getString("action.save_as"));
@@ -337,14 +262,15 @@ public class GAlignFrame extends JInternalFrame
     };
 
     // FIXME getDefaultToolkit throws an exception in Headless mode
-    KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask()
-            | KeyEvent.SHIFT_MASK, false);
+    KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_S,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
+                    | KeyEvent.SHIFT_MASK,
+            false);
     addMenuActionAndAccelerator(keyStroke, saveAs, al);
 
     closeMenuItem.setText(MessageManager.getString("action.close"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_W, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_W,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -366,8 +292,8 @@ public class GAlignFrame extends JInternalFrame
     webService.setText(MessageManager.getString("action.web_service"));
     JMenuItem selectAllSequenceMenuItem = new JMenuItem(
             MessageManager.getString("action.select_all"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_A, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_A,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -393,8 +319,8 @@ public class GAlignFrame extends JInternalFrame
 
     JMenuItem invertSequenceMenuItem = new JMenuItem(
             MessageManager.getString("action.invert_sequence_selection"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_I, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_I,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -417,8 +343,8 @@ public class GAlignFrame extends JInternalFrame
     });
     JMenuItem expandAlignment = new JMenuItem(
             MessageManager.getString("action.view_flanking_regions"));
-    expandAlignment.setToolTipText(MessageManager
-            .getString("label.view_flanking_regions"));
+    expandAlignment.setToolTipText(
+            MessageManager.getString("label.view_flanking_regions"));
     expandAlignment.addActionListener(new ActionListener()
     {
       @Override
@@ -429,8 +355,8 @@ public class GAlignFrame extends JInternalFrame
     });
     JMenuItem remove2LeftMenuItem = new JMenuItem(
             MessageManager.getString("action.remove_left"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_L, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_L,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -443,8 +369,8 @@ public class GAlignFrame extends JInternalFrame
 
     JMenuItem remove2RightMenuItem = new JMenuItem(
             MessageManager.getString("action.remove_right"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_R,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -457,8 +383,8 @@ public class GAlignFrame extends JInternalFrame
 
     JMenuItem removeGappedColumnMenuItem = new JMenuItem(
             MessageManager.getString("action.remove_empty_columns"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_E,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -471,9 +397,10 @@ public class GAlignFrame extends JInternalFrame
 
     JMenuItem removeAllGapsMenuItem = new JMenuItem(
             MessageManager.getString("action.remove_all_gaps"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask()
-            | KeyEvent.SHIFT_MASK, false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_E,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
+                    | KeyEvent.SHIFT_MASK,
+            false);
     al = new ActionListener()
     {
       @Override
@@ -524,8 +451,8 @@ public class GAlignFrame extends JInternalFrame
         viewTextMenuItem_actionPerformed(e);
       }
     });
-    showNonconservedMenuItem.setText(MessageManager
-            .getString("label.show_non_conserved"));
+    showNonconservedMenuItem
+            .setText(MessageManager.getString("label.show_non_conserved"));
     showNonconservedMenuItem.setState(false);
     showNonconservedMenuItem.addActionListener(new ActionListener()
     {
@@ -578,8 +505,8 @@ public class GAlignFrame extends JInternalFrame
 
     JMenuItem removeRedundancyMenuItem = new JMenuItem(
             MessageManager.getString("action.remove_redundancy"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_D,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -600,36 +527,6 @@ public class GAlignFrame extends JInternalFrame
         pairwiseAlignmentMenuItem_actionPerformed(e);
       }
     });
-    JMenuItem PCAMenuItem = new JMenuItem(
-            MessageManager.getString("label.principal_component_analysis"));
-    PCAMenuItem.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        PCAMenuItem_actionPerformed(e);
-      }
-    });
-    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));
@@ -637,35 +534,14 @@ public class GAlignFrame extends JInternalFrame
     statusBar.setFont(new java.awt.Font("Verdana", 0, 11));
     statusBar.setBorder(BorderFactory.createLineBorder(Color.black));
     statusBar.setText(MessageManager.getString("label.status_bar"));
-    outputTextboxMenu.setText(MessageManager
-            .getString("label.out_to_textbox"));
-
+    outputTextboxMenu
+            .setText(MessageManager.getString("label.out_to_textbox"));
 
-    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"));
-    annotationPanelMenuItem.setState(Cache.getDefault("SHOW_ANNOTATIONS",
-            true));
+    annotationPanelMenuItem
+            .setText(MessageManager.getString("label.show_annotations"));
+    annotationPanelMenuItem
+            .setState(Cache.getDefault("SHOW_ANNOTATIONS", true));
     annotationPanelMenuItem.addActionListener(new ActionListener()
     {
       @Override
@@ -674,8 +550,8 @@ public class GAlignFrame extends JInternalFrame
         annotationPanelMenuItem_actionPerformed(e);
       }
     });
-    showAllAlAnnotations.setText(MessageManager
-            .getString("label.show_all_al_annotations"));
+    showAllAlAnnotations.setText(
+            MessageManager.getString("label.show_all_al_annotations"));
     final boolean isAnnotationPanelShown = annotationPanelMenuItem
             .getState();
     showAllAlAnnotations.setEnabled(isAnnotationPanelShown);
@@ -687,8 +563,8 @@ public class GAlignFrame extends JInternalFrame
         showAllAnnotations_actionPerformed(false, true);
       }
     });
-    hideAllAlAnnotations.setText(MessageManager
-            .getString("label.hide_all_al_annotations"));
+    hideAllAlAnnotations.setText(
+            MessageManager.getString("label.hide_all_al_annotations"));
     hideAllAlAnnotations.setEnabled(isAnnotationPanelShown);
     hideAllAlAnnotations.addActionListener(new ActionListener()
     {
@@ -698,8 +574,8 @@ public class GAlignFrame extends JInternalFrame
         hideAllAnnotations_actionPerformed(false, true);
       }
     });
-    showAllSeqAnnotations.setText(MessageManager
-            .getString("label.show_all_seq_annotations"));
+    showAllSeqAnnotations.setText(
+            MessageManager.getString("label.show_all_seq_annotations"));
     showAllSeqAnnotations.setEnabled(isAnnotationPanelShown);
     showAllSeqAnnotations.addActionListener(new ActionListener()
     {
@@ -709,8 +585,8 @@ public class GAlignFrame extends JInternalFrame
         showAllAnnotations_actionPerformed(true, false);
       }
     });
-    hideAllSeqAnnotations.setText(MessageManager
-            .getString("label.hide_all_seq_annotations"));
+    hideAllSeqAnnotations.setText(
+            MessageManager.getString("label.hide_all_seq_annotations"));
     hideAllSeqAnnotations.setEnabled(isAnnotationPanelShown);
     hideAllSeqAnnotations.addActionListener(new ActionListener()
     {
@@ -728,8 +604,8 @@ public class GAlignFrame extends JInternalFrame
     final JCheckBoxMenuItem sortAnnByLabel = new JCheckBoxMenuItem(
             MessageManager.getString("label.sort_annotations_by_label"));
 
-    sortAnnBySequence
-            .setSelected(sortAnnotationsBy == SequenceAnnotationOrder.SEQUENCE_AND_LABEL);
+    sortAnnBySequence.setSelected(
+            sortAnnotationsBy == SequenceAnnotationOrder.SEQUENCE_AND_LABEL);
     sortAnnBySequence.addActionListener(new ActionListener()
     {
       @Override
@@ -737,13 +613,14 @@ public class GAlignFrame extends JInternalFrame
       {
         boolean newState = sortAnnBySequence.getState();
         sortAnnByLabel.setSelected(false);
-        setAnnotationSortOrder(newState ? SequenceAnnotationOrder.SEQUENCE_AND_LABEL
-                : SequenceAnnotationOrder.NONE);
+        setAnnotationSortOrder(
+                newState ? SequenceAnnotationOrder.SEQUENCE_AND_LABEL
+                        : SequenceAnnotationOrder.NONE);
         sortAnnotations_actionPerformed();
       }
     });
-    sortAnnByLabel
-            .setSelected(sortAnnotationsBy == SequenceAnnotationOrder.LABEL_AND_SEQUENCE);
+    sortAnnByLabel.setSelected(
+            sortAnnotationsBy == SequenceAnnotationOrder.LABEL_AND_SEQUENCE);
     sortAnnByLabel.addActionListener(new ActionListener()
     {
       @Override
@@ -751,14 +628,14 @@ public class GAlignFrame extends JInternalFrame
       {
         boolean newState = sortAnnByLabel.getState();
         sortAnnBySequence.setSelected(false);
-        setAnnotationSortOrder(newState ? SequenceAnnotationOrder.LABEL_AND_SEQUENCE
-                : SequenceAnnotationOrder.NONE);
+        setAnnotationSortOrder(
+                newState ? SequenceAnnotationOrder.LABEL_AND_SEQUENCE
+                        : SequenceAnnotationOrder.NONE);
         sortAnnotations_actionPerformed();
       }
     });
     colourTextMenuItem = new JCheckBoxMenuItem(
-            MessageManager
-            .getString("label.colour_text"));
+            MessageManager.getString("label.colour_text"));
     colourTextMenuItem.addActionListener(new ActionListener()
     {
       @Override
@@ -803,8 +680,8 @@ public class GAlignFrame extends JInternalFrame
 
     undoMenuItem.setEnabled(false);
     undoMenuItem.setText(MessageManager.getString("action.undo"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_Z,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -817,8 +694,8 @@ public class GAlignFrame extends JInternalFrame
 
     redoMenuItem.setEnabled(false);
     redoMenuItem.setText(MessageManager.getString("action.redo"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_Y, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_Y,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -841,8 +718,8 @@ public class GAlignFrame extends JInternalFrame
 
     JMenuItem printMenuItem = new JMenuItem(
             MessageManager.getString("action.print"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_P, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_P,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -867,8 +744,8 @@ public class GAlignFrame extends JInternalFrame
 
     JMenuItem findMenuItem = new JMenuItem(
             MessageManager.getString("action.find"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_F,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     findMenuItem.setToolTipText(JvSwingUtils.wrapTooltip(true,
             MessageManager.getString("label.find_tip")));
     al = new ActionListener()
@@ -881,8 +758,8 @@ public class GAlignFrame extends JInternalFrame
     };
     addMenuActionAndAccelerator(keyStroke, findMenuItem, al);
 
-    showSeqFeatures.setText(MessageManager
-            .getString("label.show_sequence_features"));
+    showSeqFeatures.setText(
+            MessageManager.getString("label.show_sequence_features"));
     showSeqFeatures.addActionListener(new ActionListener()
     {
       @Override
@@ -897,8 +774,8 @@ public class GAlignFrame extends JInternalFrame
      * void actionPerformed(ActionEvent actionEvent) {
      * showSeqFeaturesHeight_actionPerformed(actionEvent); } });
      */
-    showDbRefsMenuitem.setText(MessageManager
-            .getString("label.show_database_refs"));
+    showDbRefsMenuitem
+            .setText(MessageManager.getString("label.show_database_refs"));
     showDbRefsMenuitem.addActionListener(new ActionListener()
     {
 
@@ -909,8 +786,8 @@ public class GAlignFrame extends JInternalFrame
       }
 
     });
-    showNpFeatsMenuitem.setText(MessageManager
-            .getString("label.show_non_positional_features"));
+    showNpFeatsMenuitem.setText(
+            MessageManager.getString("label.show_non_positional_features"));
     showNpFeatsMenuitem.addActionListener(new ActionListener()
     {
 
@@ -921,8 +798,8 @@ public class GAlignFrame extends JInternalFrame
       }
 
     });
-    showGroupConservation.setText(MessageManager
-            .getString("label.group_conservation"));
+    showGroupConservation
+            .setText(MessageManager.getString("label.group_conservation"));
     showGroupConservation.addActionListener(new ActionListener()
     {
 
@@ -934,8 +811,8 @@ public class GAlignFrame extends JInternalFrame
 
     });
 
-    showGroupConsensus.setText(MessageManager
-            .getString("label.group_consensus"));
+    showGroupConsensus
+            .setText(MessageManager.getString("label.group_consensus"));
     showGroupConsensus.addActionListener(new ActionListener()
     {
 
@@ -946,8 +823,8 @@ public class GAlignFrame extends JInternalFrame
       }
 
     });
-    showConsensusHistogram.setText(MessageManager
-            .getString("label.show_consensus_histogram"));
+    showConsensusHistogram.setText(
+            MessageManager.getString("label.show_consensus_histogram"));
     showConsensusHistogram.addActionListener(new ActionListener()
     {
 
@@ -958,8 +835,8 @@ public class GAlignFrame extends JInternalFrame
       }
 
     });
-    showSequenceLogo.setText(MessageManager
-            .getString("label.show_consensus_logo"));
+    showSequenceLogo
+            .setText(MessageManager.getString("label.show_consensus_logo"));
     showSequenceLogo.addActionListener(new ActionListener()
     {
 
@@ -970,8 +847,8 @@ public class GAlignFrame extends JInternalFrame
       }
 
     });
-    normaliseSequenceLogo.setText(MessageManager
-            .getString("label.norm_consensus_logo"));
+    normaliseSequenceLogo
+            .setText(MessageManager.getString("label.norm_consensus_logo"));
     normaliseSequenceLogo.addActionListener(new ActionListener()
     {
 
@@ -982,8 +859,8 @@ public class GAlignFrame extends JInternalFrame
       }
 
     });
-    applyAutoAnnotationSettings.setText(MessageManager
-            .getString("label.apply_all_groups"));
+    applyAutoAnnotationSettings
+            .setText(MessageManager.getString("label.apply_all_groups"));
     applyAutoAnnotationSettings.setState(false);
     applyAutoAnnotationSettings.setVisible(true);
     applyAutoAnnotationSettings.addActionListener(new ActionListener()
@@ -1002,8 +879,8 @@ public class GAlignFrame extends JInternalFrame
             MessageManager.getString("label.show_last"));
     buttonGroup.add(showAutoFirst);
     buttonGroup.add(showAutoLast);
-    final boolean autoFirst = Cache.getDefault(
-            Preferences.SHOW_AUTOCALC_ABOVE, false);
+    final boolean autoFirst = Cache
+            .getDefault(Preferences.SHOW_AUTOCALC_ABOVE, false);
     showAutoFirst.setSelected(autoFirst);
     setShowAutoCalculatedAbove(autoFirst);
     showAutoFirst.addActionListener(new ActionListener()
@@ -1028,8 +905,8 @@ public class GAlignFrame extends JInternalFrame
 
     JMenuItem deleteGroups = new JMenuItem(
             MessageManager.getString("action.undefine_groups"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_U, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_U,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -1052,9 +929,9 @@ public class GAlignFrame extends JInternalFrame
     });
 
     JMenuItem createGroup = new JMenuItem(
-            MessageManager.getString("action.create_groups"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+            MessageManager.getString("action.create_group"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_G,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -1067,9 +944,10 @@ public class GAlignFrame extends JInternalFrame
 
     JMenuItem unGroup = new JMenuItem(
             MessageManager.getString("action.remove_group"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask()
-            | KeyEvent.SHIFT_MASK, false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_G,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
+                    | KeyEvent.SHIFT_MASK,
+            false);
     al = new ActionListener()
     {
       @Override
@@ -1081,8 +959,8 @@ public class GAlignFrame extends JInternalFrame
     addMenuActionAndAccelerator(keyStroke, unGroup, al);
 
     copy.setText(MessageManager.getString("action.copy"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_C,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
 
     al = new ActionListener()
     {
@@ -1095,8 +973,8 @@ public class GAlignFrame extends JInternalFrame
     addMenuActionAndAccelerator(keyStroke, copy, al);
 
     cut.setText(MessageManager.getString("action.cut"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_X,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -1121,9 +999,10 @@ public class GAlignFrame extends JInternalFrame
     pasteMenu.setText(MessageManager.getString("action.paste"));
     JMenuItem pasteNew = new JMenuItem(
             MessageManager.getString("label.to_new_alignment"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask()
-            | KeyEvent.SHIFT_MASK, false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_V,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
+                    | KeyEvent.SHIFT_MASK,
+            false);
     al = new ActionListener()
     {
       @Override
@@ -1136,8 +1015,8 @@ public class GAlignFrame extends JInternalFrame
 
     JMenuItem pasteThis = new JMenuItem(
             MessageManager.getString("label.to_this_alignment"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_V,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -1157,8 +1036,8 @@ public class GAlignFrame extends JInternalFrame
         createPNG(null);
       }
     });
-    createPNG.setActionCommand(MessageManager
-            .getString("label.save_png_image"));
+    createPNG.setActionCommand(
+            MessageManager.getString("label.save_png_image"));
 
     JMenuItem font = new JMenuItem(MessageManager.getString("action.font"));
     font.addActionListener(new ActionListener()
@@ -1169,8 +1048,8 @@ public class GAlignFrame extends JInternalFrame
         font_actionPerformed(e);
       }
     });
-    seqLimits.setText(MessageManager
-            .getString("label.show_sequence_limits"));
+    seqLimits.setText(
+            MessageManager.getString("label.show_sequence_limits"));
     seqLimits.setState(jalview.bin.Cache.getDefault("SHOW_JVSUFFIX", true));
     seqLimits.addActionListener(new ActionListener()
     {
@@ -1202,8 +1081,8 @@ public class GAlignFrame extends JInternalFrame
 
     JMenuItem loadTreeMenuItem = new JMenuItem(
             MessageManager.getString("label.load_associated_tree"));
-    loadTreeMenuItem.setActionCommand(MessageManager
-            .getString("label.load_tree_for_sequence_set"));
+    loadTreeMenuItem.setActionCommand(
+            MessageManager.getString("label.load_tree_for_sequence_set"));
     loadTreeMenuItem.addActionListener(new ActionListener()
     {
       @Override
@@ -1247,8 +1126,8 @@ public class GAlignFrame extends JInternalFrame
     });
     centreColumnLabelsMenuItem.setVisible(true);
     centreColumnLabelsMenuItem.setState(false);
-    centreColumnLabelsMenuItem.setText(MessageManager
-            .getString("label.centre_column_labels"));
+    centreColumnLabelsMenuItem.setText(
+            MessageManager.getString("label.centre_column_labels"));
     centreColumnLabelsMenuItem.addActionListener(new ActionListener()
     {
       @Override
@@ -1259,8 +1138,8 @@ public class GAlignFrame extends JInternalFrame
     });
     followHighlightMenuItem.setVisible(true);
     followHighlightMenuItem.setState(true);
-    followHighlightMenuItem.setText(MessageManager
-            .getString("label.automatic_scrolling"));
+    followHighlightMenuItem
+            .setText(MessageManager.getString("label.automatic_scrolling"));
     followHighlightMenuItem.addActionListener(new ActionListener()
     {
 
@@ -1280,7 +1159,7 @@ public class GAlignFrame extends JInternalFrame
       @Override
       public void menuSelected(MenuEvent e)
       {
-        buildTreeMenu();
+        buildTreeSortMenu();
       }
 
       @Override
@@ -1293,8 +1172,8 @@ public class GAlignFrame extends JInternalFrame
       {
       }
     });
-    sortByAnnotScore.setText(MessageManager
-            .getString("label.sort_by_score"));
+    sortByAnnotScore
+            .setText(MessageManager.getString("label.sort_by_score"));
     sort.add(sortByAnnotScore);
     sort.addMenuListener(new javax.swing.event.MenuListener()
     {
@@ -1318,11 +1197,11 @@ public class GAlignFrame extends JInternalFrame
     sortByAnnotScore.setVisible(false);
 
     calculateTree
-            .setText(MessageManager.getString("action.calculate_tree"));
+            .setText(MessageManager.getString("action.calculate_tree_pca"));
 
     padGapsMenuitem.setText(MessageManager.getString("label.pad_gaps"));
-    padGapsMenuitem.setState(jalview.bin.Cache
-            .getDefault("PAD_GAPS", false));
+    padGapsMenuitem
+            .setState(jalview.bin.Cache.getDefault("PAD_GAPS", false));
     padGapsMenuitem.addActionListener(new ActionListener()
     {
       @Override
@@ -1342,8 +1221,8 @@ public class GAlignFrame extends JInternalFrame
         vamsasStore_actionPerformed(e);
       }
     });
-    showTranslation.setText(MessageManager
-            .getString("label.translate_cDNA"));
+    showTranslation
+            .setText(MessageManager.getString("label.translate_cDNA"));
     showTranslation.addActionListener(new ActionListener()
     {
       @Override
@@ -1361,8 +1240,8 @@ public class GAlignFrame extends JInternalFrame
         showReverse_actionPerformed(false);
       }
     });
-    showReverseComplement.setText(MessageManager
-            .getString("label.reverse_complement"));
+    showReverseComplement
+            .setText(MessageManager.getString("label.reverse_complement"));
     showReverseComplement.addActionListener(new ActionListener()
     {
       @Override
@@ -1389,8 +1268,8 @@ public class GAlignFrame extends JInternalFrame
     showProducts.setText(MessageManager.getString("label.get_cross_refs"));
 
     runGroovy.setText(MessageManager.getString("label.run_groovy"));
-    runGroovy.setToolTipText(MessageManager
-            .getString("label.run_groovy_tip"));
+    runGroovy.setToolTipText(
+            MessageManager.getString("label.run_groovy_tip"));
     runGroovy.addActionListener(new ActionListener()
     {
       @Override
@@ -1431,10 +1310,20 @@ public class GAlignFrame extends JInternalFrame
         associatedData_actionPerformed(e);
       }
     });
-    autoCalculate.setText(MessageManager
-            .getString("label.autocalculate_consensus"));
-    autoCalculate.setState(jalview.bin.Cache.getDefault(
-            "AUTO_CALC_CONSENSUS", true));
+    loadVcf = new JMenuItem(MessageManager.getString("label.load_vcf_file"));
+    loadVcf.setToolTipText(MessageManager.getString("label.load_vcf"));
+    loadVcf.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        loadVcf_actionPerformed();
+      }
+    });
+    autoCalculate.setText(
+            MessageManager.getString("label.autocalculate_consensus"));
+    autoCalculate.setState(
+            jalview.bin.Cache.getDefault("AUTO_CALC_CONSENSUS", true));
     autoCalculate.addActionListener(new ActionListener()
     {
       @Override
@@ -1443,12 +1332,10 @@ public class GAlignFrame extends JInternalFrame
         autoCalculate_actionPerformed(e);
       }
     });
-    sortByTree.setText(MessageManager
-            .getString("label.sort_alignment_new_tree"));
-    sortByTree
-            .setToolTipText("<html>"
-                    + MessageManager
-                            .getString("label.enable_automatically_sort_alignment_when_open_new_tree"));
+    sortByTree.setText(
+            MessageManager.getString("label.sort_alignment_new_tree"));
+    sortByTree.setToolTipText("<html>" + MessageManager.getString(
+            "label.enable_automatically_sort_alignment_when_open_new_tree"));
     sortByTree
             .setState(jalview.bin.Cache.getDefault("SORT_BY_TREE", false));
     sortByTree.addActionListener(new ActionListener()
@@ -1460,12 +1347,11 @@ public class GAlignFrame extends JInternalFrame
       }
     });
 
-    listenToViewSelections.setText(MessageManager
-            .getString("label.listen_for_selections"));
+    listenToViewSelections.setText(
+            MessageManager.getString("label.listen_for_selections"));
     listenToViewSelections
-            .setToolTipText("<html>"
-                    + MessageManager
-                            .getString("label.selections_mirror_selections_made_same_sequences_other_views"));
+            .setToolTipText("<html>" + MessageManager.getString(
+                    "label.selections_mirror_selections_made_same_sequences_other_views"));
     listenToViewSelections.setState(false);
     listenToViewSelections.addActionListener(new ActionListener()
     {
@@ -1531,8 +1417,8 @@ public class GAlignFrame extends JInternalFrame
     statusPanel.setLayout(new GridLayout());
     JMenuItem showAllSeqs = new JMenuItem(
             MessageManager.getString("label.all_sequences"));
-    showAllSeqs.setToolTipText(MessageManager
-            .getString("label.toggle_sequence_visibility"));
+    showAllSeqs.setToolTipText(
+            MessageManager.getString("label.toggle_sequence_visibility"));
     showAllSeqs.addActionListener(new ActionListener()
     {
       @Override
@@ -1543,8 +1429,8 @@ public class GAlignFrame extends JInternalFrame
     });
     JMenuItem showAllColumns = new JMenuItem(
             MessageManager.getString("label.all_columns"));
-    showAllColumns.setToolTipText(MessageManager
-            .getString("label.toggle_columns_visibility"));
+    showAllColumns.setToolTipText(
+            MessageManager.getString("label.toggle_columns_visibility"));
     showAllColumns.addActionListener(new ActionListener()
     {
       @Override
@@ -1556,8 +1442,8 @@ public class GAlignFrame extends JInternalFrame
     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.setToolTipText(
+            MessageManager.getString("label.toggle_sequence_visibility"));
     hideSelSequences.addActionListener(new ActionListener()
     {
       @Override
@@ -1568,8 +1454,8 @@ public class GAlignFrame extends JInternalFrame
     });
     JMenuItem hideSelColumns = new JMenuItem(
             MessageManager.getString("label.selected_columns"));
-    hideSelColumns.setToolTipText(MessageManager
-            .getString("label.toggle_columns_visibility"));
+    hideSelColumns.setToolTipText(
+            MessageManager.getString("label.toggle_columns_visibility"));
     hideSelColumns.addActionListener(new ActionListener()
     {
       @Override
@@ -1611,8 +1497,8 @@ public class GAlignFrame extends JInternalFrame
         showAllhidden_actionPerformed(e);
       }
     });
-    hiddenMarkers.setText(MessageManager
-            .getString("action.show_hidden_markers"));
+    hiddenMarkers.setText(
+            MessageManager.getString("action.show_hidden_markers"));
     hiddenMarkers.addActionListener(new ActionListener()
     {
       @Override
@@ -1624,9 +1510,10 @@ public class GAlignFrame extends JInternalFrame
 
     JMenuItem invertColSel = new JMenuItem(
             MessageManager.getString("action.invert_column_selection"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_I, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask()
-            | KeyEvent.ALT_MASK, false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_I,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
+                    | KeyEvent.ALT_MASK,
+            false);
     al = new ActionListener()
     {
       @Override
@@ -1687,8 +1574,8 @@ public class GAlignFrame extends JInternalFrame
     });
 
     JMenuItem save = new JMenuItem(MessageManager.getString("action.save"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_S,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -1712,8 +1599,8 @@ public class GAlignFrame extends JInternalFrame
 
     JMenuItem newView = new JMenuItem(
             MessageManager.getString("action.new_view"));
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit
-            .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_T,
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
     al = new ActionListener()
     {
       @Override
@@ -1730,8 +1617,9 @@ public class GAlignFrame extends JInternalFrame
 
     formatMenu.setText(MessageManager.getString("action.format"));
     JMenu selectMenu = new JMenu(MessageManager.getString("action.select"));
-    idRightAlign.setText(MessageManager
-            .getString("label.right_align_sequence_id"));
+
+    idRightAlign.setText(
+            MessageManager.getString("label.right_align_sequence_id"));
     idRightAlign.addActionListener(new ActionListener()
     {
       @Override
@@ -1789,8 +1677,8 @@ public class GAlignFrame extends JInternalFrame
     });
     JMenuItem selectHighlighted = new JMenuItem(
             MessageManager.getString("action.select_highlighted_columns"));
-    selectHighlighted.setToolTipText(MessageManager
-            .getString("tooltip.select_highlighted_columns"));
+    selectHighlighted.setToolTipText(
+            MessageManager.getString("tooltip.select_highlighted_columns"));
     al = new ActionListener()
     {
       @Override
@@ -1834,6 +1722,13 @@ public class GAlignFrame extends JInternalFrame
     fileMenu.add(exportAnnotations);
     fileMenu.add(loadTreeMenuItem);
     fileMenu.add(associatedData);
+    /*
+     * No VCF import in Jalview-JS
+     * @j2sNative
+     */
+    {
+      fileMenu.add(loadVcf);
+    }
     fileMenu.addSeparator();
     fileMenu.add(closeMenuItem);
 
@@ -1909,7 +1804,6 @@ public class GAlignFrame extends JInternalFrame
     autoAnnMenu.add(showGroupConsensus);
     annotationsMenu.add(autoAnnMenu);
 
-
     sort.add(sortIDMenuItem);
     sort.add(sortLengthMenuItem);
     sort.add(sortGroupMenuItem);
@@ -1919,7 +1813,6 @@ public class GAlignFrame extends JInternalFrame
     calculateMenu.add(calculateTree);
     calculateMenu.addSeparator();
     calculateMenu.add(pairwiseAlignmentMenuItem);
-    calculateMenu.add(PCAMenuItem);
     calculateMenu.addSeparator();
     calculateMenu.add(showTranslation);
     calculateMenu.add(showReverse);
@@ -1981,149 +1874,13 @@ public class GAlignFrame extends JInternalFrame
     // selectMenu.add(listenToViewSelections);
   }
 
-  /**
-   * Rebuilds the Colour menu, including any user-defined colours which have
-   * been loaded either on startup or during the session
-   */
-  public void buildColourMenu()
-  {
-    colourMenu.removeAll();
-    colours = new ButtonGroup();
-
-    colourMenu.add(applyToAllGroups);
-    colourMenu.add(textColour);
-    colourMenu.addSeparator();
-    colourMenu.add(noColourmenuItem);
-    colourMenu.add(clustalColour);
-    colourMenu.add(BLOSUM62Colour);
-    colourMenu.add(PIDColour);
-    colourMenu.add(zappoColour);
-    colourMenu.add(taylorColour);
-    colourMenu.add(hydrophobicityColour);
-    colourMenu.add(helixColour);
-    colourMenu.add(strandColour);
-    colourMenu.add(turnColour);
-    colourMenu.add(buriedColour);
-    colourMenu.add(nucleotideColour);
-    colourMenu.add(purinePyrimidineColour);
-    // colourMenu.add(RNAInteractionColour);
-    // colourMenu.add(covariationColour);
-    colourMenu.add(tcoffeeColour);
-
-    /*
-     * add any user-defined colours
-     */
-    Map<String, UserColourScheme> userColourSchemes = UserDefinedColours
-            .getUserColourSchemes();
-    if (userColourSchemes != null)
-    {
-      for (String userColour : userColourSchemes.keySet())
-      {
-        final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(
-                userColour);
-        radioItem.setName(userColour);
-        radioItem.addMouseListener(new MouseAdapter()
-        {
-          @Override
-          public void mousePressed(MouseEvent evt)
-          {
-            if (evt.isPopupTrigger()) // Mac
-            {
-              offerRemoval();
-            }
-          }
-
-          @Override
-          public void mouseReleased(MouseEvent evt)
-          {
-            if (evt.isPopupTrigger()) // Windows
-            {
-              offerRemoval();
-            }
-          }
-
-          void offerRemoval()
-          {
-            radioItem.removeActionListener(radioItem.getActionListeners()[0]);
-
-            int option = JvOptionPane.showInternalConfirmDialog(
-                    Desktop.desktop, MessageManager
-                            .getString("label.remove_from_default_list"),
-                    MessageManager
-                            .getString("label.remove_user_defined_colour"),
-                    JvOptionPane.YES_NO_OPTION);
-            if (option == JvOptionPane.YES_OPTION)
-            {
-              UserDefinedColours.removeColourFromDefaults(radioItem
-                      .getText());
-              colourMenu.remove(radioItem);
-            }
-            else
-            {
-              radioItem.addActionListener(new ActionListener()
-              {
-                @Override
-                public void actionPerformed(ActionEvent evt)
-                {
-                  userDefinedColour_actionPerformed(evt);
-                }
-              });
-            }
-          }
-        });
-        radioItem.addActionListener(new ActionListener()
-        {
-          @Override
-          public void actionPerformed(ActionEvent evt)
-          {
-            userDefinedColour_actionPerformed(evt);
-          }
-        });
-        colourMenu.add(radioItem);
-        colours.add(radioItem);
-      }
-    }
-
-    colourMenu.add(userDefinedColour);
-    colourMenu.addSeparator();
-    colourMenu.add(conservationMenuItem);
-    colourMenu.add(modifyConservation);
-    colourMenu.add(abovePIDThreshold);
-    colourMenu.add(modifyPID);
-    colourMenu.add(annotationColour);
-    colourMenu.add(rnahelicesColour);
-
-    /*
-     * add colours to a ButtonGroup to make their 
-     * selection mutually exclusive
-     */
-    colours.add(noColourmenuItem);
-    colours.add(clustalColour);
-    colours.add(zappoColour);
-    colours.add(taylorColour);
-    colours.add(hydrophobicityColour);
-    colours.add(helixColour);
-    colours.add(strandColour);
-    colours.add(turnColour);
-    colours.add(buriedColour);
-    colours.add(userDefinedColour);
-    colours.add(PIDColour);
-    colours.add(BLOSUM62Colour);
-    colours.add(nucleotideColour);
-    colours.add(purinePyrimidineColour);
-    // colours.add(covariationColour);
-    colours.add(tcoffeeColour);
-    // colours.add(RNAInteractionColour);
-    setColourSelected(Cache.getDefault(Preferences.DEFAULT_COLOUR,
-            ResidueColourScheme.NONE));
-
+  protected void loadVcf_actionPerformed()
+  {
   }
 
   /**
    * Constructs the entries on the Colour menu (but does not add them to the
-   * menu). The 'name' property of each item is set to the canonical name of the
-   * corresponding colour scheme (may not match the display name), to allow
-   * selection of items by colour scheme name.
+   * menu).
    */
   protected void initColourMenu()
   {
@@ -2134,12 +1891,12 @@ public class GAlignFrame extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        applyToAllGroups_actionPerformed();
+        applyToAllGroups_actionPerformed(applyToAllGroups.isSelected());
       }
     });
 
-    textColour = new JRadioButtonMenuItem(
-            MessageManager.getString("action.set_text_colour"));
+    textColour = new JMenuItem(
+            MessageManager.getString("label.text_colour"));
     textColour.addActionListener(new ActionListener()
     {
       @Override
@@ -2148,184 +1905,6 @@ public class GAlignFrame extends JInternalFrame
         textColour_actionPerformed();
       }
     });
-    clustalColour = new JRadioButtonMenuItem(
-            MessageManager.getString("label.clustalx"));
-    clustalColour.setName(JalviewColourScheme.Clustal.toString());
-    clustalColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        clustalColour_actionPerformed();
-      }
-    });
-    zappoColour = new JRadioButtonMenuItem(
-            MessageManager.getString("label.zappo"));
-    zappoColour.setName(JalviewColourScheme.Zappo.toString());
-    zappoColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        zappoColour_actionPerformed();
-      }
-    });
-    taylorColour = new JRadioButtonMenuItem(
-            MessageManager.getString("label.taylor"));
-    taylorColour.setName(JalviewColourScheme.Taylor.toString());
-    taylorColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        taylorColour_actionPerformed();
-      }
-    });
-    hydrophobicityColour = new JRadioButtonMenuItem(
-            MessageManager
-            .getString("label.hydrophobicity"));
-    hydrophobicityColour
-            .setName(JalviewColourScheme.Hydrophobic.toString());
-    hydrophobicityColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        hydrophobicityColour_actionPerformed();
-      }
-    });
-    helixColour = new JRadioButtonMenuItem(
-            MessageManager.getString("label.helix_propensity"));
-    helixColour.setName(JalviewColourScheme.Helix.toString());
-    helixColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        helixColour_actionPerformed();
-      }
-    });
-    strandColour = new JRadioButtonMenuItem(
-            MessageManager
-            .getString("label.strand_propensity"));
-    strandColour.setName(JalviewColourScheme.Strand.toString());
-    strandColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        strandColour_actionPerformed();
-      }
-    });
-    turnColour = new JRadioButtonMenuItem(
-            MessageManager.getString("label.turn_propensity"));
-    turnColour.setName(JalviewColourScheme.Turn.toString());
-    turnColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        turnColour_actionPerformed();
-      }
-    });
-    buriedColour = new JRadioButtonMenuItem(
-            MessageManager.getString("label.buried_index"));
-    buriedColour.setName(JalviewColourScheme.Buried.toString());
-    buriedColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        buriedColour_actionPerformed();
-      }
-    });
-    userDefinedColour = new JRadioButtonMenuItem(
-            MessageManager
-            .getString("action.user_defined"));
-    userDefinedColour.setName(JalviewColourScheme.UserDefined.toString());
-    userDefinedColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        userDefinedColour_actionPerformed(e);
-      }
-    });
-    PIDColour = new JRadioButtonMenuItem(
-            MessageManager.getString("label.percentage_identity"));
-    PIDColour.setName(JalviewColourScheme.PID.toString());
-    PIDColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        PIDColour_actionPerformed();
-      }
-    });
-    BLOSUM62Colour = new JRadioButtonMenuItem(
-            MessageManager.getString("label.blosum62_score"));
-    BLOSUM62Colour.setName(JalviewColourScheme.Blosum62.toString());
-    BLOSUM62Colour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        BLOSUM62Colour_actionPerformed();
-      }
-    });
-    nucleotideColour = new JRadioButtonMenuItem(
-            MessageManager.getString("label.nucleotide"));
-    nucleotideColour.setName(JalviewColourScheme.Nucleotide.toString());
-    nucleotideColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        nucleotideColour_actionPerformed();
-      }
-    });
-    purinePyrimidineColour = new JRadioButtonMenuItem(
-            MessageManager.getString("label.purine_pyrimidine"));
-    purinePyrimidineColour.setName(JalviewColourScheme.PurinePyrimidine.toString());
-    purinePyrimidineColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        purinePyrimidineColour_actionPerformed();
-      }
-    });
-
-    tcoffeeColour = new JRadioButtonMenuItem(
-            MessageManager.getString("label.tcoffee_scores"));
-    tcoffeeColour.setName(JalviewColourScheme.TCoffee.toString());
-    tcoffeeColour.setEnabled(false);
-    tcoffeeColour.addActionListener(new ActionListener()
-    {
-
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        tcoffeeColorScheme_actionPerformed();
-      }
-    });
-
-    // RNAInteractionColour = new JRadioButtonMenuItem("RNA Interaction type");
-    // RNAInteractionColour.setName("RNA Interaction");
-    // RNAInteractionColour.addActionListener(new ActionListener()
-    // {
-    // @Override
-    // public void actionPerformed(ActionEvent e)
-    // {
-    // RNAInteractionColour_actionPerformed();
-    // }
-    // });
-    /*
-     * covariationColour = new JRadioButtonMenuItem("Covariation");
-     * covariationColour.addActionListener(new ActionListener() { public void
-     * actionPerformed(ActionEvent e) { covariationColour_actionPerformed(); }
-     * });
-     */
 
     conservationMenuItem = new JCheckBoxMenuItem(
             MessageManager.getString("action.by_conservation"));
@@ -2334,18 +1913,8 @@ public class GAlignFrame extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        conservationMenuItem_actionPerformed();
-      }
-    });
-    noColourmenuItem = new JRadioButtonMenuItem(
-            MessageManager.getString("label.none"));
-    noColourmenuItem.setName("None");
-    noColourmenuItem.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        noColourmenuItem_actionPerformed();
+        conservationMenuItem_actionPerformed(
+                conservationMenuItem.isSelected());
       }
     });
 
@@ -2356,7 +1925,7 @@ public class GAlignFrame extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        abovePIDThreshold_actionPerformed();
+        abovePIDThreshold_actionPerformed(abovePIDThreshold.isSelected());
       }
     });
     modifyPID = new JMenuItem(
@@ -2369,8 +1938,7 @@ public class GAlignFrame extends JInternalFrame
         modifyPID_actionPerformed();
       }
     });
-    modifyConservation = new JMenuItem(
-            MessageManager
+    modifyConservation = new JMenuItem(MessageManager
             .getString("label.modify_conservation_threshold"));
     modifyConservation.addActionListener(new ActionListener()
     {
@@ -2391,17 +1959,6 @@ public class GAlignFrame extends JInternalFrame
         annotationColour_actionPerformed();
       }
     });
-
-    rnahelicesColour = new JMenuItem(
-            MessageManager.getString("action.by_rna_helixes"));
-    rnahelicesColour.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        rnahelicesColour_actionPerformed();
-      }
-    });
   }
 
   protected void selectHighlightedColumns_actionPerformed(
@@ -2739,87 +2296,11 @@ public class GAlignFrame extends JInternalFrame
   {
   }
 
-  protected void PCAMenuItem_actionPerformed(ActionEvent e)
-  {
-  }
-
-  protected void averageDistanceTreeMenuItem_actionPerformed(ActionEvent e)
-  {
-  }
-
   protected void neighbourTreeMenuItem_actionPerformed(ActionEvent e)
   {
   }
 
-  protected void njTreeBlosumMenuItem_actionPerformed(ActionEvent e)
-  {
-  }
-
-  protected void avTreeBlosumMenuItem_actionPerformed(ActionEvent e)
-  {
-  }
-
-  protected void clustalColour_actionPerformed()
-  {
-  }
-
-  protected void zappoColour_actionPerformed()
-  {
-  }
-
-  protected void taylorColour_actionPerformed()
-  {
-  }
-
-  protected void hydrophobicityColour_actionPerformed()
-  {
-  }
-
-  protected void helixColour_actionPerformed()
-  {
-  }
-
-  protected void strandColour_actionPerformed()
-  {
-  }
-
-  protected void turnColour_actionPerformed()
-  {
-  }
-
-  protected void buriedColour_actionPerformed()
-  {
-  }
-
-  protected void userDefinedColour_actionPerformed(ActionEvent e)
-  {
-  }
-
-  protected void PIDColour_actionPerformed()
-  {
-  }
-
-  protected void BLOSUM62Colour_actionPerformed()
-  {
-  }
-
-  protected void purinePyrimidineColour_actionPerformed()
-  {
-  }
-
-  protected void RNAInteractionColour_actionPerformed()
-  {
-  }
-
-  /*
-   * protected void covariationColour_actionPerformed() { }
-   */
-
-  protected void noColourmenuItem_actionPerformed()
-  {
-  }
-
-  protected void conservationMenuItem_actionPerformed()
+  protected void conservationMenuItem_actionPerformed(boolean selected)
   {
   }
 
@@ -2835,7 +2316,7 @@ public class GAlignFrame extends JInternalFrame
   {
   }
 
-  protected void abovePIDThreshold_actionPerformed()
+  protected void abovePIDThreshold_actionPerformed(boolean selected)
   {
   }
 
@@ -2843,10 +2324,6 @@ public class GAlignFrame extends JInternalFrame
   {
   }
 
-  protected void nucleotideColour_actionPerformed()
-  {
-  }
-
   protected void deleteGroups_actionPerformed(ActionEvent e)
   {
   }
@@ -2879,7 +2356,7 @@ public class GAlignFrame extends JInternalFrame
   {
   }
 
-  protected void applyToAllGroups_actionPerformed()
+  protected void applyToAllGroups_actionPerformed(boolean selected)
   {
   }
 
@@ -2927,16 +2404,6 @@ public class GAlignFrame extends JInternalFrame
 
   }
 
-  /**
-   * Template method to handle the 'Color T-Coffee scores' menu event.
-   * <p>
-   * Subclasses override this method to provide a custom action.
-   */
-  protected void tcoffeeColorScheme_actionPerformed()
-  {
-
-  }
-
   protected void jpred_actionPerformed(ActionEvent e)
   {
   }
@@ -3007,11 +2474,6 @@ public class GAlignFrame extends JInternalFrame
   {
   }
 
-  public void rnahelicesColour_actionPerformed()
-  {
-
-  }
-
   public void associatedData_actionPerformed(ActionEvent e)
   {
 
@@ -3122,7 +2584,7 @@ public class GAlignFrame extends JInternalFrame
 
   }
 
-  public void buildTreeMenu()
+  public void buildTreeSortMenu()
   {
 
   }