/*
- * 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-import java.awt.*;
-import javax.swing.*;
+import jalview.util.MessageManager;
+
+import java.awt.BorderLayout;
+import java.awt.Font;
+
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
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;
}
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);
panel2.add(description, BorderLayout.CENTER);
panel.add(panel2, BorderLayout.SOUTH);
}
-
- int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,
- panel, title, JOptionPane.OK_CANCEL_OPTION);
-
- if (reply == JOptionPane.OK_OPTION)
+ int reply = JvOptionPane.showInternalConfirmDialog(parent, panel, title,
+ JvOptionPane.OK_CANCEL_OPTION);
+ if (!parent.requestFocusInWindow())
+ {
+ System.err.println("Bad focus for dialog!");
+ }
+ if (reply == JvOptionPane.OK_OPTION)
{
accept = true;
}