Merge remote-tracking branch 'origin/bug/JAL-3082selectRegex' into merge/JAL-3082

[jalview.git] / src / jalview / gui / AnnotationPanel.java

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index ce37d7e..ab86707 100755 (executable)
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -704,6 +704,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
 
     int column = (evt.getX() / av.getCharWidth())
             + av.getRanges().getStartRes();
+    column = Math.min(column, av.getRanges().getEndRes());
 
     if (av.hasHiddenColumns())
     {
@@ -717,12 +718,12 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
     {
       setToolTipText(buildToolTip(ann, column, aa));
       String msg = getStatusMessage(av.getAlignment(), column, ann);
-      ap.alignFrame.statusBar.setText(msg);
+      ap.alignFrame.setStatus(msg);
     }
     else
     {
       this.setToolTipText(null);
-      ap.alignFrame.statusBar.setText(" ");
+      ap.alignFrame.setStatus(" ");
     }
   }