After merge

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 4186090..3acefe7 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -43,6 +43,10 @@ public class Desktop extends jalview.jbgui.GDesktop
     static final int xOffset = 30;
     static final int yOffset = 30;
     public static jalview.ws.Discoverer discoverer;
+
+    public static Object [] jalviewClipboard;
+
+
     /**
      * Creates a new Desktop object.
      */
@@ -50,6 +54,7 @@ public class Desktop extends jalview.jbgui.GDesktop
     {
         Image image = null;
 
+
         try
         {
             java.net.URL url = getClass().getResource("/images/logo.gif");
@@ -68,7 +73,7 @@ public class Desktop extends jalview.jbgui.GDesktop
         {
         }
 
-        setTitle("Jalview 2005");
+        setTitle("Jalview "+jalview.bin.Cache.getProperty("VERSION"));
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         desktop = new JDesktopPane();
         desktop.setBackground(Color.white);
@@ -221,6 +226,7 @@ public class Desktop extends jalview.jbgui.GDesktop
         {}
     }
 
+
     /**
      * DOCUMENT ME!
      *
@@ -434,7 +440,7 @@ public class Desktop extends jalview.jbgui.GDesktop
      */
     public void aboutMenuItem_actionPerformed(ActionEvent e)
     {
-      StringBuffer message = new StringBuffer("JalView 2005 version " +
+      StringBuffer message = new StringBuffer("JalView version " +
                                               jalview.bin.Cache.getProperty(
           "VERSION") +
                                               "; last updated: " +
@@ -544,5 +550,31 @@ public class Desktop extends jalview.jbgui.GDesktop
         }
     }
 
+  /*  public void vamsasLoad_actionPerformed(ActionEvent e)
+    {
+      JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
+          getProperty("LAST_DIRECTORY"));
+
+      chooser.setFileView(new JalviewFileView());
+      chooser.setDialogTitle("Load Vamsas file");
+      chooser.setToolTipText("Import");
+
+      int value = chooser.showOpenDialog(this);
+
+      if (value == JalviewFileChooser.APPROVE_OPTION)
+      {
+        jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(null);
+        vs.load(
+            chooser.getSelectedFile().getAbsolutePath()
+            );
+      }
+
+    }*/
+
+
+    public void inputSequence_actionPerformed(ActionEvent e)
+    {
+      SequenceFetcher sf = new SequenceFetcher(null);
+    }
 }