X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=63ecdafed454107f0b47a51f85a660c2dd2cdc4d;hb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;hp=74c0a2e32e5ad92cb391d4a7310ab663ab00f960;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java index 74c0a2e..63ecdaf 100755 --- a/src/jalview/jbgui/GDesktop.java +++ b/src/jalview/jbgui/GDesktop.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,6 +20,8 @@ */ package jalview.jbgui; +import jalview.api.AlignmentViewPanel; +import jalview.io.FileFormatException; import jalview.util.MessageManager; import java.awt.FlowLayout; @@ -74,7 +76,7 @@ public class GDesktop extends JFrame JMenuItem saveState = new JMenuItem(); JMenuItem loadState = new JMenuItem(); - + JMenu inputMenu = new JMenu(); protected JMenuItem vamsasStart = new JMenuItem(); @@ -100,8 +102,9 @@ public class GDesktop extends JFrame protected JCheckBoxMenuItem showConsole = new JCheckBoxMenuItem(); protected JCheckBoxMenuItem showNews = new JCheckBoxMenuItem(); - + protected JMenuItem snapShotWindow = new JMenuItem(); + /** * Creates a new GDesktop object. */ @@ -155,6 +158,7 @@ public class GDesktop extends JFrame inputLocalFileMenuItem .addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { inputLocalFileMenuItem_actionPerformed(null); @@ -163,9 +167,16 @@ public class GDesktop extends JFrame inputURLMenuItem.setText(MessageManager.getString("label.from_url")); inputURLMenuItem.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - inputURLMenuItem_actionPerformed(null); + try + { + inputURLMenuItem_actionPerformed(null); + } catch (FileFormatException e1) + { + System.err.println("Error loading from URL: " + e1.getMessage()); + } } }); inputTextboxMenuItem.setText(MessageManager @@ -173,6 +184,7 @@ public class GDesktop extends JFrame inputTextboxMenuItem .addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { inputTextboxMenuItem_actionPerformed(null); @@ -181,6 +193,7 @@ public class GDesktop extends JFrame quit.setText(MessageManager.getString("action.quit")); quit.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { quit(); @@ -189,6 +202,7 @@ public class GDesktop extends JFrame aboutMenuItem.setText(MessageManager.getString("label.about")); aboutMenuItem.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { aboutMenuItem_actionPerformed(e); @@ -201,6 +215,7 @@ public class GDesktop extends JFrame documentationMenuItem .addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { documentationMenuItem_actionPerformed(e); @@ -208,10 +223,10 @@ public class GDesktop extends JFrame }); this.getContentPane().setLayout(flowLayout1); windowMenu.setText(MessageManager.getString("label.window")); - preferences.setText(MessageManager.getString("label.preferences") - + "..."); + preferences.setText(MessageManager.getString("label.preferences")); preferences.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { preferences_actionPerformed(e); @@ -221,6 +236,7 @@ public class GDesktop extends JFrame saveState.setText(MessageManager.getString("action.save_project")); saveState.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { saveState_actionPerformed(e); @@ -229,6 +245,7 @@ public class GDesktop extends JFrame loadState.setText(MessageManager.getString("action.load_project")); loadState.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { loadState_actionPerformed(e); @@ -236,39 +253,43 @@ public class GDesktop extends JFrame }); inputMenu.setText(MessageManager.getString("label.input_alignment")); vamsasStart.setText(MessageManager - .getString("label.new_vamsas_session") + "..."); + .getString("label.new_vamsas_session")); vamsasStart.setVisible(false); vamsasStart.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { vamsasStart_actionPerformed(e); } }); vamsasImport.setText(MessageManager - .getString("label.load_vamsas_session") + "..."); + .getString("action.load_vamsas_session")); vamsasImport.setVisible(false); vamsasImport.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { vamsasImport_actionPerformed(e); } }); vamsasSave.setText(MessageManager - .getString("label.save_vamsas_session") + "..."); + .getString("action.save_vamsas_session")); vamsasSave.setVisible(false); vamsasSave.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { vamsasSave_actionPerformed(e); } }); - inputSequence.setText(MessageManager.getString("label.fetch_sequences") - + "..."); + inputSequence.setText(MessageManager + .getString("action.fetch_sequences")); inputSequence.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { inputSequence_actionPerformed(e); @@ -279,6 +300,7 @@ public class GDesktop extends JFrame vamsasStop.setVisible(false); vamsasStop.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { vamsasStop_actionPerformed(e); @@ -287,6 +309,7 @@ public class GDesktop extends JFrame closeAll.setText(MessageManager.getString("action.close_all")); closeAll.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { closeAll_actionPerformed(e); @@ -296,6 +319,7 @@ public class GDesktop extends JFrame .getString("action.raise_associated_windows")); raiseRelated.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { raiseRelated_actionPerformed(e); @@ -305,6 +329,7 @@ public class GDesktop extends JFrame .getString("action.minimize_associated_windows")); minimizeAssociated.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { minimizeAssociated_actionPerformed(e); @@ -314,6 +339,7 @@ public class GDesktop extends JFrame .getString("label.collect_garbage")); garbageCollect.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { garbageCollect_actionPerformed(e); @@ -323,6 +349,7 @@ public class GDesktop extends JFrame .getString("label.show_memory_usage")); showMemusage.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { showMemusage_actionPerformed(e); @@ -332,6 +359,7 @@ public class GDesktop extends JFrame .setText(MessageManager.getString("label.show_java_console")); showConsole.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { showConsole_actionPerformed(e); @@ -340,6 +368,7 @@ public class GDesktop extends JFrame showNews.setText(MessageManager.getString("label.show_jalview_news")); showNews.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { showNews_actionPerformed(e); @@ -348,12 +377,13 @@ public class GDesktop extends JFrame snapShotWindow.setText(MessageManager.getString("label.take_snapshot")); snapShotWindow.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { snapShotWindow_actionPerformed(e); } }); - + desktopMenubar.add(FileMenu); desktopMenubar.add(toolsMenu); VamsasMenu.setVisible(false); @@ -394,7 +424,7 @@ public class GDesktop extends JFrame protected void snapShotWindow_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } protected void showConsole_actionPerformed(ActionEvent e) @@ -445,9 +475,10 @@ public class GDesktop extends JFrame * * @param e * DOCUMENT ME! + * @throws FileFormatException */ protected void inputURLMenuItem_actionPerformed( - jalview.gui.AlignViewport av) + jalview.gui.AlignViewport av) throws FileFormatException { } @@ -457,8 +488,7 @@ public class GDesktop extends JFrame * @param e * DOCUMENT ME! */ - protected void inputTextboxMenuItem_actionPerformed( - jalview.gui.AlignViewport av) + protected void inputTextboxMenuItem_actionPerformed(AlignmentViewPanel avp) { }