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 imp/JAL-2775
[jalview.git]
/
src
/
jalview
/
appletgui
/
AlignViewport.java
diff --git
a/src/jalview/appletgui/AlignViewport.java
b/src/jalview/appletgui/AlignViewport.java
index
b07666e
..
262948d
100644
(file)
--- a/
src/jalview/appletgui/AlignViewport.java
+++ b/
src/jalview/appletgui/AlignViewport.java
@@
-20,7
+20,6
@@
*/
package jalview.appletgui;
*/
package jalview.appletgui;
-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;
@@
-54,23
+53,12
@@
public class AlignViewport extends AlignmentViewport
boolean validCharWidth = true;
boolean validCharWidth = true;
- TreeModel currentTree = null;
-
public jalview.bin.JalviewLite applet;
boolean MAC = false;
private AnnotationColumnChooser annotationColumnSelectionState;
public jalview.bin.JalviewLite applet;
boolean MAC = false;
private AnnotationColumnChooser annotationColumnSelectionState;
- @Override
- public void finalize()
- {
- applet = null;
- quality = null;
- alignment = null;
- colSel = null;
- }
-
public AlignViewport(AlignmentI al, JalviewLite applet)
{
super(al);
public AlignViewport(AlignmentI al, JalviewLite applet)
{
super(al);
@@
-274,16
+262,6
@@
public class AlignViewport extends AlignmentViewport
ranges.setEndSeq(height / getCharHeight());
}
ranges.setEndSeq(height / getCharHeight());
}
- public void setCurrentTree(TreeModel tree)
- {
- currentTree = tree;
- }
-
- public TreeModel getCurrentTree()
- {
- return currentTree;
- }
-
boolean centreColumnLabels;
public boolean getCentreColumnLabels()
boolean centreColumnLabels;
public boolean getCentreColumnLabels()