Reduced jar size by 20%

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

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index 8488dd8..c90af98 100755 (executable)
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -28,7 +28,7 @@ import jalview.datamodel.*;
 import jalview.schemes.*;\r
 \r
 public class APopupMenu\r
-    extends java.awt.PopupMenu\r
+    extends java.awt.PopupMenu implements ActionListener, ItemListener\r
 {\r
   Menu groupMenu = new Menu();\r
   protected MenuItem clustalColour = new MenuItem();\r
@@ -131,6 +131,54 @@ public class APopupMenu
     }\r
   }\r
 \r
+  public void itemStateChanged(ItemEvent evt)\r
+  {\r
+    if(evt.getSource()==abovePIDColour)\r
+      abovePIDColour_itemStateChanged();\r
+    else if(evt.getSource()==showColourText)\r
+      showColourText_itemStateChanged();\r
+    else if(evt.getSource()==showText)\r
+      showText_itemStateChanged();\r
+    else if(evt.getSource()==showBoxes)\r
+       showBoxes_itemStateChanged()   ;\r
+  }\r
+\r
+  public void actionPerformed(ActionEvent evt)\r
+  {\r
+    if(evt.getSource()==clustalColour)\r
+      clustalColour_actionPerformed();\r
+    else if(evt.getSource()==zappoColour)\r
+      zappoColour_actionPerformed();\r
+    else if(evt.getSource()==taylorColour)\r
+      taylorColour_actionPerformed();\r
+    else if(evt.getSource()==hydrophobicityColour)\r
+      hydrophobicityColour_actionPerformed();\r
+    else if(evt.getSource()==helixColour)\r
+      helixColour_actionPerformed();\r
+    else if(evt.getSource()==strandColour)\r
+      strandColour_actionPerformed();\r
+    else if(evt.getSource()==clustalColour)\r
+      turnColour_actionPerformed();\r
+    else if(evt.getSource()==buriedColour)\r
+      buriedColour_actionPerformed();\r
+    else if(evt.getSource()==nucleotideMenuItem)\r
+      nucleotideMenuItem_actionPerformed();\r
+\r
+    else if(evt.getSource()==userDefinedColour)\r
+          userDefinedColour_actionPerformed();\r
+        else if(evt.getSource()==PIDColour)\r
+       PIDColour_actionPerformed();\r
+     else if(evt.getSource()==BLOSUM62Colour)\r
+      BLOSUM62Colour_actionPerformed();\r
+    else if(evt.getSource()==noColourmenuItem)\r
+      noColourmenuItem_actionPerformed();\r
+    else if(evt.getSource()==conservationMenuItem)\r
+        conservationMenuItem_itemStateChanged();\r
+      else if(evt.getSource()==unGroupMenuItem)\r
+      unGroupMenuItem_actionPerformed();\r
+\r
+  }\r
+\r
   void addPDB(Sequence seq)\r
   {\r
     CutAndPasteTransfer cap = new CutAndPasteTransfer(true, ap.alignFrame.applet);\r
@@ -148,63 +196,21 @@ public class APopupMenu
     groupMenu.setLabel("Define");\r
 \r
     unGroupMenuItem.setLabel("Remove Group");\r
-    unGroupMenuItem.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        unGroupMenuItem_actionPerformed(e);\r
-      }\r
-    });\r
+    unGroupMenuItem.addActionListener(this);\r
 \r
     nucleotideMenuItem.setLabel("Nucleotide");\r
-    nucleotideMenuItem.addActionListener(new ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        nucleotideMenuItem_actionPerformed(e);\r
-      }\r
-    });\r
-    conservationMenuItem.addItemListener(new ItemListener()\r
-    {\r
-      public void itemStateChanged(ItemEvent itemEvent)\r
-      {\r
-        conservationMenuItem_itemStateChanged(itemEvent);\r
-      }\r
-    });\r
-    abovePIDColour.addItemListener(new ItemListener()\r
-    {\r
-      public void itemStateChanged(ItemEvent itemEvent)\r
-      {\r
-        abovePIDColour_itemStateChanged(itemEvent);\r
-      }\r
-    });\r
+    nucleotideMenuItem.addActionListener(this);\r
+    conservationMenuItem.addItemListener(this);\r
+    abovePIDColour.addItemListener(this);\r
     colourMenu.setLabel("Group Colour");\r
     showBoxes.setLabel("Boxes");\r
     showBoxes.setState(true);\r
