Add taylor to default colour check
[jalview.git] / src / jalview / jbgui / GAlignFrame.java
index 23c78f3..26e5326 100755 (executable)
@@ -1,23 +1,33 @@
-/********************\r
- * 2004 Jalview Reengineered\r
- * Barton Group\r
- * Dundee University\r
+/*\r
+ * Jalview - A Sequence Alignment Editor and Viewer\r
+ * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
- * AM Waterhouse\r
- *******************/\r
-\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
+ */\r
 package jalview.jbgui;\r
 \r
-import javax.swing.*;\r
-import java.awt.event.*;\r
 import java.awt.*;\r
+import java.awt.event.*;\r
+import javax.swing.*;\r
+import javax.swing.event.*;\r
 \r
-import jalview.gui.Preferences;\r
-import jalview.schemes.ColourSchemeProperty;\r
-import javax.swing.event.AncestorListener;\r
-import javax.swing.event.AncestorEvent;\r
+import jalview.gui.*;\r
+import jalview.schemes.*;\r
 \r
-public class GAlignFrame extends JInternalFrame\r
+public class GAlignFrame\r
+    extends JInternalFrame\r
 {\r
   protected JMenuBar alignFrameMenuBar = new JMenuBar();\r
   protected JMenu fileMenu = new JMenu();\r
@@ -34,8 +44,8 @@ public class GAlignFrame extends JInternalFrame
   protected JMenuItem remove2RightMenuItem = new JMenuItem();\r
   protected JMenuItem removeGappedColumnMenuItem = new JMenuItem();\r
   protected JMenuItem removeAllGapsMenuItem = new JMenuItem();\r
-  protected JCheckBoxMenuItem viewBoxesMenuItem = new JCheckBoxMenuItem();\r
-  protected JCheckBoxMenuItem viewTextMenuItem = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem viewBoxesMenuItem = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem viewTextMenuItem = new JCheckBoxMenuItem();\r
   protected JMenuItem sortPairwiseMenuItem = new JMenuItem();\r
   protected JMenuItem sortIDMenuItem = new JMenuItem();\r
   protected JMenuItem sortGroupMenuItem = new JMenuItem();\r
@@ -52,7 +62,8 @@ public class GAlignFrame extends JInternalFrame
   protected JRadioButtonMenuItem clustalColour = new JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem zappoColour = new JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem taylorColour = new JRadioButtonMenuItem();\r
-  protected JRadioButtonMenuItem hydrophobicityColour = new JRadioButtonMenuItem();\r
+  protected JRadioButtonMenuItem hydrophobicityColour = new\r
+      JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem helixColour = new JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem strandColour = new JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem turnColour = new JRadioButtonMenuItem();\r
@@ -62,21 +73,21 @@ public class GAlignFrame extends JInternalFrame
   protected JRadioButtonMenuItem BLOSUM62Colour = new JRadioButtonMenuItem();\r
   JMenuItem njTreeBlosumMenuItem = new JMenuItem();\r
   JMenuItem avDistanceTreeBlosumMenuItem = new JMenuItem();\r
-  protected JCheckBoxMenuItem annotationPanelMenuItem = new JCheckBoxMenuItem();\r
-  protected JCheckBoxMenuItem colourTextMenuItem = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem annotationPanelMenuItem = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem colourTextMenuItem = new JCheckBoxMenuItem();\r
   JMenuItem htmlMenuItem = new JMenuItem();\r
   JMenuItem overviewMenuItem = new JMenuItem();\r
   protected JMenuItem undoMenuItem = new JMenuItem();\r
   protected JMenuItem redoMenuItem = new JMenuItem();\r
-  protected JCheckBoxMenuItem conservationMenuItem = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem conservationMenuItem = new JCheckBoxMenuItem();\r
   JRadioButtonMenuItem noColourmenuItem = new JRadioButtonMenuItem();\r
-  protected JCheckBoxMenuItem wrapMenuItem = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem wrapMenuItem = new JCheckBoxMenuItem();\r
   JMenuItem printMenuItem = new JMenuItem();\r
-  protected JCheckBoxMenuItem renderGapsMenuItem = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem renderGapsMenuItem = new JCheckBoxMenuItem();\r
   JMenuItem findMenuItem = new JMenuItem();\r
   JMenu searchMenu = new JMenu();\r
-  protected JCheckBoxMenuItem abovePIDThreshold = new JCheckBoxMenuItem();\r
-  protected JCheckBoxMenuItem sequenceFeatures = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem abovePIDThreshold = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem sequenceFeatures = new JCheckBoxMenuItem();\r
   protected JRadioButtonMenuItem nucleotideColour = new JRadioButtonMenuItem();\r
   JMenuItem deleteGroups = new JMenuItem();\r
   JMenuItem delete = new JMenuItem();\r
@@ -85,16 +96,16 @@ public class GAlignFrame extends JInternalFrame
   JMenu jMenu1 = new JMenu();\r
   JMenuItem pasteNew = new JMenuItem();\r
   JMenuItem pasteThis = new JMenuItem();\r
-  protected JCheckBoxMenuItem applyToAllGroups = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem applyToAllGroups = new JCheckBoxMenuItem();\r
   JMenuItem createPNG = new JMenuItem();\r
   protected JMenuItem font = new JMenuItem();\r
-  protected JCheckBoxMenuItem fullSeqId = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem fullSeqId = new JCheckBoxMenuItem();\r
   JMenuItem epsFile = new JMenuItem();\r
   JMenuItem LoadtreeMenuItem = new JMenuItem();\r
-  JMenuItem jpred = new JMenuItem();\r
-  protected JCheckBoxMenuItem scaleAbove = new JCheckBoxMenuItem();\r
-  protected JCheckBoxMenuItem scaleLeft = new JCheckBoxMenuItem();\r
-  protected JCheckBoxMenuItem scaleRight = new JCheckBoxMenuItem();\r
+  JMenuItem jnet = new JMenuItem();\r
+  public JCheckBoxMenuItem scaleAbove = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem scaleLeft = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem scaleRight = new JCheckBoxMenuItem();\r
   JMenuItem modifyPID = new JMenuItem();\r
   JMenuItem modifyConservation = new JMenuItem();\r
   protected JMenu sortByTreeMenu = new JMenu();\r
@@ -104,6 +115,7 @@ public class GAlignFrame extends JInternalFrame
   JMenu jMenu2 = new JMenu();\r
   JMenuItem padGapsMenuitem = new JMenuItem();\r
   JMenuItem ClustalRealign = new JMenuItem();\r
+\r
   public GAlignFrame()\r
   {\r
     ButtonGroup colours = new ButtonGroup();\r
@@ -121,26 +133,7 @@ public class GAlignFrame extends JInternalFrame
     colours.add(BLOSUM62Colour);\r
     colours.add(nucleotideColour);\r
 \r
-   noColourmenuItem.setSelected(true);\r
-   String defaultColour = Preferences.defaultColour;\r
-   if(defaultColour!=null)\r
-   {\r
-   int index = ColourSchemeProperty.getColourIndexFromName(defaultColour);\r
-   switch(index)\r
-   {\r
-     case ColourSchemeProperty.CLUSTAL : clustalColour.setSelected(true); break;\r
-     case ColourSchemeProperty.BLOSUM : BLOSUM62Colour.setSelected(true); break;\r
-     case ColourSchemeProperty.PID : PIDColour.setSelected(true); break;\r
-     case ColourSchemeProperty.ZAPPO : zappoColour.setSelected(true); break;\r
-     case ColourSchemeProperty.HYDROPHOBIC: hydrophobicityColour.setSelected(true); break;\r
-     case ColourSchemeProperty.HELIX: helixColour.setSelected(true); break;\r
-     case ColourSchemeProperty.STRAND: strandColour.setSelected(true); break;\r
-     case ColourSchemeProperty.TURN : turnColour.setSelected(true); break;\r
-     case ColourSchemeProperty.BURIED: buriedColour.setSelected(true); break;\r
-     case ColourSchemeProperty.NUCLEOTIDE: nucleotideColour.setSelected(true); break;\r
-     case ColourSchemeProperty.USER_DEFINED : userDefinedColour.setSelected(true); break;\r
-   }\r
-   }\r
+    setColourSelected(jalview.bin.Cache.getDefault("DEFAULT_COLOUR", "None"));\r
 \r
 \r
     try\r
@@ -149,9 +142,13 @@ public class GAlignFrame extends JInternalFrame
       setJMenuBar(alignFrameMenuBar);\r
 \r
       JMenuItem item;\r
+\r
       // dynamically fill save as menu with available formats\r
-      for (int i = 0; i < jalview.io.FormatAdapter.formats.size(); i++) {\r
-        item = new JMenuItem((String) jalview.io.FormatAdapter.formats.elementAt(i));\r
+      for (int i = 0; i < jalview.io.FormatAdapter.formats.size(); i++)\r
+      {\r
+        item = new JMenuItem( (String) jalview.io.FormatAdapter.formats.\r
+                             elementAt(\r
+                                 i));\r
         item.addActionListener(new java.awt.event.ActionListener()\r
         {\r
           public void actionPerformed(ActionEvent e)\r
@@ -160,22 +157,99 @@ public class GAlignFrame extends JInternalFrame
           }\r
         });\r
 \r
-        outputTextboxMenu.add( item );\r
+        outputTextboxMenu.add(item);\r
       }\r
-\r
     }\r
-    catch(Exception e)\r
+    catch (Exception e)\r
     {\r
-      e.printStackTrace();\r
     }\r
 \r
   }\r
