X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FEditNameDialog.java;h=3d1a519ff8010553824c53b8860e50b836ff3539;hb=153dd62dc91da13ae732600e6ea55ddbe15eab39;hp=3885d6d69771e6021b33c2f1867b271a46512430;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git

diff --git a/src/jalview/gui/EditNameDialog.java b/src/jalview/gui/EditNameDialog.java
index 3885d6d..3d1a519 100644
--- a/src/jalview/gui/EditNameDialog.java
+++ b/src/jalview/gui/EditNameDialog.java
@@ -1,5 +1,5 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
  * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
@@ -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;