X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=1c37e86604aa5519627512bad5fb3cb1745c3177;hb=d924d4634167f98c9fd94df6714a6589c1368da3;hp=4751d25cdb79adad4fada6c4b0da77eb7d085158;hpb=d8ddf2968124b3518e567a91411357b1d291ff77;p=jalview.git

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index 4751d25..1c37e86 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.2)
- * 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,12 +20,19 @@
  */
 package jalview.jbgui;
 
+import jalview.api.AlignmentViewPanel;
 import jalview.util.MessageManager;
 
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-import javax.swing.*;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
 
 /**
  * DOCUMENT ME!
@@ -202,8 +209,7 @@ 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()
     {
       public void actionPerformed(ActionEvent e)
@@ -230,7 +236,7 @@ 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()
     {
@@ -240,7 +246,7 @@ public class GDesktop extends JFrame
       }
     });
     vamsasImport.setText(MessageManager
-            .getString("label.load_vamsas_session") + "...");
+            .getString("action.load_vamsas_session"));
     vamsasImport.setVisible(false);
     vamsasImport.addActionListener(new ActionListener()
     {
@@ -250,7 +256,7 @@ public class GDesktop extends JFrame
       }
     });
     vamsasSave.setText(MessageManager
-            .getString("label.save_vamsas_session") + "...");
+            .getString("action.save_vamsas_session"));
     vamsasSave.setVisible(false);
     vamsasSave.addActionListener(new ActionListener()
     {
@@ -259,8 +265,8 @@ public class GDesktop extends JFrame
         vamsasSave_actionPerformed(e);
       }
     });
-    inputSequence.setText(MessageManager.getString("label.fetch_sequences")
-            + "...");
+    inputSequence.setText(MessageManager
+            .getString("action.fetch_sequences"));
     inputSequence.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -374,7 +380,7 @@ public class GDesktop extends JFrame
     toolsMenu.add(showConsole);
     toolsMenu.add(showNews);
     toolsMenu.add(garbageCollect);
-    toolsMenu.add(snapShotWindow);
+    // toolsMenu.add(snapShotWindow);
     inputMenu.add(inputLocalFileMenuItem);
     inputMenu.add(inputURLMenuItem);
     inputMenu.add(inputTextboxMenuItem);
@@ -451,8 +457,7 @@ public class GDesktop extends JFrame
    * @param e
    *          DOCUMENT ME!
    */
-  protected void inputTextboxMenuItem_actionPerformed(
-          jalview.gui.AlignViewport av)
+  protected void inputTextboxMenuItem_actionPerformed(AlignmentViewPanel avp)
   {
   }