After merge

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

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 9ebbf5b..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);
@@ -119,6 +124,7 @@ public class Desktop extends jalview.jbgui.GDesktop
         addInternalFrame(frame, "", 750, 160, false);
 
         discoverer=new jalview.ws.Discoverer(); // Only gets started if gui is displayed.
+
     }
 
     /**
@@ -178,18 +184,6 @@ public class Desktop extends jalview.jbgui.GDesktop
          frame.setLocation(xOffset * openFrameCount, yOffset * ((openFrameCount-1)%10)+yOffset);
        }
 
-       desktop.add(frame);
-       try
-       {
-         frame.setSelected(true);
-         frame.toFront();
-       }
-       catch (Exception e)
-       {
-         System.out.println("got it " + e);
-       }
-
-
         final JMenuItem menuItem = new JMenuItem(title);
         frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
             {
@@ -198,6 +192,9 @@ public class Desktop extends jalview.jbgui.GDesktop
                 {
                     openFrameCount--;
                     windowMenu.remove(menuItem);
+                    JInternalFrame itf = desktop.getSelectedFrame();
+                       if (itf != null)
+                        itf.requestFocus();
                 }
                 ;
             });
@@ -219,8 +216,17 @@ public class Desktop extends jalview.jbgui.GDesktop
             });
 
         windowMenu.add(menuItem);
+
+        desktop.add(frame);
+        frame.toFront();
+        try{
+          frame.setSelected(true);
+          frame.requestFocus();
+        }catch(java.beans.PropertyVetoException ve)
+        {}
     }
 
+
     /**
      * DOCUMENT ME!
      *
@@ -368,17 +374,18 @@ public class Desktop extends jalview.jbgui.GDesktop
      */
     public void inputURLMenuItem_actionPerformed(ActionEvent e)
     {
-        String url = JOptionPane.showInternalInputDialog(Desktop.desktop,
+        Object reply = JOptionPane.showInternalInputDialog(Desktop.desktop,
                 "Enter url of input file", "Input alignment from URL",
-                JOptionPane.QUESTION_MESSAGE, null, null, "http://www.")
-                                .toString();
+                JOptionPane.QUESTION_MESSAGE, null, null, "http://www.");
 
-        if (url == null)
+        if (reply == null)
         {
             return;
         }
 
-        if (url.trim().toLowerCase().endsWith(".jar"))
+        String url = reply.toString().trim();
+
+        if (url.toLowerCase().endsWith(".jar"))
         {
                jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", "Jalview");
                Jalview2XML.LoadJalviewAlign(url);
@@ -433,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: " +
@@ -476,8 +483,6 @@ public class Desktop extends jalview.jbgui.GDesktop
             javax.help.HelpSet hs = new javax.help.HelpSet(cl, url);
 
             javax.help.HelpBroker hb = hs.createHelpBroker();
-            hb.setLocation(new Point(200, 50));
-            hb.setSize(new Dimension(800, 700));
             hb.setCurrentID("home");
             hb.setDisplayed(true);
         }
@@ -545,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);
+    }
 }