Request focus for new frames

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

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index a705386..4186090 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -115,9 +115,11 @@ public class Desktop extends jalview.jbgui.GDesktop
         frame.setLayer(JLayeredPane.PALETTE_LAYER);
         frame.setLocation((int) ((getWidth() - 750) / 2),
             (int) ((getHeight() - 160) / 2));
+
         addInternalFrame(frame, "", 750, 160, false);
 
         discoverer=new jalview.ws.Discoverer(); // Only gets started if gui is displayed.
+
     }
 
     /**
@@ -128,7 +130,7 @@ public class Desktop extends jalview.jbgui.GDesktop
      * @param w DOCUMENT ME!
      * @param h DOCUMENT ME!
      */
-    public static void addInternalFrame(final JInternalFrame frame,
+    public static synchronized void addInternalFrame(final JInternalFrame frame,
         String title, int w, int h)
     {
         addInternalFrame(frame, title, w, h, true);
@@ -143,7 +145,7 @@ public class Desktop extends jalview.jbgui.GDesktop
      * @param h DOCUMENT ME!
      * @param resizable DOCUMENT ME!
      */
-    public static void addInternalFrame(final JInternalFrame frame,
+    public static synchronized void addInternalFrame(final JInternalFrame frame,
         String title, int w, int h, boolean resizable)
     {
 
@@ -163,17 +165,9 @@ public class Desktop extends jalview.jbgui.GDesktop
       }
 
 
-        desktop.add(frame);
         openFrameCount++;
 
-        try
-        {
-            frame.setSelected(true);
-        }
-        catch (java.beans.PropertyVetoException e)
-        {
-        }
-
+        frame.setVisible(true);
         frame.setClosable(true);
         frame.setResizable(resizable);
         frame.setMaximizable(resizable);
@@ -182,10 +176,9 @@ public class Desktop extends jalview.jbgui.GDesktop
 
         if (frame.getX()<1 && frame.getY()<1)
        {
-         frame.setLocation(xOffset * openFrameCount, yOffset * (openFrameCount%10)+yOffset);
+         frame.setLocation(xOffset * openFrameCount, yOffset * ((openFrameCount-1)%10)+yOffset);
        }
 
-        frame.toFront();
         final JMenuItem menuItem = new JMenuItem(title);
         frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
             {
@@ -194,6 +187,9 @@ public class Desktop extends jalview.jbgui.GDesktop
                 {
                     openFrameCount--;
                     windowMenu.remove(menuItem);
+                    JInternalFrame itf = desktop.getSelectedFrame();
+                       if (itf != null)
+                        itf.requestFocus();
                 }
                 ;
             });
@@ -209,14 +205,20 @@ public class Desktop extends jalview.jbgui.GDesktop
                     }
                     catch (java.beans.PropertyVetoException ex)
                     {
-                    }
 
-                    ;
+                    }
                 }
             });
 
-        frame.setVisible(true);
         windowMenu.add(menuItem);
+
+        desktop.add(frame);
+        frame.toFront();
+        try{
+          frame.setSelected(true);
+          frame.requestFocus();
+        }catch(java.beans.PropertyVetoException ve)
+        {}
     }
 
     /**
@@ -366,17 +368,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);
@@ -474,8 +477,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);
         }