X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FPopupMenu.java;h=9ee8e2b9dc5d79f717e2efa98166140d7d490ed9;hb=6f707193c7997803f7e7ae9d17359e6e32b4a7e4;hp=9ed81abb1cb5984c3603944798777a07342f4f66;hpb=6263e2935dd8d4de10fad51fa39ebfa7be024761;p=jalview.git

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 9ed81ab..9ee8e2b 100755
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -372,7 +372,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    groupName_actionPerformed(e);
+                    groupName_actionPerformed();
                 }
             });
         sequenceMenu.setText("Sequence");
@@ -381,7 +381,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    sequenceName_actionPerformed(e);
+                    sequenceName_actionPerformed();
                 }
             });
         PIDColour.setFocusPainted(false);
@@ -390,7 +390,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    unGroupMenuItem_actionPerformed(e);
+                    unGroupMenuItem_actionPerformed();
                 }
             });
 
@@ -399,7 +399,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    outline_actionPerformed(e);
+                    outline_actionPerformed();
                 }
             });
         nucleotideMenuItem.setText("Nucleotide");
@@ -407,7 +407,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    nucleotideMenuItem_actionPerformed(e);
+                    nucleotideMenuItem_actionPerformed();
                 }
             });
         colourMenu.setText("Group Colour");
@@ -417,7 +417,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    showBoxes_actionPerformed(e);
+                    showBoxes_actionPerformed();
                 }
             });
         showText.setText("Text");
@@ -426,7 +426,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    showText_actionPerformed(e);
+                    showText_actionPerformed();
                 }
             });
         showColourText.setText("Colour Text");
@@ -434,7 +434,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    showColourText_actionPerformed(e);
+                    showColourText_actionPerformed();
                 }
             });
     editMenu.setText("Edit");
@@ -443,7 +443,7 @@ public class PopupMenu extends JPopupMenu
     {
       public void actionPerformed(ActionEvent e)
       {
-        cut_actionPerformed(e);
+        cut_actionPerformed();
       }
     });
     upperCase.setText("To Upper Case");
@@ -459,7 +459,7 @@ public class PopupMenu extends JPopupMenu
     {
       public void actionPerformed(ActionEvent e)
       {
-        copy_actionPerformed(e);
+        copy_actionPerformed();
       }
     });
     lowerCase.setText("To Lower Case");
@@ -484,7 +484,7 @@ public class PopupMenu extends JPopupMenu
     {
       public void actionPerformed(ActionEvent e)
       {
-        pdbFromFile_actionPerformed(e);
+        pdbFromFile_actionPerformed();
       }
     });
     enterPDB.setText("Enter PDB Id");
@@ -492,7 +492,7 @@ public class PopupMenu extends JPopupMenu
     {
       public void actionPerformed(ActionEvent e)
       {
-        enterPDB_actionPerformed(e);
+        enterPDB_actionPerformed();
       }
     });
     discoverPDB.setText("Discover PDB ids");
@@ -500,7 +500,7 @@ public class PopupMenu extends JPopupMenu
     {
       public void actionPerformed(ActionEvent e)
       {
-        discoverPDB_actionPerformed(e);
+        discoverPDB_actionPerformed();
       }
     });
     outputMenu.setText("Output to Textbox...");
@@ -509,7 +509,7 @@ public class PopupMenu extends JPopupMenu
     {
       public void actionPerformed(ActionEvent e)
       {
-        sequenceFeature_actionPerformed(e);
+        sequenceFeature_actionPerformed();
       }
     });
     textColour.setText("Text Colour");
@@ -517,7 +517,7 @@ public class PopupMenu extends JPopupMenu
     {
       public void actionPerformed(ActionEvent e)
       {
-        textColour_actionPerformed(e);
+        textColour_actionPerformed();
       }
     });
     jMenu1.setText("Group");
@@ -589,7 +589,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    noColourmenuItem_actionPerformed(e);
+                    noColourmenuItem_actionPerformed();
                 }
             });
 
