X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreePanel.java;h=06f82694f6606f677d78cc5f665f1c57cf1e6f50;hb=f3bc67915e61855d87866b4a614fe7a953813408;hp=05f01cf9558fb5774934fdf585e165e0922e1215;hpb=2dab0c4b97923f8edeb39335338ae2db08e64c65;p=jalview.git

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index 05f01cf..06f8269 100755
--- a/src/jalview/gui/TreePanel.java
+++ b/src/jalview/gui/TreePanel.java
@@ -65,10 +65,10 @@ public class TreePanel extends GTreePanel
      * @param s DOCUMENT ME!
      * @param e DOCUMENT ME!
      */
-    public TreePanel(AlignViewport av, String type, String pwtype)
+    public TreePanel(AlignmentPanel ap, String type, String pwtype)
     {
       super();
-      initTreePanel(av, type, pwtype, null);
+      initTreePanel(ap, type, pwtype, null);
 
       // We know this tree has distances. JBPNote TODO: prolly should add this as a userdefined default
       // showDistances(true);
@@ -83,13 +83,13 @@ public class TreePanel extends GTreePanel
      * @param type DOCUMENT ME!
      * @param pwtype DOCUMENT ME!
      */
-    public TreePanel(AlignViewport av,
+    public TreePanel(AlignmentPanel ap,
                      String type,
                      String pwtype,
                      NewickFile newtree)
     {
       super();
-      initTreePanel(av, type, pwtype, newtree);
+      initTreePanel(ap, type, pwtype, newtree);
     }
 
     public AlignmentI getAlignment()
@@ -98,14 +98,15 @@ public class TreePanel extends GTreePanel
     }
 
 
-    void initTreePanel(AlignViewport av, String type,  String pwtype,
+    void initTreePanel(AlignmentPanel ap, String type,  String pwtype,
                        NewickFile newTree)
     {
 
+      av = ap.av;
       this.type = type;
       this.pwtype = pwtype;
 
-      treeCanvas = new TreeCanvas(av, scrollPane);
+      treeCanvas = new TreeCanvas(ap, scrollPane);
       scrollPane.setViewportView(treeCanvas);
 
       av.addPropertyChangeListener(new java.beans.PropertyChangeListener()
@@ -344,7 +345,10 @@ public class TreePanel extends GTreePanel
          if (true)
          {
            // make a new frame!
-           AlignFrame af = new AlignFrame(al, (ColumnSelection) alAndColsel[1]);
+           AlignFrame af = new AlignFrame(al, (ColumnSelection) alAndColsel[1],
+                                           AlignFrame.DEFAULT_WIDTH,
+                                           AlignFrame.DEFAULT_HEIGHT
+);
 
            //>>>This is a fix for the moment, until a better solution is found!!<<<
            // af.getFeatureRenderer().transferSettings(alignFrame.getFeatureRenderer());
@@ -353,8 +357,8 @@ public class TreePanel extends GTreePanel
        //                                     msaorder);
 
            Desktop.addInternalFrame(af, "Original Data for " + this.title,
-                                    AlignFrame.NEW_WINDOW_WIDTH,
-                                    AlignFrame.NEW_WINDOW_HEIGHT);
+                                    AlignFrame.DEFAULT_WIDTH,
+                                    AlignFrame.DEFAULT_HEIGHT);
          }
        }
     }