-  private void jbInit() throws Exception\r
+\r
+  public void setColourSelected(String defaultColour)\r
+  {\r
+\r
+    if (defaultColour != null)\r
+    {\r
+      int index = ColourSchemeProperty.getColourIndexFromName(defaultColour);\r
+\r
+      switch (index)\r
+      {\r
+        case ColourSchemeProperty.NONE:\r
+              noColourmenuItem.setSelected(true);\r
+              break;\r
+        case ColourSchemeProperty.CLUSTAL:\r
+          clustalColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.BLOSUM:\r
+          BLOSUM62Colour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.PID:\r
+          PIDColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.ZAPPO:\r
+          zappoColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.TAYLOR:\r
+          taylorColour.setSelected(true);\r
+          break;\r
+\r
+        case ColourSchemeProperty.HYDROPHOBIC:\r
+          hydrophobicityColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.HELIX:\r
+          helixColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.STRAND:\r
+          strandColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.TURN:\r
+          turnColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.BURIED:\r
+          buriedColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.NUCLEOTIDE:\r
+          nucleotideColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.USER_DEFINED:\r
+          userDefinedColour.setSelected(true);\r
+\r
+          break;\r
+      }\r
+    }\r
+\r
+  }\r
+\r
+  private void jbInit()\r
+      throws Exception\r
   {\r
     fileMenu.setMnemonic('F');\r
     fileMenu.setText("File");\r
     saveAlignmentMenu.setMnemonic('L');\r
     saveAlignmentMenu.setText("Save As");\r
+    saveAlignmentMenu.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.\r
+        awt.event.KeyEvent.VK_S, java.awt.event.KeyEvent.CTRL_MASK, false));\r
     saveAlignmentMenu.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -199,8 +273,10 @@ public class GAlignFrame extends JInternalFrame
     webService.setText("Web Service");\r
     selectAllSequenceMenuItem.setText("Select all");\r
     selectAllSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
