X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FEditNameDialog.java;h=46325d932ba453ad750b272ca9e0d174a33abe57;hb=f7a97ef025c498c19fdcc37d9fc0506d511d18dd;hp=b80aca7d2a908ac9e04ba2a29dfeb6a1288448d9;hpb=6f707193c7997803f7e7ae9d17359e6e32b4a7e4;p=jalview.git

diff --git a/src/jalview/appletgui/EditNameDialog.java b/src/jalview/appletgui/EditNameDialog.java
index b80aca7..46325d9 100644
--- a/src/jalview/appletgui/EditNameDialog.java
+++ b/src/jalview/appletgui/EditNameDialog.java
@@ -20,14 +20,11 @@
 package jalview.appletgui;
 
 import java.awt.*;
-import java.awt.event.*;
 
-public class EditNameDialog extends Dialog implements ActionListener
+
+public class EditNameDialog extends JVDialog
 {
   TextField id, description;
-  Button ok = new Button("Accept");
-  Button cancel = new Button("Cancel");
-  boolean accept = false;
 
   public String getName()
   {
@@ -37,57 +34,51 @@ public class EditNameDialog extends Dialog implements ActionListener
   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)
+                        Frame owner,
+                        String title,
+                        int width, int height, boolean display)
   {
-    super(ap.alignFrame, title, true);
+    super(owner, title, true, width, height);
 
-    id = new TextField(name, 40);
-    description = new TextField(desc, 40);
+    Font mono = new Font("Monospaced", Font.PLAIN, 12);
     Panel panel = new Panel(new BorderLayout());
     Panel panel2 = new Panel(new BorderLayout());
-    panel2.add(new Label(label1), BorderLayout.WEST);
-    panel2.add(id, BorderLayout.CENTER);
-    panel.add(panel2, BorderLayout.NORTH);
-    panel2 = new Panel(new BorderLayout());
-    panel2.add(new Label(label2), 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);
-
-    setBounds(ap.alignFrame.getBounds().x
-              + (ap.alignFrame.getSize().width - 500) / 2,
-              ap.alignFrame.getBounds().y
-              + (ap.alignFrame.getSize().height - 120) / 2,
-              500, 130);
+    id = new TextField(name, 40);
+    id.setFont(mono);
+    Label label = new Label(label1);
+    label.setFont(mono);
 
-    show();
-  }
+    panel2.add(label, BorderLayout.WEST);
+    panel2.add(id, BorderLayout.CENTER);
+    panel.add(panel2, BorderLayout.NORTH);
 
-  public void actionPerformed(ActionEvent evt)
-  {
-    if(evt.getSource()==ok)
-      accept = true;
 
-    setVisible(false);
+    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);
   }
 }