@@ -598,7 +598,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    clustalColour_actionPerformed(e);
+                    clustalColour_actionPerformed();
                 }
             });
         zappoColour.setText("Zappo");
@@ -606,7 +606,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    zappoColour_actionPerformed(e);
+                    zappoColour_actionPerformed();
                 }
             });
         taylorColour.setText("Taylor");
@@ -614,7 +614,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    taylorColour_actionPerformed(e);
+                    taylorColour_actionPerformed();
                 }
             });
         hydrophobicityColour.setText("Hydrophobicity");
@@ -622,7 +622,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    hydrophobicityColour_actionPerformed(e);
+                    hydrophobicityColour_actionPerformed();
                 }
             });
         helixColour.setText("Helix propensity");
@@ -630,7 +630,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    helixColour_actionPerformed(e);
+                    helixColour_actionPerformed();
                 }
             });
         strandColour.setText("Strand propensity");
@@ -638,7 +638,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    strandColour_actionPerformed(e);
+                    strandColour_actionPerformed();
                 }
             });
         turnColour.setText("Turn propensity");
@@ -646,7 +646,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    turnColour_actionPerformed(e);
+                    turnColour_actionPerformed();
                 }
             });
         buriedColour.setText("Buried Index");
@@ -654,7 +654,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    buriedColour_actionPerformed(e);
+                    buriedColour_actionPerformed();
                 }
             });
         abovePIDColour.setText("Above % Identity");
@@ -662,7 +662,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    abovePIDColour_actionPerformed(e);
+                    abovePIDColour_actionPerformed();
                 }
             });
         userDefinedColour.setText("User Defined...");
@@ -678,7 +678,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    PIDColour_actionPerformed(e);
+                    PIDColour_actionPerformed();
                 }
             });
         BLOSUM62Colour.setText("BLOSUM62");
@@ -686,7 +686,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    BLOSUM62Colour_actionPerformed(e);
+                    BLOSUM62Colour_actionPerformed();
                 }
             });
         conservationMenuItem.setText("Conservation");
@@ -694,7 +694,7 @@ public class PopupMenu extends JPopupMenu
             {
                 public void actionPerformed(ActionEvent e)
                 {
-                    conservationMenuItem_actionPerformed(e);
+                    conservationMenuItem_actionPerformed();
                 }
             });
     }
