X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FEditNameDialog.java;h=ecc78b0600819b6c776888cd456d00722baf20fb;hb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;hp=2b1ee726c004345cd2451aaa3ba059e2b1deeb88;hpb=6f707193c7997803f7e7ae9d17359e6e32b4a7e4;p=jalview.git

diff --git a/src/jalview/gui/EditNameDialog.java b/src/jalview/gui/EditNameDialog.java
index 2b1ee72..ecc78b0 100644
--- a/src/jalview/gui/EditNameDialog.java
+++ b/src/jalview/gui/EditNameDialog.java
@@ -1,78 +1,82 @@
-/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program 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 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-package jalview.gui;
-
-import java.awt.*;
-import javax.swing.*;
-
-public class EditNameDialog
-{
-  JTextField id, description;
-  JButton ok = new JButton("Accept");
-  JButton cancel = new JButton("Cancel");
-  boolean accept = false;
-
-
-  public String getName()
-  {
-    return id.getText();
-  }
-
-  public String getDescription()
-  {
-    if (description.getText().length() < 1)
-      return null;
-    else
-      return description.getText();
-  }
-
-  public EditNameDialog(String name,
-                        String desc,
-                        String label1,
-                        String label2,
-                        String title)
-  {
-    JLabel idlabel = new JLabel( label1);
-    JLabel desclabel = new JLabel(label2);
-    idlabel.setFont(new Font("Courier", Font.PLAIN, 12));
-    desclabel.setFont(new Font("Courier", Font.PLAIN, 12));
-    id = new JTextField(name, 40);
-    description = new JTextField(desc, 40);
-    JPanel panel = new JPanel(new BorderLayout());
-    JPanel panel2 = new JPanel(new BorderLayout());
-    panel2.add(idlabel, BorderLayout.WEST);
-    panel2.add(id, BorderLayout.CENTER);
-    panel.add(panel2, BorderLayout.NORTH);
-    panel2 = new JPanel(new BorderLayout());
-    panel2.add(desclabel, BorderLayout.WEST);
-    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)
-     {
-       accept = true;
-     }
-  }
-}
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * 
+ * 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.
+ * 
+ * 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/>.
+ */
+package jalview.gui;
+
+import java.awt.*;
+import javax.swing.*;
+
+public class EditNameDialog
+{
+  JTextField id, description;
+
+  JButton ok = new JButton("Accept");
+
+  JButton cancel = new JButton("Cancel");
+
+  boolean accept = false;
+
+  public String getName()
+  {
+    return id.getText();
+  }
+
+  public String getDescription()
+  {
+    if (description.getText().length() < 1)
+    {
+      return null;
+    }
+    else
+    {
+      return description.getText();
+    }
+  }
+
+  public EditNameDialog(String name, String desc, String label1,
+          String label2, String title, JComponent parent)
+  {
+    JLabel idlabel = new JLabel(label1);
+    JLabel desclabel = new JLabel(label2);
+    idlabel.setFont(new Font("Courier", Font.PLAIN, 12));
+    desclabel.setFont(new Font("Courier", Font.PLAIN, 12));
+    id = new JTextField(name, 40);
+    description = new JTextField(desc, 40);
+    JPanel panel = new JPanel(new BorderLayout());
+    JPanel panel2 = new JPanel(new BorderLayout());
+    panel2.add(idlabel, BorderLayout.WEST);
+    panel2.add(id, BorderLayout.CENTER);
+    panel.add(panel2, BorderLayout.NORTH);
+    if (desc != null || label2 != null)
+    {
+      panel2 = new JPanel(new BorderLayout());
+      panel2.add(desclabel, BorderLayout.WEST);
+      panel2.add(description, BorderLayout.CENTER);
+      panel.add(panel2, BorderLayout.SOUTH);
+    }
+    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;
+    }
+  }
+}