Remove unnecessary separotor

[jalview.git] / src / jalview / jbgui / GDesktop.java

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index 65ef8dc..1d3cbd0 100755 (executable)
--- a/src/jalview/jbgui/GDesktop.java
+++ b/src/jalview/jbgui/GDesktop.java
@@ -1,6 +1,6 @@
 /*\r
 * Jalview - A Sequence Alignment Editor and Viewer\r
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\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
@@ -48,8 +48,10 @@ public class GDesktop extends JFrame
     JMenuItem saveState = new JMenuItem();\r
     JMenuItem loadState = new JMenuItem();\r
     JMenu jMenu1 = new JMenu();\r
+  JMenuItem vamsasLoad = new JMenuItem();\r
+  JMenuItem inputSequence = new JMenuItem();\r
 \r
-    /**\r
+  /**\r
      * Creates a new GDesktop object.\r
      */\r
     public GDesktop()\r
@@ -81,7 +83,7 @@ public class GDesktop extends JFrame
             {\r
                 public void actionPerformed(ActionEvent e)\r
                 {\r
-                    inputLocalFileMenuItem_actionPerformed(e);\r
+                    inputLocalFileMenuItem_actionPerformed(null);\r
                 }\r
             });\r
         inputURLMenuItem.setMnemonic('U');\r
@@ -90,7 +92,7 @@ public class GDesktop extends JFrame
             {\r
                 public void actionPerformed(ActionEvent e)\r
                 {\r
-                    inputURLMenuItem_actionPerformed(e);\r
+                    inputURLMenuItem_actionPerformed(null);\r
                 }\r
             });\r
         inputTextboxMenuItem.setMnemonic('C');\r
@@ -99,7 +101,7 @@ public class GDesktop extends JFrame
             {\r
                 public void actionPerformed(ActionEvent e)\r
                 {\r
-                    inputTextboxMenuItem_actionPerformed(e);\r
+                    inputTextboxMenuItem_actionPerformed(null);\r
                 }\r
             });\r
         quit.setMnemonic('Q');\r
@@ -158,13 +160,30 @@ public class GDesktop extends JFrame
             });\r
         jMenu1.setMnemonic('I');\r
         jMenu1.setText("Input Alignment");\r
-        DesktopMenubar.add(FileMenu);\r
+    vamsasLoad.setText("Vamsas");\r
+    vamsasLoad.setVisible(false);\r
+    vamsasLoad.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        vamsasLoad_actionPerformed(e);\r
+      }\r
+    });\r
+    inputSequence.setText("Fetch Sequence(s)...");\r
+    inputSequence.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        inputSequence_actionPerformed(e);\r
+      }\r
+    });\r
+    DesktopMenubar.add(FileMenu);\r
         DesktopMenubar.add(toolsMenu);\r
         DesktopMenubar.add(HelpMenu);\r
         DesktopMenubar.add(windowMenu);\r
-        FileMenu.addSeparator();\r
-        FileMenu.add(jMenu1);\r
-        FileMenu.addSeparator();\r
+    FileMenu.add(jMenu1);\r
+    FileMenu.add(inputSequence);\r
+    FileMenu.addSeparator();\r
         FileMenu.add(saveState);\r
         FileMenu.add(loadState);\r
         FileMenu.addSeparator();\r
@@ -175,14 +194,15 @@ public class GDesktop extends JFrame
         jMenu1.add(inputLocalFileMenuItem);\r
         jMenu1.add(inputURLMenuItem);\r
         jMenu1.add(inputTextboxMenuItem);\r
-    }\r
+    jMenu1.add(vamsasLoad);\r
+  }\r
 \r
     /**\r
      * DOCUMENT ME!\r
      *\r
      * @param e DOCUMENT ME!\r
      */\r
-    protected void inputLocalFileMenuItem_actionPerformed(ActionEvent e)\r
+    protected void inputLocalFileMenuItem_actionPerformed(jalview.gui.AlignViewport av)\r
     {\r
     }\r
 \r
@@ -191,7 +211,7 @@ public class GDesktop extends JFrame
      *\r
      * @param e DOCUMENT ME!\r
      */\r
-    protected void inputURLMenuItem_actionPerformed(ActionEvent e)\r
+    protected void inputURLMenuItem_actionPerformed(jalview.gui.AlignViewport av)\r
     {\r
     }\r
 \r
@@ -200,7 +220,7 @@ public class GDesktop extends JFrame
      *\r
      * @param e DOCUMENT ME!\r
      */\r
-    protected void inputTextboxMenuItem_actionPerformed(ActionEvent e)\r
+    protected void inputTextboxMenuItem_actionPerformed(jalview.gui.AlignViewport av)\r
     {\r
     }\r
 \r
@@ -273,4 +293,14 @@ public class GDesktop extends JFrame
     public void loadJalviewAlign_actionPerformed(ActionEvent e)\r
     {\r
     }\r
+\r
+  public void vamsasLoad_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  public void inputSequence_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
 }\r