One class for edit name/description

[jalview.git] / src / jalview / appletgui / AnnotationLabels.java

diff --git a/src/jalview/appletgui/AnnotationLabels.java b/src/jalview/appletgui/AnnotationLabels.java
index 0935500..7bf438f 100755 (executable)
--- a/src/jalview/appletgui/AnnotationLabels.java
+++ b/src/jalview/appletgui/AnnotationLabels.java
@@ -46,11 +46,6 @@ public class AnnotationLabels
 \r
   Tooltip tooltip;\r
 \r
-  Dialog editNameDialog;\r
-  Button okDialog = new Button("Accept");\r
-  Button cancelDialog = new Button("Cancel");\r
-\r
-\r
   public AnnotationLabels(AlignmentPanel ap)\r
   {\r
     this.ap = ap;\r
@@ -58,8 +53,6 @@ public class AnnotationLabels
     setLayout(null);\r
     addMouseListener(this);\r
     addMouseMotionListener(this);\r
-    okDialog.addActionListener(this);\r
-    cancelDialog.addActionListener(this);\r
   }\r
 \r
   public AnnotationLabels(AlignViewport av)\r
@@ -105,57 +98,25 @@ public class AnnotationLabels
 \r
     if(evt.getActionCommand().equals(EDITNAME))\r
     {\r
-      TextField id = new TextField(aa[selectedRow].label, 40);\r
-      TextField description = new TextField(aa[selectedRow].description, 40);\r
-      Panel panel = new Panel(new BorderLayout());\r
-      Panel panel2 = new Panel(new BorderLayout());\r
-      panel2.add(new Label("       Annotation Label "), BorderLayout.WEST);\r
-      panel2.add(id, BorderLayout.CENTER);\r
-      panel.add(panel2, BorderLayout.NORTH);\r
-      panel2 = new Panel(new BorderLayout());\r
-      panel2.add(new Label("Annotation Description "), BorderLayout.WEST);\r
-      panel2.add(description, BorderLayout.CENTER);\r
-      panel.add(panel2, BorderLayout.CENTER);\r
-\r
-      panel2 = new Panel(new FlowLayout());\r
-\r
-      panel2.add(okDialog);\r
-      panel2.add(cancelDialog);\r
-\r
-      panel.add(panel2, BorderLayout.SOUTH);\r
-\r
-      editNameDialog = new Dialog(ap.alignFrame,\r
-        "Edit Annotation Name / Description",\r
-        true);\r
-\r
-      editNameDialog.add(panel, BorderLayout.NORTH);\r
-\r
-      editNameDialog.setBounds(ap.alignFrame.getBounds().x\r
-                               +(ap.alignFrame.getSize().width-500)/2 ,\r
-                               ap.alignFrame.getBounds().y\r
-                               +(ap.alignFrame.getSize().height-120)/2,\r
-                               500, 130);\r
-\r
-      editNameDialog.show();\r
-\r
-      if (editNameDialog != null)\r
+      EditNameDialog dialog = new EditNameDialog(\r
+          aa[selectedRow].label,\r
+          aa[selectedRow].description,\r
+          "       Annotation Label",\r
+          "Annotation Description",\r
+          ap,\r
+          "Edit Annotation Name / Description");\r
+\r
+      if (dialog.accept)\r
       {\r
-        aa[selectedRow].label=id.getText();\r
-        aa[selectedRow].description=description.getText();\r
+        aa[selectedRow].label = dialog.getName();\r
+        aa[selectedRow].description = dialog.getDescription();\r
         repaint();\r
       }\r
-\r
     }\r
     if (evt.getActionCommand().equals(HIDE))\r
     {\r
       aa[selectedRow].visible = false;\r
     }\r
-    else if (evt.getSource() == okDialog || evt.getSource() == cancelDialog)\r
-    {\r
-      editNameDialog.setVisible(false);\r
-      if (evt.getSource() == cancelDialog)\r
-        editNameDialog = null;\r
-    }\r
     else if (evt.getActionCommand().equals(SHOWALL))\r
     {\r
       for (int i = 0; i < aa.length; i++)\r
@@ -200,9 +161,6 @@ public class AnnotationLabels
       else\r
         tooltip.setTip(ap.av.alignment.\r
                      getAlignmentAnnotation()[selectedRow].description);\r
-\r
-      tooltip.repaint();\r
-\r
     }\r
     else if (tooltip != null)\r
     {\r