From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 7 Mar 2018 11:30:09 +0000 (+0000)
Subject: Merge branch 'bug/JAL-2924nullTooltip' into releases/Release_2_10_4_Branch
X-Git-Tag: Release_2_10_4~51
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a545931fdd1c15ffcdca045a7c054310ee998eb6;hp=17617d568de6620954c0616344f532bcaa4b57cd;p=jalview.git

Merge branch 'bug/JAL-2924nullTooltip' into releases/Release_2_10_4_Branch
---

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 71cdc9c..260b771 100755
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -782,6 +782,10 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
       {
         this.setToolTipText(JvSwingUtils.wrapTooltip(true, description));
       }
+      else
+      {
+        this.setToolTipText(null); // no tooltip if null or empty description
+      }
     }
     else
     {