Merge branch 'Jalview-JS/jim/JAL-3253-JAL-3418' into Jalview-JS/JAL-3253-applet

diff --git a/build.xml b/build.xml
index 775df8d..6154cca 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -102,6 +102,8 @@
 
     <!-- default TestNG groups to run -->
     <property name="testng-groups" value="Functional" />
+    <!-- default verbosity for TestNG -->
+    <property name="testng-verbosity" value="2"/>
     <!-- Java 9 JVM args -->
     <condition property="java9">
       <equals arg1="${ant.java.version}" arg2="9"/>
@@ -303,7 +305,7 @@
 
   <target name="testng" depends="buildTests">
     <testng outputDir="${reportDir}" haltOnFailure="false" groups="${testng-groups}" mode="testng"
-      verbose="2">
+      verbose="${testng-verbosity}">
       <classpath>
         <pathelement location="${testOutputDir}" />
         <pathelement location="${clover.jar}" if:set="clover.jar"/>

diff --git a/src/jalview/viewmodel/ViewportRanges.java b/src/jalview/viewmodel/ViewportRanges.java
index 9f54964..a022627 100644 (file)
--- a/src/jalview/viewmodel/ViewportRanges.java
+++ b/src/jalview/viewmodel/ViewportRanges.java
@@ -224,7 +224,7 @@ public class ViewportRanges extends ViewportProperties
   public void setStartSeq(int seq)
   {
     int height = getViewportHeight();
-    int startseq = Math.max(seq, getVisibleAlignmentHeight() - height);
+    int startseq = Math.min(seq, getVisibleAlignmentHeight() - height);
     // BH 2019.07.27 cosmetic only -- was:
     // if (startseq + height - 1 > getVisibleAlignmentHeight() - 1)
     // {