From: Ben Soares <bsoares@dundee.ac.uk>
Date: Mon, 27 May 2019 14:50:52 +0000 (+0100)
Subject: Merge branch 'develop' into task/JAL-3247_JAL-3246_JAL-3254_JAL-3236_merge
X-Git-Tag: Release_2_11_1_0~53^2~11^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5e922f6c32e448df4e8455d87489d0464b1c41aa;hp=90cdc6b3f35ec9f98121a0e9c74e9ca4f7923cd3;p=jalview.git

Merge branch 'develop' into task/JAL-3247_JAL-3246_JAL-3254_JAL-3236_merge

Merging in develop
---

diff --git a/help/help/html/releases.html b/help/help/html/releases.html
index a98b060..287b218 100755
--- a/help/help/html/releases.html
+++ b/help/help/html/releases.html
@@ -134,7 +134,7 @@ li:before {
           <li>
             <!-- JAL-2975 -->Can use shift + arrow keys to rotate PCA image incrementally</li>
           <li>
-            <!-- JAL-2965 -->PCA depth queuing with graduated colours</li>
+            <!-- JAL-2965 -->PCA depth cueing with graduated colours</li>
         </ul>
         <em>Deprecations</em>
         <ul>
diff --git a/test/jalview/gui/SeqPanelTest.java b/test/jalview/gui/SeqPanelTest.java
index 571c75b..cd0b594 100644
--- a/test/jalview/gui/SeqPanelTest.java
+++ b/test/jalview/gui/SeqPanelTest.java
@@ -39,8 +39,9 @@ import jalview.gui.SeqPanel.MousePos;
 import jalview.io.DataSourceType;
 import jalview.io.FileLoader;
 import jalview.util.MessageManager;
+import jalview.viewmodel.ViewportRanges;
 
-import java.awt.event.InputEvent;import java.awt.EventQueue;
+import java.awt.EventQueue;
 import java.awt.event.MouseEvent;
 import java.lang.reflect.InvocationTargetException;
 
@@ -722,7 +723,8 @@ public class SeqPanelTest
     int x = 0;
     final int charWidth = alignFrame.getViewport().getCharWidth();
     assertTrue(charWidth > 0); // sanity check
-    assertEquals(alignFrame.getViewport().getRanges().getStartRes(), 0);
+    ViewportRanges ranges = alignFrame.getViewport().getRanges();
+    assertEquals(ranges.getStartRes(), 0);
 
     /*
      * mouse at top left of unwrapped panel
@@ -763,8 +765,10 @@ public class SeqPanelTest
             false, 0);
     SeqCanvas seqCanvas = alignFrame.alignPanel.getSeqPanel().seqCanvas;
     int w = seqCanvas.getWidth();
-    // limited to number of whole columns, base 0
-    int expected = w / charWidth - 1;
+    // limited to number of whole columns, base 0,
+    // and to end of visible range
+    int expected = w / charWidth;
+    expected = Math.min(expected, ranges.getEndRes());
     assertEquals(testee.findColumn(evt), expected);
 
     /*