Merge branch 'Jalview-JS/develop' into merge_js_develop

[jalview.git] / src / jalview / appletgui / AlignViewport.java

diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java
index e2c8d27..e2eebfc 100644 (file)
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -52,8 +52,6 @@ public class AlignViewport extends AlignmentViewport
 
   public jalview.bin.JalviewLite applet;
 
-  boolean MAC = false;
-
   private AnnotationColumnChooser annotationColumnSelectionState;
 
   java.awt.Frame nullFrame;
@@ -65,7 +63,7 @@ public class AlignViewport extends AlignmentViewport
   public AlignViewport(AlignmentI al, JalviewLite applet)
   {
     super(al);
-    calculator = new jalview.workers.AlignCalcManager();
+    calculator = new jalview.workers.AlignCalcManager2();
     this.applet = applet;
 
     // we always pad gaps
@@ -123,8 +121,6 @@ public class AlignViewport extends AlignmentViewport
     }
     setFont(font, true);
 
-    MAC = new jalview.util.Platform().isAMac();
-
     if (applet != null)
     {
       setShowJVSuffix(
@@ -256,7 +252,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;
@@ -344,7 +340,7 @@ public class AlignViewport extends AlignmentViewport
     if (mappedCommand != null)
     {
       mappedCommand.doCommand(null);
-      firePropertyChange("alignment", null, getAlignment().getSequences());
+      notifyAlignment();
 
       // ap.scalePanelHolder.repaint();
       // ap.repaint();