-    showBoxes.addItemListener(new ItemListener()\r
-    {\r
-      public void itemStateChanged(ItemEvent itemEvent)\r
-      {\r
-        showBoxes_itemStateChanged(itemEvent);\r
-      }\r
-    });\r
+    showBoxes.addItemListener(this);\r
 \r
     showText.setLabel("Text");\r
-    showText.addItemListener(new ItemListener()\r
-    {\r
-      public void itemStateChanged(ItemEvent itemEvent)\r
-      {\r
-        showText_itemStateChanged(itemEvent);\r
-      }\r
-    });\r
+    showText.addItemListener(this);\r
     showColourText.setLabel("Colour Text");\r
-    showColourText.addItemListener(new ItemListener()\r
-    {\r
-      public void itemStateChanged(ItemEvent itemEvent)\r
-      {\r
-        showColourText_itemStateChanged(itemEvent);\r
-      }\r
-    });\r
+    showColourText.addItemListener(this);\r
 \r
     add(groupMenu);\r
     groupMenu.add(unGroupMenuItem);\r
@@ -231,104 +237,32 @@ public class APopupMenu
     colourMenu.add(conservationMenuItem);\r
 \r
     noColourmenuItem.setLabel("None");\r
-    noColourmenuItem.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        noColourmenuItem_actionPerformed(e);\r
-      }\r
-    });\r
+    noColourmenuItem.addActionListener(this);\r
 \r
     clustalColour.setLabel("Clustalx colours");\r
-    clustalColour.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        clustalColour_actionPerformed(e);\r
-      }\r
-    });\r
+    clustalColour.addActionListener(this);\r
     zappoColour.setLabel("Zappo");\r
-    zappoColour.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        zappoColour_actionPerformed(e);\r
-      }\r
-    });\r
+    zappoColour.addActionListener(this);\r
     taylorColour.setLabel("Taylor");\r
-    taylorColour.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        taylorColour_actionPerformed(e);\r
-      }\r
-    });\r
+    taylorColour.addActionListener(this);\r
     hydrophobicityColour.setLabel("Hydrophobicity");\r
-    hydrophobicityColour.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        hydrophobicityColour_actionPerformed(e);\r
-      }\r
-    });\r
+    hydrophobicityColour.addActionListener(this);\r
     helixColour.setLabel("Helix propensity");\r
-    helixColour.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        helixColour_actionPerformed(e);\r
-      }\r
-    });\r
+    helixColour.addActionListener(this);\r
     strandColour.setLabel("Strand propensity");\r
-    strandColour.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        strandColour_actionPerformed(e);\r
-      }\r
-    });\r
+    strandColour.addActionListener(this);\r
     turnColour.setLabel("Turn propensity");\r
-    turnColour.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        turnColour_actionPerformed(e);\r
-      }\r
-    });\r
+    turnColour.addActionListener(this);\r
     buriedColour.setLabel("Buried Index");\r
-    buriedColour.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        buriedColour_actionPerformed(e);\r
-      }\r
-    });\r
+    buriedColour.addActionListener(this);\r
     abovePIDColour.setLabel("Above % Identity");\r
 \r
     userDefinedColour.setLabel("User Defined");\r
-    userDefinedColour.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        userDefinedColour_actionPerformed(e);\r
-      }\r
-    });\r
+    userDefinedColour.addActionListener(this);\r
     PIDColour.setLabel("Percentage Identity");\r
-    PIDColour.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        PIDColour_actionPerformed(e);\r
-      }\r
-    });\r
+    PIDColour.addActionListener(this);\r
     BLOSUM62Colour.setLabel("BLOSUM62");\r
-    BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        BLOSUM62Colour_actionPerformed(e);\r
-      }\r
-    });\r
+    BLOSUM62Colour.addActionListener(this);\r
     conservationMenuItem.setLabel("Conservation");\r
 \r
   }\r
@@ -350,62 +284,62 @@ public class APopupMenu
       ap.overviewPanel.updateOverviewImage();\r
   }\r
 \r
-  protected void clustalColour_actionPerformed(ActionEvent e)\r
+  protected void clustalColour_actionPerformed()\r
   {\r
     SequenceGroup sg = getGroup();\r
     sg.cs = new ClustalxColourScheme(sg.sequences, ap.av.alignment.getWidth());\r
     refresh();\r
   }\r
 \r
-  protected void zappoColour_actionPerformed(ActionEvent e)\r
+  protected void zappoColour_actionPerformed()\r
   {\r
     getGroup().cs = new ZappoColourScheme();\r
     refresh();\r
   }\r
 \r
