Remove unnecessary separotor
[jalview.git] / src / jalview / jbgui / GDesktop.java
index 162f7e1..1d3cbd0 100755 (executable)
@@ -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
@@ -24,7 +24,14 @@ import java.awt.event.*;
 import javax.swing.*;\r
 \r
 \r
-public class GDesktop extends JFrame {\r
+/**\r
+ * DOCUMENT ME!\r
+ *\r
+ * @author $author$\r
+ * @version $Revision$\r
+ */\r
+public class GDesktop extends JFrame\r
+{\r
     protected static JMenu windowMenu = new JMenu();\r
     JMenuBar DesktopMenubar = new JMenuBar();\r
     JMenu FileMenu = new JMenu();\r
@@ -41,92 +48,142 @@ 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
-    public GDesktop() {\r
-        try {\r
+  /**\r
+     * Creates a new GDesktop object.\r
+     */\r
+    public GDesktop()\r
+    {\r
+        try\r
+        {\r
             jbInit();\r
             this.setJMenuBar(DesktopMenubar);\r
-        } catch (Exception e) {\r
+        }\r
+        catch (Exception e)\r
+        {\r
             e.printStackTrace();\r
         }\r
     }\r
 \r
-    private void jbInit() throws Exception {\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @throws Exception DOCUMENT ME!\r
+     */\r
+    private void jbInit() throws Exception\r
+    {\r
         FileMenu.setMnemonic('F');\r
         FileMenu.setText("File");\r
         HelpMenu.setText("Help");\r
         inputLocalFileMenuItem.setMnemonic('L');\r
         inputLocalFileMenuItem.setText("from File");\r
-        inputLocalFileMenuItem.addActionListener(new java.awt.event.ActionListener() {\r
-                public void actionPerformed(ActionEvent e) {\r
-                    inputLocalFileMenuItem_actionPerformed(e);\r
+        inputLocalFileMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+            {\r
+                public void actionPerformed(ActionEvent e)\r
+                {\r
+                    inputLocalFileMenuItem_actionPerformed(null);\r
                 }\r
             });\r
         inputURLMenuItem.setMnemonic('U');\r
         inputURLMenuItem.setText("from URL");\r
-        inputURLMenuItem.addActionListener(new java.awt.event.ActionListener() {\r
-                public void actionPerformed(ActionEvent e) {\r
-                    inputURLMenuItem_actionPerformed(e);\r
+        inputURLMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+            {\r
+                public void actionPerformed(ActionEvent e)\r
+                {\r
+                    inputURLMenuItem_actionPerformed(null);\r
                 }\r
             });\r
         inputTextboxMenuItem.setMnemonic('C');\r
         inputTextboxMenuItem.setText("from Textbox");\r
-        inputTextboxMenuItem.addActionListener(new java.awt.event.ActionListener() {\r
-                public void actionPerformed(ActionEvent e) {\r
-                    inputTextboxMenuItem_actionPerformed(e);\r
+        inputTextboxMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+            {\r
+                public void actionPerformed(ActionEvent e)\r
+                {\r
+                    inputTextboxMenuItem_actionPerformed(null);\r
                 }\r
             });\r
         quit.setMnemonic('Q');\r
         quit.setText("Quit");\r
-        quit.addActionListener(new java.awt.event.ActionListener() {\r
-                public void actionPerformed(ActionEvent e) {\r
+        quit.addActionListener(new java.awt.event.ActionListener()\r
+            {\r
+                public void actionPerformed(ActionEvent e)\r
+                {\r
                     quit();\r
                 }\r
             });\r
         aboutMenuItem.setText("About");\r
-        aboutMenuItem.addActionListener(new java.awt.event.ActionListener() {\r
-                public void actionPerformed(ActionEvent e) {\r
+        aboutMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+            {\r
+                public void actionPerformed(ActionEvent e)\r
+                {\r
                     aboutMenuItem_actionPerformed(e);\r
                 }\r
             });\r
         documentationMenuItem.setText("Documentation");\r
-        documentationMenuItem.addActionListener(new java.awt.event.ActionListener() {\r
-                public void actionPerformed(ActionEvent e) {\r
+        documentationMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+            {\r
+                public void actionPerformed(ActionEvent e)\r
+                {\r
                     documentationMenuItem_actionPerformed(e);\r
                 }\r
             });\r
         this.getContentPane().setLayout(flowLayout1);\r
         windowMenu.setText("Window");\r
         preferences.setText("Preferences...");\r
-        preferences.addActionListener(new ActionListener() {\r
-                public void actionPerformed(ActionEvent e) {\r
+        preferences.addActionListener(new ActionListener()\r
+            {\r
+                public void actionPerformed(ActionEvent e)\r
+                {\r
                     preferences_actionPerformed(e);\r
                 }\r
             });\r
         toolsMenu.setText("Tools");\r
         saveState.setMnemonic('S');\r
         saveState.setText("Save Project");\r
-        saveState.addActionListener(new ActionListener() {\r
-                public void actionPerformed(ActionEvent e) {\r
+        saveState.addActionListener(new ActionListener()\r
+            {\r
+                public void actionPerformed(ActionEvent e)\r
+                {\r
                     saveState_actionPerformed(e);\r
                 }\r
             });\r
         loadState.setMnemonic('L');\r
         loadState.setText("Load Project");\r
-        loadState.addActionListener(new ActionListener() {\r
-                public void actionPerformed(ActionEvent e) {\r
+        loadState.addActionListener(new ActionListener()\r
+            {\r
+                public void actionPerformed(ActionEvent e)\r
+                {\r
                     loadState_actionPerformed(e);\r
                 }\r
             });\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
@@ -137,38 +194,113 @@ public class GDesktop extends JFrame {
         jMenu1.add(inputLocalFileMenuItem);\r
         jMenu1.add(inputURLMenuItem);\r
         jMenu1.add(inputTextboxMenuItem);\r
-    }\r
+    jMenu1.add(vamsasLoad);\r
+  }\r
 \r
-    protected void inputLocalFileMenuItem_actionPerformed(ActionEvent e) {\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    protected void inputLocalFileMenuItem_actionPerformed(jalview.gui.AlignViewport av)\r
+    {\r
     }\r
 \r
-    protected void inputURLMenuItem_actionPerformed(ActionEvent e) {\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    protected void inputURLMenuItem_actionPerformed(jalview.gui.AlignViewport av)\r
+    {\r
     }\r
 \r
-    protected void inputTextboxMenuItem_actionPerformed(ActionEvent e) {\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    protected void inputTextboxMenuItem_actionPerformed(jalview.gui.AlignViewport av)\r
+    {\r
     }\r
 \r
-    protected void quit() {\r
+    /**\r
+     * DOCUMENT ME!\r
+     */\r
+    protected void quit()\r
+    {\r
     }\r
 \r
-    protected void aboutMenuItem_actionPerformed(ActionEvent e) {\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    protected void aboutMenuItem_actionPerformed(ActionEvent e)\r
+    {\r
     }\r
 \r
-    protected void documentationMenuItem_actionPerformed(ActionEvent e) {\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    protected void documentationMenuItem_actionPerformed(ActionEvent e)\r
+    {\r
     }\r
 \r
-    public void SaveState_actionPerformed(ActionEvent e) {\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void SaveState_actionPerformed(ActionEvent e)\r
+    {\r
     }\r
 \r
-    protected void preferences_actionPerformed(ActionEvent e) {\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    protected void preferences_actionPerformed(ActionEvent e)\r
+    {\r
     }\r
 \r
-    public void saveState_actionPerformed(ActionEvent e) {\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void saveState_actionPerformed(ActionEvent e)\r
+    {\r
     }\r
 \r
-    public void loadState_actionPerformed(ActionEvent e) {\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void loadState_actionPerformed(ActionEvent e)\r
+    {\r
     }\r
 \r
-    public void loadJalviewAlign_actionPerformed(ActionEvent e) {\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    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