X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=5ff13af9e033ec4e49022a8140d324bc10489c5b;hb=9084f3744122d4c4d6ee488f9f3e428f57e800d5;hp=59e4457460de27a2b8131887eead2df5a3ed6c38;hpb=88bc025708f1b7881bababb92d14351760e0f9da;p=jalview.git diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java index 59e4457..5ff13af 100755 --- a/src/jalview/jbgui/GDesktop.java +++ b/src/jalview/jbgui/GDesktop.java @@ -1,17 +1,17 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle - * + * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) + * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA @@ -20,41 +20,73 @@ package jalview.jbgui; import java.awt.*; import java.awt.event.*; + import javax.swing.*; /** * DOCUMENT ME! - * + * * @author $author$ * @version $Revision$ */ -public class GDesktop - extends JFrame +public class GDesktop extends JFrame { protected static JMenu windowMenu = new JMenu(); + JMenuBar desktopMenubar = new JMenuBar(); + JMenu FileMenu = new JMenu(); + JMenu HelpMenu = new JMenu(); + protected JMenu VamsasMenu = new JMenu(); + + protected JMenu VamsasStMenu = new JMenu(); + JMenuItem inputLocalFileMenuItem = new JMenuItem(); + JMenuItem inputURLMenuItem = new JMenuItem(); + JMenuItem inputTextboxMenuItem = new JMenuItem(); + JMenuItem quit = new JMenuItem(); + JMenuItem aboutMenuItem = new JMenuItem(); + JMenuItem documentationMenuItem = new JMenuItem(); + FlowLayout flowLayout1 = new FlowLayout(); + protected JMenu toolsMenu = new JMenu(); + JMenuItem preferences = new JMenuItem(); + JMenuItem saveState = new JMenuItem(); + JMenuItem loadState = new JMenuItem(); + JMenu inputMenu = new JMenu(); - protected JMenuItem vamsasLoad = new JMenuItem(); + + protected JMenuItem vamsasStart = new JMenuItem(); + + protected JMenuItem vamsasImport = new JMenuItem(); + + protected JMenuItem vamsasSave = new JMenuItem(); + JMenuItem inputSequence = new JMenuItem(); + protected JMenuItem vamsasStop = new JMenuItem(); + JMenuItem closeAll = new JMenuItem(); + JMenuItem raiseRelated = new JMenuItem(); + JMenuItem minimizeAssociated = new JMenuItem(); + protected JCheckBoxMenuItem showMemusage = new JCheckBoxMenuItem(); + + JMenuItem garbageCollect = new JMenuItem(); + /** * Creates a new GDesktop object. */ @@ -64,13 +96,12 @@ public class GDesktop { jbInit(); this.setJMenuBar(desktopMenubar); - } - catch (Exception e) + } catch (Exception e) { e.printStackTrace(); } - if (!System.getProperty("os.name").startsWith("Mac")) + if (!new jalview.util.Platform().isAMac()) { FileMenu.setMnemonic('F'); inputLocalFileMenuItem.setMnemonic('L'); @@ -86,27 +117,30 @@ public class GDesktop /** * DOCUMENT ME! - * - * @throws Exception DOCUMENT ME! + * + * @throws Exception + * DOCUMENT ME! */ - private void jbInit() - throws Exception + private void jbInit() throws Exception { FileMenu.setText("File"); HelpMenu.setText("Help"); VamsasMenu.setText("Vamsas"); VamsasMenu.setToolTipText("Share data with other vamsas applications."); + VamsasStMenu.setText("Connect to"); + VamsasStMenu.setToolTipText("Join an existing vamsas session"); inputLocalFileMenuItem.setText("from File"); - inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( - java.awt.event.KeyEvent.VK_O, - Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); - inputLocalFileMenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - inputLocalFileMenuItem_actionPerformed(null); - } - }); + inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke + .getKeyStroke(java.awt.event.KeyEvent.VK_O, Toolkit + .getDefaultToolkit().getMenuShortcutKeyMask(), false)); + inputLocalFileMenuItem + .addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + inputLocalFileMenuItem_actionPerformed(null); + } + }); inputURLMenuItem.setText("from URL"); inputURLMenuItem.addActionListener(new java.awt.event.ActionListener() { @@ -116,13 +150,14 @@ public class GDesktop } }); inputTextboxMenuItem.setText("from Textbox"); - inputTextboxMenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - inputTextboxMenuItem_actionPerformed(null); - } - }); + inputTextboxMenuItem + .addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + inputTextboxMenuItem_actionPerformed(null); + } + }); quit.setText("Quit"); quit.addActionListener(new java.awt.event.ActionListener() { @@ -140,15 +175,16 @@ public class GDesktop } }); documentationMenuItem.setText("Documentation"); - documentationMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( - java.awt.event.KeyEvent.VK_F1, 0, false)); - documentationMenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - documentationMenuItem_actionPerformed(e); - } - }); + documentationMenuItem.setAccelerator(javax.swing.KeyStroke + .getKeyStroke(java.awt.event.KeyEvent.VK_F1, 0, false)); + documentationMenuItem + .addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + documentationMenuItem_actionPerformed(e); + } + }); this.getContentPane().setLayout(flowLayout1); windowMenu.setText("Window"); preferences.setText("Preferences..."); @@ -177,13 +213,31 @@ public class GDesktop } }); inputMenu.setText("Input Alignment"); - vamsasLoad.setText("Start Vamsas Session..."); - vamsasLoad.setVisible(false); - vamsasLoad.addActionListener(new ActionListener() + vamsasStart.setText("New Vamsas Session..."); + vamsasStart.setVisible(false); + vamsasStart.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + vamsasStart_actionPerformed(e); + } + }); + vamsasImport.setText("Load Vamsas Session..."); + vamsasImport.setVisible(false); + vamsasImport.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + vamsasImport_actionPerformed(e); + } + }); + vamsasSave.setText("Save Vamsas Session..."); + vamsasSave.setVisible(false); + vamsasSave.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - vamsasLoad_actionPerformed(e); + vamsasSave_actionPerformed(e); } }); inputSequence.setText("Fetch Sequence(s)..."); @@ -227,6 +281,22 @@ public class GDesktop minimizeAssociated_actionPerformed(e); } }); + garbageCollect.setText("Collect Garbage"); + garbageCollect.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + garbageCollect_actionPerformed(e); + } + }); + showMemusage.setText("Show Memory Usage"); + showMemusage.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + showMemusage_actionPerformed(e); + } + }); desktopMenubar.add(FileMenu); desktopMenubar.add(toolsMenu); VamsasMenu.setVisible(false); @@ -242,9 +312,15 @@ public class GDesktop FileMenu.add(quit); HelpMenu.add(aboutMenuItem); HelpMenu.add(documentationMenuItem); - VamsasMenu.add(vamsasLoad); + VamsasMenu.add(VamsasStMenu); + VamsasStMenu.setVisible(false); + VamsasMenu.add(vamsasStart); + VamsasMenu.add(vamsasImport); + VamsasMenu.add(vamsasSave); VamsasMenu.add(vamsasStop); toolsMenu.add(preferences); + toolsMenu.add(showMemusage); + toolsMenu.add(garbageCollect); inputMenu.add(inputLocalFileMenuItem); inputMenu.add(inputURLMenuItem); inputMenu.add(inputTextboxMenuItem); @@ -252,35 +328,59 @@ public class GDesktop windowMenu.add(raiseRelated); windowMenu.add(minimizeAssociated); windowMenu.addSeparator(); - // inputMenu.add(vamsasLoad); + // inputMenu.add(vamsasLoad); + } + + protected void showMemusage_actionPerformed(ActionEvent e) + { + // TODO Auto-generated method stub + + } + + protected void garbageCollect_actionPerformed(ActionEvent e) + { + // TODO Auto-generated method stub + + } + + protected void vamsasStMenu_actionPerformed() + { + } + + public void vamsasSave_actionPerformed(ActionEvent e) + { } /** * DOCUMENT ME! - * - * @param e DOCUMENT ME! + * + * @param e + * DOCUMENT ME! */ - protected void inputLocalFileMenuItem_actionPerformed(jalview.gui. - AlignViewport av) + protected void inputLocalFileMenuItem_actionPerformed( + jalview.gui.AlignViewport av) { } /** * DOCUMENT ME! - * - * @param e DOCUMENT ME! + * + * @param e + * DOCUMENT ME! */ - protected void inputURLMenuItem_actionPerformed(jalview.gui.AlignViewport av) + protected void inputURLMenuItem_actionPerformed( + jalview.gui.AlignViewport av) { } /** * DOCUMENT ME! - * - * @param e DOCUMENT ME! + * + * @param e + * DOCUMENT ME! */ - protected void inputTextboxMenuItem_actionPerformed(jalview.gui.AlignViewport - av) + protected void inputTextboxMenuItem_actionPerformed( + jalview.gui.AlignViewport av) { } @@ -293,8 +393,9 @@ public class GDesktop /** * DOCUMENT ME! - * - * @param e DOCUMENT ME! + * + * @param e + * DOCUMENT ME! */ protected void aboutMenuItem_actionPerformed(ActionEvent e) { @@ -302,8 +403,9 @@ public class GDesktop /** * DOCUMENT ME! - * - * @param e DOCUMENT ME! + * + * @param e + * DOCUMENT ME! */ protected void documentationMenuItem_actionPerformed(ActionEvent e) { @@ -311,8 +413,9 @@ public class GDesktop /** * DOCUMENT ME! - * - * @param e DOCUMENT ME! + * + * @param e + * DOCUMENT ME! */ public void SaveState_actionPerformed(ActionEvent e) { @@ -320,8 +423,9 @@ public class GDesktop /** * DOCUMENT ME! - * - * @param e DOCUMENT ME! + * + * @param e + * DOCUMENT ME! */ protected void preferences_actionPerformed(ActionEvent e) { @@ -329,8 +433,9 @@ public class GDesktop /** * DOCUMENT ME! - * - * @param e DOCUMENT ME! + * + * @param e + * DOCUMENT ME! */ public void saveState_actionPerformed(ActionEvent e) { @@ -338,8 +443,9 @@ public class GDesktop /** * DOCUMENT ME! - * - * @param e DOCUMENT ME! + * + * @param e + * DOCUMENT ME! */ public void loadState_actionPerformed(ActionEvent e) { @@ -347,14 +453,15 @@ public class GDesktop /** * DOCUMENT ME! - * - * @param e DOCUMENT ME! + * + * @param e + * DOCUMENT ME! */ public void loadJalviewAlign_actionPerformed(ActionEvent e) { } - public void vamsasLoad_actionPerformed(ActionEvent e) + public void vamsasStart_actionPerformed(ActionEvent e) { } @@ -383,4 +490,8 @@ public class GDesktop { } + + public void vamsasImport_actionPerformed(ActionEvent e) + { + } }