From 15a31f818e6ee79cb23ac4acd09575ab36cdb2ae Mon Sep 17 00:00:00 2001 From: jprocter Date: Fri, 4 Jun 2010 15:40:19 +0000 Subject: [PATCH] focus is explicitly handed back to caller (JAL-566) --- src/jalview/gui/EditNameDialog.java | 10 ++++++---- src/jalview/gui/PopupMenu.java | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) 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; diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java index a98c1da..92e24bf 100755 --- a/src/jalview/gui/PopupMenu.java +++ b/src/jalview/gui/PopupMenu.java @@ -1440,7 +1440,7 @@ public class PopupMenu extends JPopupMenu SequenceGroup sg = getGroup(); EditNameDialog dialog = new EditNameDialog(sg.getName(), sg .getDescription(), " Group Name ", "Group Description ", - "Edit Group Name/Description"); + "Edit Group Name/Description",ap.alignFrame); if (!dialog.accept) { @@ -1479,7 +1479,7 @@ public class PopupMenu extends JPopupMenu { EditNameDialog dialog = new EditNameDialog(sequence.getName(), sequence .getDescription(), " Sequence Name ", - "Sequence Description ", "Edit Sequence Name/Description"); + "Sequence Description ", "Edit Sequence Name/Description",ap.alignFrame); if (!dialog.accept) { @@ -1870,7 +1870,7 @@ public class PopupMenu extends JPopupMenu EditNameDialog dialog = new EditNameDialog(sequence .getSequenceAsString(sg.getStartRes(), sg.getEndRes() + 1), - null, "Edit Sequence ", null, "Edit Sequence"); + null, "Edit Sequence ", null, "Edit Sequence",ap.alignFrame); if (dialog.accept) { -- 1.7.10.2