X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FEditNameDialog.java;h=22a318213e1a495c3944d0e78cec0895769bda3d;hb=15a31f818e6ee79cb23ac4acd09575ab36cdb2ae;hp=3885d6d69771e6021b33c2f1867b271a46512430;hpb=ad481f48061e9e21dc8db387c09a686f8700e626;p=jalview.git

diff --git a/src/jalview/gui/EditNameDialog.java b/src/jalview/gui/EditNameDialog.java
index 3885d6d..22a3182 100644
--- a/src/jalview/gui/EditNameDialog.java
+++ b/src/jalview/gui/EditNameDialog.java
@@ -48,7 +48,7 @@ public class EditNameDialog
   }
 
   public EditNameDialog(String name, String desc, String label1,
-          String label2, String title)
+          String label2, String title, JComponent parent)
   {
     JLabel idlabel = new JLabel(label1);
     JLabel desclabel = new JLabel(label2);
@@ -68,10 +68,12 @@ public class EditNameDialog
       panel2.add(description, BorderLayout.CENTER);
       panel.add(panel2, BorderLayout.SOUTH);
     }
-
-    int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,
+    int reply = JOptionPane.showInternalConfirmDialog(parent,
             panel, title, JOptionPane.OK_CANCEL_OPTION);
-
+    if (!parent.requestFocusInWindow())
+    {
+      System.err.println("Bad focus for dialog!");
+    }
     if (reply == JOptionPane.OK_OPTION)
     {
       accept = true;