X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignViewport.java;h=2bead4674fc27e795f0c6d832620bb1eb844dd0d;hb=04e88679fd837e9fe36d186e5eacdd5f13a89927;hp=c83f93f85621184a8a849fbe3c6d47709be5ba86;hpb=173f77ac7161e8866ddfe6b5689d61a83f459cfc;p=jalview.git diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java index c83f93f..2bead46 100644 --- a/src/jalview/appletgui/AlignViewport.java +++ b/src/jalview/appletgui/AlignViewport.java @@ -25,14 +25,11 @@ import jalview.api.FeatureSettingsModelI; import jalview.bin.JalviewLite; import jalview.commands.CommandI; import jalview.datamodel.AlignmentI; -import jalview.datamodel.Annotation; import jalview.datamodel.ColumnSelection; import jalview.datamodel.HiddenColumns; import jalview.datamodel.SearchResults; import jalview.datamodel.SearchResultsI; -import jalview.datamodel.Sequence; import jalview.datamodel.SequenceGroup; -import jalview.datamodel.SequenceI; import jalview.renderer.ResidueShader; import jalview.schemes.ColourSchemeProperty; import jalview.schemes.UserColourScheme; @@ -55,19 +52,8 @@ public class AlignViewport extends AlignmentViewport 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); @@ -129,8 +115,6 @@ public class AlignViewport extends AlignmentViewport } setFont(font, true); - MAC = new jalview.util.Platform().isAMac(); - if (applet != null) { setShowJVSuffix( @@ -209,7 +193,8 @@ public class AlignViewport extends AlignmentViewport if (colour != null) { residueShading = new ResidueShader( - ColourSchemeProperty.getColourScheme(alignment, colour)); + ColourSchemeProperty.getColourScheme(this, alignment, + colour)); if (residueShading != null) { residueShading.setConsensus(hconsensus); @@ -268,7 +253,7 @@ public class AlignViewport extends AlignmentViewport public void resetSeqLimits(int height) { - ranges.setEndSeq(height / getCharHeight()); + ranges.setEndSeq(height / getCharHeight() - 1); // BH 2019.04.18 } boolean centreColumnLabels;