X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FEditNameDialog.java;h=e88dcae6404791a805daa1dd46d53b92de3ef2b5;hb=6485409ae3787ad80b80692463511ca0d454957c;hp=3885d6d69771e6021b33c2f1867b271a46512430;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/jalview/gui/EditNameDialog.java b/src/jalview/gui/EditNameDialog.java
index 3885d6d..e88dcae 100644
--- a/src/jalview/gui/EditNameDialog.java
+++ b/src/jalview/gui/EditNameDialog.java
@@ -1,22 +1,27 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
+import jalview.util.MessageManager;
+
import java.awt.*;
import javax.swing.*;
@@ -24,9 +29,9 @@ public class EditNameDialog
{
JTextField id, description;
- JButton ok = new JButton("Accept");
+ JButton ok = new JButton(MessageManager.getString("action.accept"));
- JButton cancel = new JButton("Cancel");
+ JButton cancel = new JButton(MessageManager.getString("action.cancel"));
boolean accept = false;
@@ -48,7 +53,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 +73,12 @@ public class EditNameDialog
panel2.add(description, BorderLayout.CENTER);
panel.add(panel2, BorderLayout.SOUTH);
}
-
- int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,
- panel, title, JOptionPane.OK_CANCEL_OPTION);
-
+ 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;