git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-634
[jalview.git]
/
src
/
jalview
/
gui
/
EditNameDialog.java
diff --git
a/src/jalview/gui/EditNameDialog.java
b/src/jalview/gui/EditNameDialog.java
index
3885d6d
..
22a3182
100644
(file)
--- 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,
}
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);
{
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);
}
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);
panel, title, JOptionPane.OK_CANCEL_OPTION);
-
+ if (!parent.requestFocusInWindow())
+ {
+ System.err.println("Bad focus for dialog!");
+ }
if (reply == JOptionPane.OK_OPTION)
{
accept = true;
if (reply == JOptionPane.OK_OPTION)
{
accept = true;