-  protected void taylorColour_actionPerformed(ActionEvent e)\r
+  protected void taylorColour_actionPerformed()\r
   {\r
     getGroup().cs = new TaylorColourScheme();\r
     refresh();\r
   }\r
 \r
-  protected void hydrophobicityColour_actionPerformed(ActionEvent e)\r
+  protected void hydrophobicityColour_actionPerformed()\r
   {\r
     getGroup().cs = new HydrophobicColourScheme();\r
     refresh();\r
   }\r
 \r
-  protected void helixColour_actionPerformed(ActionEvent e)\r
+  protected void helixColour_actionPerformed()\r
   {\r
     getGroup().cs = new HelixColourScheme();\r
     refresh();\r
   }\r
 \r
-  protected void strandColour_actionPerformed(ActionEvent e)\r
+  protected void strandColour_actionPerformed()\r
   {\r
     getGroup().cs = new StrandColourScheme();\r
     refresh();\r
   }\r
 \r
-  protected void turnColour_actionPerformed(ActionEvent e)\r
+  protected void turnColour_actionPerformed()\r
   {\r
     getGroup().cs = new TurnColourScheme();\r
     refresh();\r
   }\r
 \r
-  protected void buriedColour_actionPerformed(ActionEvent e)\r
+  protected void buriedColour_actionPerformed()\r
   {\r
     getGroup().cs = new BuriedColourScheme();\r
     refresh();\r
   }\r
 \r
-  public void nucleotideMenuItem_actionPerformed(ActionEvent e)\r
+  public void nucleotideMenuItem_actionPerformed()\r
   {\r
     getGroup().cs = new NucleotideColourScheme();\r
     refresh();\r
   }\r
 \r
-  protected void abovePIDColour_itemStateChanged(ItemEvent ie)\r
+  protected void abovePIDColour_itemStateChanged()\r
   {\r
     SequenceGroup sg = getGroup();\r
     if(sg.cs==null)\r
@@ -432,12 +366,12 @@ public class APopupMenu
 \r
   }\r
 \r
-  protected void userDefinedColour_actionPerformed(ActionEvent e)\r
+  protected void userDefinedColour_actionPerformed()\r
   {\r
     new UserDefinedColours(ap, getGroup());\r
   }\r
 \r
-  protected void PIDColour_actionPerformed(ActionEvent e)\r
+  protected void PIDColour_actionPerformed()\r
   {\r
     SequenceGroup sg = getGroup();\r
     sg.cs = new PIDColourScheme();\r
@@ -446,7 +380,7 @@ public class APopupMenu
     refresh();\r
   }\r
 \r
-  protected void BLOSUM62Colour_actionPerformed(ActionEvent e)\r
+  protected void BLOSUM62Colour_actionPerformed()\r
   {\r
     SequenceGroup sg = getGroup();\r
 \r
@@ -458,13 +392,13 @@ public class APopupMenu
     refresh();\r
   }\r
 \r
-  protected void noColourmenuItem_actionPerformed(ActionEvent e)\r
+  protected void noColourmenuItem_actionPerformed()\r
   {\r
     getGroup().cs = null;\r
     refresh();\r
   }\r
 \r
-  protected void conservationMenuItem_itemStateChanged(ItemEvent ie)\r
+  protected void conservationMenuItem_itemStateChanged()\r
   {\r
     SequenceGroup sg = getGroup();\r
     if(sg.cs==null)\r
@@ -506,7 +440,7 @@ public class APopupMenu
     return sg;\r
   }\r
 \r
-  void unGroupMenuItem_actionPerformed(ActionEvent e)\r
+  void unGroupMenuItem_actionPerformed()\r
   {\r
     SequenceGroup sg = ap.av.getSelectionGroup();\r
     ap.av.alignment.deleteGroup(sg);\r
@@ -514,19 +448,19 @@ public class APopupMenu
     ap.repaint();\r
   }\r
 \r
-  public void showColourText_itemStateChanged(ItemEvent itemEvent)\r
+  public void showColourText_itemStateChanged()\r
   {\r
     getGroup().setColourText(showColourText.getState());\r
     refresh();\r
   }\r
 \r
-  public void showText_itemStateChanged(ItemEvent itemEvent)\r
+  public void showText_itemStateChanged()\r
   {\r
     getGroup().setDisplayText(showText.getState());\r
     refresh();\r
   }\r
 \r
-  public void showBoxes_itemStateChanged(ItemEvent itemEvent)\r
+  public void showBoxes_itemStateChanged()\r
   {\r
     getGroup().setDisplayBoxes(showBoxes.getState());\r
     refresh();\r