X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FTreePanel.java;h=61b0546264108027120db7cfd053e7088d747e18;hb=20403dbf83a2caa650a4ccd37f5a6dae7d0bd0f3;hp=3e26a4b0e31c939b2f2c6f01218b2cad83ecf803;hpb=ee53965807b83bf93a21cbc341cee9a9e005b2cb;p=jalview.git

diff --git a/src/jalview/appletgui/TreePanel.java b/src/jalview/appletgui/TreePanel.java
index 3e26a4b..61b0546 100755
--- a/src/jalview/appletgui/TreePanel.java
+++ b/src/jalview/appletgui/TreePanel.java
@@ -22,19 +22,17 @@ package jalview.appletgui;
 import java.util.*;
 
 import java.awt.event.*;
+import java.awt.*;
 
 import jalview.analysis.*;
 import jalview.datamodel.*;
 import jalview.io.*;
-import jalview.jbappletgui.*;
 
-public class TreePanel
-    extends GTreePanel
+public class TreePanel extends Frame implements ActionListener, ItemListener
 {
   SequenceI[] seq;
   String type;
   String pwtype;
-  AlignmentPanel ap;
   int start;
   int end;
   TreeCanvas treeCanvas;
@@ -58,7 +56,16 @@ public class TreePanel
   public TreePanel(AlignViewport av, Vector seqVector, String type,
                    String pwtype, int s, int e)
   {
-    super();
+    try
+    {
+      jbInit();
+      this.setMenuBar(jMenuBar1);
+    }
+    catch (Exception ex)
+    {
+      ex.printStackTrace();
+    }
+
     initTreePanel(av, seqVector, type, pwtype, s, e, null);
   }
 
@@ -74,7 +81,16 @@ public class TreePanel
   public TreePanel(AlignViewport av, Vector seqVector, NewickFile newtree,
                    String type, String pwtype)
   {
-    super();
+    try
+    {
+      jbInit();
+      this.setMenuBar(jMenuBar1);
+    }
+    catch (Exception e)
+    {
+      e.printStackTrace();
+    }
+
     initTreePanel(av, seqVector, type, pwtype, 0, seqVector.size(), newtree);
   }
 
@@ -136,22 +152,37 @@ public class TreePanel
     }
   }
 
-  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);
-    CutAndPasteTransfer cap = new CutAndPasteTransfer(false, ap.alignFrame.applet);
+    CutAndPasteTransfer cap = new CutAndPasteTransfer(false, null);
     cap.setText(output);
     java.awt.Frame frame = new java.awt.Frame();
     frame.add(cap);
@@ -169,7 +200,7 @@ public class TreePanel
     treeCanvas.repaint();
   }
 
-  protected void fontSize_actionPerformed(ActionEvent e)
+  protected void fontSize_actionPerformed()
   {
      if( treeCanvas==null )
         return;
@@ -177,19 +208,48 @@ public class TreePanel
     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();
+  MenuBar jMenuBar1 = new MenuBar();
+  Menu jMenu2 = new Menu();
+  protected MenuItem fontSize = new MenuItem();
+  protected CheckboxMenuItem bootstrapMenu = new CheckboxMenuItem();
+  protected CheckboxMenuItem distanceMenu = new CheckboxMenuItem();
+  protected CheckboxMenuItem placeholdersMenu = new CheckboxMenuItem();
+  protected CheckboxMenuItem fitToWindow = new CheckboxMenuItem();
+  Menu fileMenu = new Menu();
+  MenuItem newickOutput = new MenuItem();
+
+  private void jbInit() throws Exception {
+      setLayout(borderLayout1);
+      this.setBackground(Color.white);
+      this.setFont(new java.awt.Font("Verdana", 0, 12));
+      jMenu2.setLabel("View");
+      fontSize.setLabel("Font...");
+      fontSize.addActionListener(this);
+      bootstrapMenu.setLabel("Show Bootstrap Values");
+      bootstrapMenu.addItemListener(this);
+      distanceMenu.setLabel("Show Distances");
+      distanceMenu.addItemListener(this);
+      placeholdersMenu.setLabel("Mark Unassociated Leaves");
+      placeholdersMenu.addItemListener(this);
+      fitToWindow.setState(true);
+      fitToWindow.setLabel("Fit To Window");
+      fitToWindow.addItemListener(this);
+      fileMenu.setLabel("File");
+      newickOutput.setLabel("Newick Format");
+      newickOutput.addActionListener(this);
+
+    add(scrollPane, BorderLayout.CENTER);
+      jMenuBar1.add(fileMenu);
+      jMenuBar1.add(jMenu2);
+      jMenu2.add(fitToWindow);
+      jMenu2.add(fontSize);
+      jMenu2.add(distanceMenu);
+      jMenu2.add(bootstrapMenu);
+      jMenu2.add(placeholdersMenu);
+    fileMenu.add(newickOutput);
   }
 
 }