X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FTreePanel.java;h=61b0546264108027120db7cfd053e7088d747e18;hb=14bad6b2390493bb6ad030c6f3ea7cde4cba1b53;hp=99ad412cc2f7dd371cdd257b6c250f0e81776f67;hpb=55e2e9b22b133db8b9ff0979b0338a33081fc8fd;p=jalview.git

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