git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
repaint image buffer height change (JAL-564) and ensure annotation panel
[jalview.git]
/
src
/
jalview
/
appletgui
/
TreePanel.java
diff --git
a/src/jalview/appletgui/TreePanel.java
b/src/jalview/appletgui/TreePanel.java
old mode 100755
(executable)
new mode 100644
(file)
index
268fece
..
7595a50
--- a/
src/jalview/appletgui/TreePanel.java
+++ b/
src/jalview/appletgui/TreePanel.java
@@
-41,6
+41,7
@@
public class TreePanel extends EmbmenuFrame implements ActionListener,
TreeCanvas treeCanvas;
NJTree tree;
TreeCanvas treeCanvas;
NJTree tree;
+ AlignmentPanel ap;
AlignViewport av;
AlignViewport av;
@@
-48,6
+49,12
@@
public class TreePanel extends EmbmenuFrame implements ActionListener,
{
return tree;
}
{
return tree;
}
+
+ public void finalize() throws Throwable {
+ ap=null;
+ av=null;
+ super.finalize();
+ }
/**
* Creates a new TreePanel object.
/**
* Creates a new TreePanel object.
@@
-65,7
+72,7
@@
public class TreePanel extends EmbmenuFrame implements ActionListener,
* @param e
* DOCUMENT ME!
*/
* @param e
* DOCUMENT ME!
*/
- public TreePanel(AlignViewport av, String type, String pwtype)
+ public TreePanel(AlignmentPanel ap, String type, String pwtype)
{
try
{
{
try
{
@@
-76,7
+83,7
@@
public class TreePanel extends EmbmenuFrame implements ActionListener,
ex.printStackTrace();
}
ex.printStackTrace();
}
- initTreePanel(av, type, pwtype, null);
+ initTreePanel(ap, type, pwtype, null);
}
/**
}
/**
@@
-93,7
+100,7
@@
public class TreePanel extends EmbmenuFrame implements ActionListener,
* @param pwtype
* DOCUMENT ME!
*/
* @param pwtype
* DOCUMENT ME!
*/
- public TreePanel(AlignViewport av, String type, String pwtype,
+ public TreePanel(AlignmentPanel ap, String type, String pwtype,
NewickFile newtree)
{
try
NewickFile newtree)
{
try
@@
-105,18
+112,19
@@
public class TreePanel extends EmbmenuFrame implements ActionListener,
e.printStackTrace();
}
e.printStackTrace();
}
- initTreePanel(av, type, pwtype, newtree);
+ initTreePanel(ap, type, pwtype, newtree);
}
}
- void initTreePanel(AlignViewport av, String type, String pwtype,
+ void initTreePanel(AlignmentPanel ap, String type, String pwtype,
NewickFile newTree)
{
NewickFile newTree)
{
- this.av = av;
+ this.ap = ap;
+ this.av = ap.av;
this.type = type;
this.pwtype = pwtype;
this.type = type;
this.pwtype = pwtype;
- treeCanvas = new TreeCanvas(av, scrollPane);
+ treeCanvas = new TreeCanvas(ap, scrollPane);
TreeLoader tl = new TreeLoader(newTree);
tl.start();
embedMenuIfNeeded(treeCanvas);
TreeLoader tl = new TreeLoader(newTree);
tl.start();
embedMenuIfNeeded(treeCanvas);