Reduced jar size by 20%

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

diff --git a/src/jalview/appletgui/TreePanel.java b/src/jalview/appletgui/TreePanel.java
index 99ad412..61b0546 100755 (executable)
--- a/src/jalview/appletgui/TreePanel.java
+++ b/src/jalview/appletgui/TreePanel.java
@@ -28,7 +28,7 @@ import jalview.analysis.*;
 import jalview.datamodel.*;\r
 import jalview.io.*;\r
 \r
-public class TreePanel extends Frame\r
+public class TreePanel extends Frame implements ActionListener, ItemListener\r
 {\r
   SequenceI[] seq;\r
   String type;\r
@@ -152,18 +152,33 @@ public class TreePanel extends Frame
     }\r
   }\r
 \r
-  public String getText(String format)\r
+  public void actionPerformed(ActionEvent evt)\r
   {\r
-    return null;\r
+    if(evt.getSource()==newickOutput)\r
+      newickOutput_actionPerformed();\r
+    else if(evt.getSource()==fontSize)\r
+      fontSize_actionPerformed();\r
   }\r
 \r
-  protected void fitToWindow_actionPerformed(ActionEvent e)\r
+  public void itemStateChanged(ItemEvent evt)\r
   {\r
-    treeCanvas.fitToWindow = fitToWindow.getState();\r
+    if(evt.getSource()==fitToWindow)\r
+      treeCanvas.fitToWindow = fitToWindow.getState();\r
+\r
+    else if(evt.getSource()==distanceMenu)\r
+      treeCanvas.setShowDistances(distanceMenu.getState());\r
+\r
+    else if(evt.getSource()==bootstrapMenu)\r
+      treeCanvas.setShowBootstrap(bootstrapMenu.getState());\r
+\r
+    else if(evt.getSource()==placeholdersMenu)\r
+      treeCanvas.setMarkPlaceholders(placeholdersMenu.getState());\r
+\r
     treeCanvas.repaint();\r
   }\r
 \r
-  public void newickOutput_actionPerformed(ActionEvent actionEvent)\r
+\r
+  public void newickOutput_actionPerformed()\r
   {\r
     jalview.io.NewickFile fout = new jalview.io.NewickFile(tree.getTopNode());\r
     String output = fout.print(false, true);\r
@@ -185,7 +200,7 @@ public class TreePanel extends Frame
     treeCanvas.repaint();\r
   }\r
 \r
-  protected void fontSize_actionPerformed(ActionEvent e)\r
+  protected void fontSize_actionPerformed()\r
   {\r
      if( treeCanvas==null )\r
         return;\r
@@ -193,20 +208,6 @@ public class TreePanel extends Frame
     new FontChooser(this);\r
   }\r
 \r
-  protected void distanceMenu_actionPerformed(ActionEvent e)\r
-  {\r
-    treeCanvas.setShowDistances(distanceMenu.getState());\r
-  }\r
-\r
-  protected void bootstrapMenu_actionPerformed(ActionEvent e)\r
-  {\r
-    treeCanvas.setShowBootstrap(bootstrapMenu.getState());\r
-  }\r
-\r
-  protected void placeholdersMenu_actionPerformed(ActionEvent e)\r
-  {\r
-    treeCanvas.setMarkPlaceholders(placeholdersMenu.getState());\r
-  }\r
 \r
   BorderLayout borderLayout1 = new BorderLayout();\r
   protected ScrollPane scrollPane = new ScrollPane();\r
@@ -226,43 +227,19 @@ public class TreePanel extends Frame
       this.setFont(new java.awt.Font("Verdana", 0, 12));\r
       jMenu2.setLabel("View");\r
       fontSize.setLabel("Font...");\r
-      fontSize.addActionListener(new java.awt.event.ActionListener() {\r
-              public void actionPerformed(ActionEvent e) {\r
-                  fontSize_actionPerformed(e);\r
-              }\r
-          });\r
+      fontSize.addActionListener(this);\r
       bootstrapMenu.setLabel("Show Bootstrap Values");\r
-      bootstrapMenu.addItemListener(new java.awt.event.ItemListener() {\r
-              public void itemStateChanged(ItemEvent e) {\r
-                  bootstrapMenu_actionPerformed(null);\r
-              }\r
-          });\r
+      bootstrapMenu.addItemListener(this);\r
       distanceMenu.setLabel("Show Distances");\r
-      distanceMenu.addItemListener(new java.awt.event.ItemListener() {\r
-              public void itemStateChanged(ItemEvent e) {\r
-                  distanceMenu_actionPerformed(null);\r
-              }\r
-          });\r
+      distanceMenu.addItemListener(this);\r
       placeholdersMenu.setLabel("Mark Unassociated Leaves");\r
-      placeholdersMenu.addItemListener(new java.awt.event.ItemListener() {\r
-              public void itemStateChanged(ItemEvent e) {\r
-                  placeholdersMenu_actionPerformed(null);\r
-              }\r
-          });\r
+      placeholdersMenu.addItemListener(this);\r
       fitToWindow.setState(true);\r
       fitToWindow.setLabel("Fit To Window");\r
-      fitToWindow.addItemListener(new java.awt.event.ItemListener() {\r
-              public void itemStateChanged(ItemEvent e) {\r
-                  fitToWindow_actionPerformed(null);\r
-              }\r
-          });\r
+      fitToWindow.addItemListener(this);\r
       fileMenu.setLabel("File");\r
       newickOutput.setLabel("Newick Format");\r
-      newickOutput.addActionListener(new ActionListener() {\r
-              public void actionPerformed(ActionEvent actionEvent) {\r
-                  newickOutput_actionPerformed(actionEvent);\r
-              }\r
-          });\r
+      newickOutput.addActionListener(this);\r
 \r
     add(scrollPane, BorderLayout.CENTER);\r
       jMenuBar1.add(fileMenu);\r