JAL-2349 JAL-4033 refactored contact matrix geom calc to allow reporting of mapped...

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

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 54e3db7..6918811 100644 (file)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -1175,6 +1175,7 @@ public class SeqPanel extends JPanel
     final int column = pos.column;
     final int rowIndex = pos.annotationIndex;
 
+    // TODO - get yOffset for annotation, too
     if (column < 0 || !av.getWrapAlignment() || !av.isShowAnnotation()
             || rowIndex < 0)
     {
@@ -1183,8 +1184,9 @@ public class SeqPanel extends JPanel
     AlignmentAnnotation[] anns = av.getAlignment().getAlignmentAnnotation();
 
     String tooltip = AnnotationPanel.buildToolTip(anns[rowIndex], column,
-            anns);
-    if (!tooltip.equals(lastTooltip))
+            anns, 0, av);
+    if (tooltip == null ? tooltip != lastTooltip
+            : !tooltip.equals(lastTooltip))
     {
       lastTooltip = tooltip;
       lastFormattedTooltip = tooltip == null ? null
@@ -1193,7 +1195,7 @@ public class SeqPanel extends JPanel
     }
 
     String msg = AnnotationPanel.getStatusMessage(av.getAlignment(), column,
-            anns[rowIndex]);
+            anns[rowIndex], 0, av);
     ap.alignFrame.setStatus(msg);
   }