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
Merge branch 'develop' into features/JAL-2393customMatrices
[jalview.git]
/
src
/
jalview
/
appletgui
/
AlignViewport.java
diff --git
a/src/jalview/appletgui/AlignViewport.java
b/src/jalview/appletgui/AlignViewport.java
index
30817d5
..
0dcd543
100644
(file)
--- a/
src/jalview/appletgui/AlignViewport.java
+++ b/
src/jalview/appletgui/AlignViewport.java
@@
-20,7
+20,7
@@
*/
package jalview.appletgui;
*/
package jalview.appletgui;
-import jalview.analysis.NJTree;
+import jalview.analysis.TreeModel;
import jalview.api.AlignViewportI;
import jalview.api.FeatureSettingsModelI;
import jalview.bin.JalviewLite;
import jalview.api.AlignViewportI;
import jalview.api.FeatureSettingsModelI;
import jalview.bin.JalviewLite;
@@
-52,7
+52,7
@@
public class AlignViewport extends AlignmentViewport implements
boolean validCharWidth = true;
boolean validCharWidth = true;
- NJTree currentTree = null;
+ TreeModel currentTree = null;
public jalview.bin.JalviewLite applet;
public jalview.bin.JalviewLite applet;
@@
-297,15
+297,15
@@
public class AlignViewport extends AlignmentViewport implements
public void resetSeqLimits(int height)
{
public void resetSeqLimits(int height)
{
- setEndSeq(height / getCharHeight());
+ ranges.setEndSeq(height / getCharHeight());
}
}
- public void setCurrentTree(NJTree tree)
+ public void setCurrentTree(TreeModel tree)
{
currentTree = tree;
}
{
currentTree = tree;
}
- public NJTree getCurrentTree()
+ public TreeModel getCurrentTree()
{
return currentTree;
}
{
return currentTree;
}