@@ -715,7 +715,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void clustalColour_actionPerformed(ActionEvent e)
+    protected void clustalColour_actionPerformed()
     {
         SequenceGroup sg = getGroup();
         sg.cs = new ClustalxColourScheme(sg.getSequences(ap.av.hiddenRepSequences),
@@ -728,7 +728,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void zappoColour_actionPerformed(ActionEvent e)
+    protected void zappoColour_actionPerformed()
     {
         getGroup().cs = new ZappoColourScheme();
         refresh();
@@ -739,7 +739,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void taylorColour_actionPerformed(ActionEvent e)
+    protected void taylorColour_actionPerformed()
     {
         getGroup().cs = new TaylorColourScheme();
         refresh();
@@ -750,7 +750,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void hydrophobicityColour_actionPerformed(ActionEvent e)
+    protected void hydrophobicityColour_actionPerformed()
     {
         getGroup().cs = new HydrophobicColourScheme();
         refresh();
@@ -761,7 +761,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void helixColour_actionPerformed(ActionEvent e)
+    protected void helixColour_actionPerformed()
     {
         getGroup().cs = new HelixColourScheme();
         refresh();
@@ -772,7 +772,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void strandColour_actionPerformed(ActionEvent e)
+    protected void strandColour_actionPerformed()
     {
         getGroup().cs = new StrandColourScheme();
         refresh();
@@ -783,7 +783,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void turnColour_actionPerformed(ActionEvent e)
+    protected void turnColour_actionPerformed()
     {
         getGroup().cs = new TurnColourScheme();
         refresh();
@@ -794,7 +794,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void buriedColour_actionPerformed(ActionEvent e)
+    protected void buriedColour_actionPerformed()
     {
         getGroup().cs = new BuriedColourScheme();
         refresh();
@@ -805,7 +805,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    public void nucleotideMenuItem_actionPerformed(ActionEvent e)
+    public void nucleotideMenuItem_actionPerformed()
     {
         getGroup().cs = new NucleotideColourScheme();
         refresh();
@@ -816,7 +816,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void abovePIDColour_actionPerformed(ActionEvent e)
+    protected void abovePIDColour_actionPerformed()
     {
         SequenceGroup sg = getGroup();
         if(sg.cs==null)
@@ -868,7 +868,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void PIDColour_actionPerformed(ActionEvent e)
+    protected void PIDColour_actionPerformed()
     {
         SequenceGroup sg = getGroup();
         sg.cs = new PIDColourScheme();
@@ -883,7 +883,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void BLOSUM62Colour_actionPerformed(ActionEvent e)
+    protected void BLOSUM62Colour_actionPerformed()
     {
         SequenceGroup sg = getGroup();
 
@@ -901,7 +901,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void noColourmenuItem_actionPerformed(ActionEvent e)
+    protected void noColourmenuItem_actionPerformed()
     {
         getGroup().cs = null;
         refresh();
@@ -912,7 +912,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void conservationMenuItem_actionPerformed(ActionEvent e)
+    protected void conservationMenuItem_actionPerformed()
     {
         SequenceGroup sg = getGroup();
         if(sg.cs==null)
@@ -947,20 +947,23 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void groupName_actionPerformed(ActionEvent e)
+    protected void groupName_actionPerformed()
     {
-        SequenceGroup sg = getGroup();
-        String reply = JOptionPane.showInternalInputDialog(Desktop.desktop,
-                "Enter new group name", "Edit group name",
-                JOptionPane.QUESTION_MESSAGE);
 
-        if (reply == null)
-        {
-            return;
-        }
+      SequenceGroup sg = getGroup();
+      EditNameDialog dialog = new EditNameDialog(sg.getName(),
+                                                 sg.getDescription(),
+                                                 "       Group Name ",
+                                                 "Group Description ",
+                                                 "Edit Group Name/Description");
+
+      if (!dialog.accept)
+      {
+        return;
+      }
 
-        sg.setName(reply);
-        groupName.setText(reply);
+      sg.setName(dialog.getName());
+      groupName.setText(dialog.getDescription());
     }
 
 
@@ -984,40 +987,22 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    void sequenceName_actionPerformed(ActionEvent e)
+    void sequenceName_actionPerformed()
     {
-      JLabel idlabel = new JLabel(  "       Sequence Name ");
-      JLabel desclabel = new JLabel("Sequence Description ");
-      idlabel.setFont(new Font("Courier", Font.PLAIN, 12));
-      desclabel.setFont(new Font("Courier", Font.PLAIN, 12));
-      JTextField id = new JTextField(sequence.getName(), 40);
-      JTextField description = new JTextField(sequence.getDescription(), 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, "Edit Sequence Name/Description",
-          JOptionPane.OK_CANCEL_OPTION );
-
-
-        if (reply != JOptionPane.OK_OPTION )
+      EditNameDialog dialog = new EditNameDialog(sequence.getName(),
+                                                 sequence.getDescription(),
+                                                 "       Sequence Name ",
+                                                 "Sequence Description ",
+                                                 "Edit Sequence Name/Description");
+
+        if (!dialog.accept)
         {
             return;
         }
 
-        String s = id.getText();
-
-        if (s != null)
+        if (dialog.getName() != null)
         {
-            if (s.indexOf(" ") > -1)
+            if (dialog.getName().indexOf(" ") > -1)
             {
                 JOptionPane.showMessageDialog(ap,
                     "Spaces have been converted to \"_\"",
@@ -1025,12 +1010,11 @@ public class PopupMenu extends JPopupMenu
                     JOptionPane.WARNING_MESSAGE);
             }
 
-            s = s.replace(' ', '_');
-            sequence.setName(s);
+            sequence.setName(dialog.getName().replace(' ', '_'));
             ap.repaint();
         }
 
-        sequence.setDescription(description.getText());
+        sequence.setDescription(dialog.getDescription());
 
         ap.av.firePropertyChange("alignment", null,
                                   ap.av.getAlignment().getSequences());
@@ -1042,7 +1026,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    void unGroupMenuItem_actionPerformed(ActionEvent e)
+    void unGroupMenuItem_actionPerformed()
     {
         SequenceGroup sg = ap.av.getSelectionGroup();
         ap.av.alignment.deleteGroup(sg);
@@ -1056,7 +1040,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    protected void outline_actionPerformed(ActionEvent e)
+    protected void outline_actionPerformed()
     {
         SequenceGroup sg = getGroup();
         Color col = JColorChooser.showDialog(this, "Select Outline Colour",
@@ -1075,7 +1059,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    public void showBoxes_actionPerformed(ActionEvent e)
+    public void showBoxes_actionPerformed()
     {
         getGroup().setDisplayBoxes(showBoxes.isSelected());
         refresh();
@@ -1086,7 +1070,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    public void showText_actionPerformed(ActionEvent e)
+    public void showText_actionPerformed()
     {
         getGroup().setDisplayText(showText.isSelected());
         refresh();
@@ -1097,7 +1081,7 @@ public class PopupMenu extends JPopupMenu
      *
      * @param e DOCUMENT ME!
      */
-    public void showColourText_actionPerformed(ActionEvent e)
+    public void showColourText_actionPerformed()
     {
         getGroup().setColourText(showColourText.isSelected());
         refresh();
@@ -1153,12 +1137,12 @@ public class PopupMenu extends JPopupMenu
       ap.av.hideSequence(hseqs);
     }
 
-  public void copy_actionPerformed(ActionEvent e)
+  public void copy_actionPerformed()
   {
     ap.alignFrame.copy_actionPerformed(null);
   }
 
-  public void cut_actionPerformed(ActionEvent e)
+  public void cut_actionPerformed()
   {
     ap.alignFrame.cut_actionPerformed(null);
   }
@@ -1261,7 +1245,7 @@ public class PopupMenu extends JPopupMenu
   }
 
 
-  public void pdbFromFile_actionPerformed(ActionEvent e)
+  public void pdbFromFile_actionPerformed()
   {
      jalview.io.JalviewFileChooser chooser
          = new jalview.io.JalviewFileChooser(jalview.bin.Cache.
@@ -1309,7 +1293,7 @@ public class PopupMenu extends JPopupMenu
 
   }
 
-  public void enterPDB_actionPerformed(ActionEvent e)
+  public void enterPDB_actionPerformed()
   {
     String id = JOptionPane.showInternalInputDialog(Desktop.desktop,
         "Enter PDB Id", "Enter PDB Id", JOptionPane.QUESTION_MESSAGE);
@@ -1323,13 +1307,13 @@ public class PopupMenu extends JPopupMenu
     }
   }
 
-  public void discoverPDB_actionPerformed(ActionEvent e)
+  public void discoverPDB_actionPerformed()
   {
     new jalview.io.DBRefFetcher(
              ap.av.getAlignment(), ap.alignFrame).fetchDBRefs(false);
   }
 
-  public void sequenceFeature_actionPerformed(ActionEvent e)
+  public void sequenceFeature_actionPerformed()
   {
     SequenceGroup sg = ap.av.getSelectionGroup();
     if(sg==null)
@@ -1356,7 +1340,7 @@ public class PopupMenu extends JPopupMenu
     }
   }
 
-  public void textColour_actionPerformed(ActionEvent e)
+  public void textColour_actionPerformed()
   {
     SequenceGroup sg = getGroup();
     if (sg != null)