-        java.awt.event.KeyEvent.VK_A, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
-    selectAllSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+        java.awt.event.KeyEvent.VK_A,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    selectAllSequenceMenuItem.addActionListener(new java.awt.event.\r
+                                                ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
@@ -209,9 +285,10 @@ public class GAlignFrame extends JInternalFrame
     });\r
     deselectAllSequenceMenuItem.setText("Deselect All");\r
     deselectAllSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.\r
-                                               getKeyStroke(java.awt.event.\r
-        KeyEvent.VK_ESCAPE, 0, false));\r
-    deselectAllSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+                                               getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_ESCAPE, 0, false));\r
+    deselectAllSequenceMenuItem.addActionListener(new java.awt.event.\r
+                                                  ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
@@ -243,7 +320,8 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     removeGappedColumnMenuItem.setText("Remove Empty Columns");\r
-    removeGappedColumnMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    removeGappedColumnMenuItem.addActionListener(new java.awt.event.\r
+                                                 ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
@@ -301,7 +379,8 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     removeRedundancyMenuItem.setText("Remove Redundancy...");\r
-    removeRedundancyMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    removeRedundancyMenuItem.addActionListener(new java.awt.event.\r
+                                               ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
@@ -309,14 +388,15 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     pairwiseAlignmentMenuItem.setText("Pairwise Alignments...");\r
-    pairwiseAlignmentMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    pairwiseAlignmentMenuItem.addActionListener(new java.awt.event.\r
+                                                ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
         pairwiseAlignmentMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    PCAMenuItem.setText("Principal Component Analysis...");\r
+    PCAMenuItem.setText("Principal Component Analysis");\r
     PCAMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -324,15 +404,17 @@ public class GAlignFrame extends JInternalFrame
         PCAMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    averageDistanceTreeMenuItem.setText("Average Distance Using % Identity...");\r
-    averageDistanceTreeMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    averageDistanceTreeMenuItem.setText(\r
+        "Average Distance Using % Identity");\r
+    averageDistanceTreeMenuItem.addActionListener(new java.awt.event.\r
+                                                  ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
         averageDistanceTreeMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    neighbourTreeMenuItem.setText("Neighbour Joining Using % Identity...");\r
+    neighbourTreeMenuItem.setText("Neighbour Joining Using % Identity");\r
     neighbourTreeMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -340,7 +422,7 @@ public class GAlignFrame extends JInternalFrame
         neighbourTreeMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    clustalAlignMenuItem.setText("Clustal Alignment...");\r
+    clustalAlignMenuItem.setText("Clustal Alignment");\r
     clustalAlignMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -460,15 +542,17 @@ public class GAlignFrame extends JInternalFrame
         BLOSUM62Colour_actionPerformed(e);\r
       }\r
     });\r
-    avDistanceTreeBlosumMenuItem.setText("Average Distance Using BLOSUM62...");\r
-    avDistanceTreeBlosumMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    avDistanceTreeBlosumMenuItem.setText(\r
+        "Average Distance Using BLOSUM62");\r
+    avDistanceTreeBlosumMenuItem.addActionListener(new java.awt.event.\r
+        ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
         avTreeBlosumMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    njTreeBlosumMenuItem.setText("Neighbour Joining using BLOSUM62...");\r
+    njTreeBlosumMenuItem.setText("Neighbour Joining using BLOSUM62");\r
     njTreeBlosumMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -478,7 +562,7 @@ public class GAlignFrame extends JInternalFrame
     });\r
     annotationPanelMenuItem.setActionCommand("");\r
     annotationPanelMenuItem.setText("Show Annotations");\r
-    annotationPanelMenuItem.setState( jalview.gui.Preferences.showAnnotation );\r
+    annotationPanelMenuItem.setState( jalview.bin.Cache.getDefault("SHOW_ANNOTATIONS",true));\r
     annotationPanelMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -502,7 +586,7 @@ public class GAlignFrame extends JInternalFrame
         htmlMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    overviewMenuItem.setText("Overview Window...");\r
+    overviewMenuItem.setText("Overview Window");\r
     overviewMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -513,8 +597,9 @@ public class GAlignFrame extends JInternalFrame
     undoMenuItem.setEnabled(false);\r
     undoMenuItem.setMnemonic('Z');\r
     undoMenuItem.setText("Undo");\r
-    undoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
-        event.KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    undoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_Z,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     undoMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -574,8 +659,9 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     findMenuItem.setText("Find...");\r
-    findMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
-        event.KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    findMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_F,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     findMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -586,8 +672,10 @@ public class GAlignFrame extends JInternalFrame
     searchMenu.setText("Search");\r
 \r
     abovePIDThreshold.setText("Above Identity Threshold");\r
-    abovePIDThreshold.addActionListener(new java.awt.event.ActionListener() {\r
-      public void actionPerformed(ActionEvent e) {\r
+    abovePIDThreshold.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
         abovePIDThreshold_actionPerformed(e);\r
       }\r
     });\r
@@ -616,8 +704,9 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     copy.setText("Copy");\r
-    copy.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
-        KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    copy.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_C,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     copy.setMnemonic(KeyEvent.VK_C);\r
 \r
     copy.addActionListener(new java.awt.event.ActionListener()\r
@@ -628,8 +717,9 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     cut.setText("Cut");\r
-    cut.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
-        KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    cut.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_X,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     cut.setMnemonic(KeyEvent.VK_X);\r
     cut.addActionListener(new java.awt.event.ActionListener()\r
     {\r
@@ -649,8 +739,9 @@ public class GAlignFrame extends JInternalFrame
     jMenu1.setMnemonic('V');\r
     jMenu1.setText("Paste");\r
     pasteNew.setText("To New Alignment");\r
-    pasteNew.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
-        KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    pasteNew.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_V,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     pasteNew.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -679,7 +770,7 @@ public class GAlignFrame extends JInternalFrame
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        createPNG_actionPerformed(e);\r
+        createPNG(null);\r
       }\r
     });\r
     createPNG.setActionCommand("Save As PNG Image");\r
@@ -706,19 +797,20 @@ public class GAlignFrame extends JInternalFrame
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        epsFile_actionPerformed(e);\r
+        createEPS(null);\r
       }\r
     });\r
     LoadtreeMenuItem.setActionCommand("Load a tree for this sequence set");\r
     LoadtreeMenuItem.setText("Load Assocated Tree");\r
