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
Merge branch 'develop' into spike/javier_noseqhack
[jalview.git]
/
src
/
jalview
/
gui
/
EditNameDialog.java
diff --git
a/src/jalview/gui/EditNameDialog.java
b/src/jalview/gui/EditNameDialog.java
index
8db5bb2
..
0ec4a87
100644
(file)
--- a/
src/jalview/gui/EditNameDialog.java
+++ b/
src/jalview/gui/EditNameDialog.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-22,8
+22,15
@@
package jalview.gui;
import jalview.util.MessageManager;
import jalview.util.MessageManager;
-import java.awt.*;
-import javax.swing.*;
+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
{
public class EditNameDialog
{
@@
-73,13
+80,13
@@
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(parent, panel, title,
- JOptionPane.OK_CANCEL_OPTION);
+ int reply = JvOptionPane.showInternalConfirmDialog(parent, panel, title,
+ JvOptionPane.OK_CANCEL_OPTION);
if (!parent.requestFocusInWindow())
{
System.err.println("Bad focus for dialog!");
}
if (!parent.requestFocusInWindow())
{
System.err.println("Bad focus for dialog!");
}
- if (reply == JOptionPane.OK_OPTION)
+ if (reply == JvOptionPane.OK_OPTION)
{
accept = true;
}
{
accept = true;
}