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-2349 store/restore mappable contact matrix in project and fix up interactive...
[jalview.git]
/
src
/
jalview
/
gui
/
EditNameDialog.java
diff --git
a/src/jalview/gui/EditNameDialog.java
b/src/jalview/gui/EditNameDialog.java
index
e150b89
..
ff0fe3a
100644
(file)
--- a/
src/jalview/gui/EditNameDialog.java
+++ b/
src/jalview/gui/EditNameDialog.java
@@
-20,11
+20,9
@@
*/
package jalview.gui;
*/
package jalview.gui;
-import jalview.util.MessageManager;
-import jalview.util.dialogrunner.RunResponse;
-
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.FlowLayout;
import java.awt.Font;
+import java.util.concurrent.Callable;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.BoxLayout;
import javax.swing.JButton;
@@
-33,6
+31,8
@@
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.JPanel;
import javax.swing.JTextField;
+import jalview.util.MessageManager;
+
/**
* A dialog where a name and description may be edited
*/
/**
* A dialog where a name and description may be edited
*/
@@
-40,6
+40,7
@@
public class EditNameDialog
{
private static final Font COURIER_12 = new Font("Courier", Font.PLAIN,
12);
{
private static final Font COURIER_12 = new Font("Courier", Font.PLAIN,
12);
+
JTextField id;
JTextField description;
JTextField id;
JTextField description;
@@
-107,18
+108,15
@@
public class EditNameDialog
}
/**
}
/**
- * Shows the dialog, and runs the response action if OK is selected. Note the
- * RunResponse should be constructed to act on dialog return value
- * JvOptionPane.OK_OPTION.
+ * Shows the dialog, and runs the response action if OK is selected
*
* @param action
*/
*
* @param action
*/
- public void showDialog(JComponent parent, String title,
- RunResponse action)
+ public void showDialog(JComponent parent, String title, Callable action)
{
Object[] options = new Object[] { MessageManager.getString("action.ok"),
MessageManager.getString("action.cancel") };
{
Object[] options = new Object[] { MessageManager.getString("action.ok"),
MessageManager.getString("action.cancel") };
- JvOptionPane.newOptionDialog(parent).response(action)
+ JvOptionPane.newOptionDialog(parent).setResponseHandler(0, action)
.showInternalDialog(panel, title,
JvOptionPane.YES_NO_CANCEL_OPTION,
JvOptionPane.PLAIN_MESSAGE, null, options,
.showInternalDialog(panel, title,
JvOptionPane.YES_NO_CANCEL_OPTION,
JvOptionPane.PLAIN_MESSAGE, null, options,