-    LoadtreeMenuItem.addActionListener(new java.awt.event.ActionListener() {\r
+    LoadtreeMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
         LoadtreeMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    jpred.setText("JPred...");\r
-    jpred.addActionListener(new java.awt.event.ActionListener()\r
+    jnet.setText("JNet");\r
+    jnet.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
@@ -773,9 +865,11 @@ public class GAlignFrame extends JInternalFrame
     sortByTreeMenu.setText("By Tree Order");\r
     sort.setText("Sort");\r
     calculate.setText("Calculate Tree");\r
-    msaAlignMenuItem.setText("Muscle Alignment...");\r
-    msaAlignMenuItem.addActionListener(new java.awt.event.ActionListener() {\r
-      public void actionPerformed(ActionEvent e) {\r
+    msaAlignMenuItem.setText("Muscle Alignment");\r
+    msaAlignMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
         msaAlignMenuItem_actionPerformed(e);\r
       }\r
     });\r
@@ -788,7 +882,7 @@ public class GAlignFrame extends JInternalFrame
         padGapsMenuitem_actionPerformed(e);\r
       }\r
     });\r
-    ClustalRealign.setText("Clustal Realign...");\r
+    ClustalRealign.setText("Clustal Realign");\r
     ClustalRealign.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -874,7 +968,7 @@ public class GAlignFrame extends JInternalFrame
     calculateMenu.add(webService);\r
     webService.add(clustalAlignMenuItem);\r
     webService.add(msaAlignMenuItem);\r
