Dont add null description to tooltip

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 1ebabfe..0427ecb 100755 (executable)
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -492,6 +492,7 @@ public class AnnotationPanel extends JPanel implements MouseListener,
 \r
         if (aa == null)\r
         {\r
+          this.setToolTipText(null);\r
             return;\r
         }\r
 \r
@@ -514,7 +515,10 @@ public class AnnotationPanel extends JPanel implements MouseListener,
         }\r
 \r
         if(row==-1)\r
-          return;\r
+       {\r
+         this.setToolTipText(null);\r
+         return;\r
+       }\r
 \r
         int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
 \r
@@ -546,12 +550,16 @@ public class AnnotationPanel extends JPanel implements MouseListener,
             if(aa[row].annotations[res]!=null)\r
             {\r
               StringBuffer text = new StringBuffer("Sequence position " +\r
-                                                   (res + 1) + "  " +\r
-                                                   aa[row].annotations[res].description);\r
+                                                   (res + 1));\r
+\r
+              if (aa[row].annotations[res].description != null)\r
+                text.append("  " + aa[row].annotations[res].description);\r
 \r
               ap.alignFrame.statusBar.setText(text.toString());\r
             }\r
         }\r
+        else\r
+          this.setToolTipText(null);\r
     }\r
 \r
     /**\r