X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FEditNameDialog.java;h=b1cd40ee2a3a5930e34ef9527edfc7b3b28ea690;hb=506d60f0e188723ddc91c26824b41ac7034df3fe;hp=3e197f0d4f7ea5fe2bfbb048feb52dfabfc327ec;hpb=7bc226b58110fa26d9dbd3f0c78095d06909ffc3;p=jalview.git

diff --git a/src/jalview/appletgui/EditNameDialog.java b/src/jalview/appletgui/EditNameDialog.java
index 3e197f0..b1cd40e 100644
--- a/src/jalview/appletgui/EditNameDialog.java
+++ b/src/jalview/appletgui/EditNameDialog.java
@@ -1,111 +1,77 @@
-/*
- * 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.appletgui;
-
-import java.awt.*;
-import java.awt.event.*;
-
-public class EditNameDialog
-    extends Dialog implements ActionListener
-{
-  TextField id, description;
-  Button ok = new Button("Accept");
-  Button cancel = new Button("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,
-                        AlignmentPanel ap,
-                        String title)
-  {
-    super(ap.alignFrame, title, true);
-
-    id = new TextField(name, 40);
-    description = new TextField(desc, 40);
-    Panel panel = new Panel(new BorderLayout());
-    Panel panel2 = new Panel(new BorderLayout());
-    Label label = new Label(label1);
-    label.setFont(new Font("Monospaced", Font.PLAIN, 12));
-    panel2.add(label, BorderLayout.WEST);
-    panel2.add(id, BorderLayout.CENTER);
-    panel.add(panel2, BorderLayout.NORTH);
-    panel2 = new Panel(new BorderLayout());
-    label = new Label(label2);
-    label.setFont(new Font("Monospaced", Font.PLAIN, 12));
-    panel2.add(label, BorderLayout.WEST);
-    panel2.add(description, BorderLayout.CENTER);
-    panel.add(panel2, BorderLayout.CENTER);
-
-    panel2 = new Panel(new FlowLayout());
-
-    panel2.add(ok);
-    panel2.add(cancel);
-    ok.addActionListener(this);
-    cancel.addActionListener(this);
-
-    panel.add(panel2, BorderLayout.SOUTH);
-
-    add(panel, BorderLayout.NORTH);
-
-    int width = 500, height = 100;
-
-    pack();
-
-    height += getInsets().top + getInsets().bottom;
-
-    setBounds(ap.alignFrame.getBounds().x
-              + (ap.alignFrame.getSize().width - width) / 2,
-              ap.alignFrame.getBounds().y
-              + (ap.alignFrame.getSize().height - height) / 2,
-              width, height);
-
-    show();
-
-  }
-
-  public void actionPerformed(ActionEvent evt)
-  {
-    if (evt.getSource() == ok)
-    {
-      accept = true;
-    }
-
-    setVisible(false);
-  }
-}
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
+ * Copyright (C) 2008 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.appletgui;
+
+import java.awt.*;
+
+public class EditNameDialog extends JVDialog
+{
+  TextField id, description;
+
+  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, Frame owner, String title, int width, int height,
+          boolean display)
+  {
+    super(owner, title, true, width, height);
+
+    Font mono = new Font("Monospaced", Font.PLAIN, 12);
+    Panel panel = new Panel(new BorderLayout());
+    Panel panel2 = new Panel(new BorderLayout());
+
+    id = new TextField(name, 40);
+    id.setFont(mono);
+    Label label = new Label(label1);
+    label.setFont(mono);
+
+    panel2.add(label, BorderLayout.WEST);
+    panel2.add(id, BorderLayout.CENTER);
+    panel.add(panel2, BorderLayout.NORTH);
+
+    if (label2 != null)
+    {
+      panel2 = new Panel(new BorderLayout());
+      description = new TextField(desc, 40);
+      description.setFont(mono);
+      label = new Label(label2);
+      label.setFont(mono);
+      panel2.add(label, BorderLayout.WEST);
+      panel2.add(description, BorderLayout.CENTER);
+      panel.add(panel2, BorderLayout.CENTER);
+    }
+    setMainPanel(panel);
+    setVisible(display);
+  }
+}