-    webService.add(jpred);\r
+    webService.add(jnet);\r
     webService.add(ClustalRealign);\r
     this.getContentPane().add(statusBar, BorderLayout.SOUTH);\r
     jMenu1.add(pasteNew);\r
@@ -893,378 +987,289 @@ public class GAlignFrame extends JInternalFrame
 \r
   protected void outputText_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void htmlMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void closeMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void redoMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void undoMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void selectAllSequenceMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void deselectAllSequenceMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void invertSequenceMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void remove2LeftMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void remove2RightMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void removeGappedColumnMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void removeAllGapsMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void wrapMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void viewBoxesMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void viewTextMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void colourTextMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void annotationPanelMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void overviewMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void sortPairwiseMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void sortIDMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void sortGroupMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void removeRedundancyMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void pairwiseAlignmentMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void PCAMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void averageDistanceTreeMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void neighbourTreeMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void njTreeBlosumMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void avTreeBlosumMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
-\r
   protected void clustalAlignMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
-\r
-\r
   protected void clustalColour_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void zappoColour_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void taylorColour_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void hydrophobicityColour_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void helixColour_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void strandColour_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void turnColour_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void buriedColour_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
-\r
   protected void userDefinedColour_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void PIDColour_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void BLOSUM62Colour_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void noColourmenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-  protected  void conservationMenuItem_actionPerformed(ActionEvent e)\r
+  protected void conservationMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void printMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void renderGapsMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void findMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
-  protected void abovePIDThreshold_actionPerformed(ActionEvent e) {\r
-\r
+  protected void abovePIDThreshold_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
   public void sequenceFeatures_actionPerformed(ActionEvent actionEvent)\r
   {\r
-\r
   }\r
 \r
   protected void nucleotideColour_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void deleteGroups_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
- protected void copy_actionPerformed(ActionEvent e)\r
+  protected void copy_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void cut_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void delete_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void pasteNew_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void pasteThis_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void applyToAllGroups_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-  protected void createPNG_actionPerformed(ActionEvent e)\r
+  public void createPNG(java.io.File f)\r
   {\r
-\r
   }\r
 \r
   protected void font_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void fullSeqId_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-  protected void epsFile_actionPerformed(ActionEvent e)\r
+  public void createEPS(java.io.File f)\r
   {\r
-\r
   }\r
 \r
-  protected void LoadtreeMenuItem_actionPerformed(ActionEvent e) {\r
-\r
+  protected void LoadtreeMenuItem_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
   protected void jpred_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void scaleAbove_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void scaleLeft_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void scaleRight_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void modifyPID_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void modifyConservation_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void preferences_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-  protected void msaAlignMenuItem_actionPerformed(ActionEvent e) {\r
-\r
+  protected void msaAlignMenuItem_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
   protected void alignFrameMenuBar_ancestorAdded(AncestorEvent event)\r
   {\r
-\r
   }\r
 \r
   protected void saveAlignmentMenu_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void padGapsMenuitem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void ClustalRealign_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
-\r
 }\r