git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: f30cdeb)
Merge branch 'bug/JAL-998_wrap-sequence-tooltip' into Release_2_8_2_Branch
authorCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 26 Nov 2014 16:06:04 +0000 (16:06 +0000)
committerCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 26 Nov 2014 16:06:04 +0000 (16:06 +0000)
src/jalview/gui/JvSwingUtils.java patch | blob | history
src/jalview/gui/SeqPanel.java patch | blob | history

diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index d546584..e433243 100644 (file)
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -53,14 +53,14 @@ public final class JvSwingUtils
    */
   public static String wrapTooltip(boolean enclose, String ttext)
   {
-         
     if (ttext.length() < 60)
     {
-      return enclose ? "<html>"+ttext+"</html>" : ttext;
+      return enclose ? "<html>" + ttext + "</html>" : ttext;
     }
     else
     {
-      return (enclose ? "<html>" : "") + "<table width=350 border=0><tr><td>" + ttext
+      return (enclose ? "<html>" : "")
+              + "<table width=350 border=0><tr><td>" + ttext
               + "</td></tr></table>" + ((enclose ? "</html>" : ""));
     }
   }
diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 3b41620..c10a4a9 100644 (file)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -113,7 +113,7 @@ public class SeqPanel extends JPanel implements MouseListener,
 
   private final SequenceAnnotationReport seqARep;
 
-  StringBuffer tooltipText = new StringBuffer("<html>");
+  StringBuffer tooltipText = new StringBuffer();
 
   String tmpString;
 
@@ -728,11 +728,6 @@ public class SeqPanel extends JPanel implements MouseListener,
       {
         if (groups[g].getStartRes() <= res && groups[g].getEndRes() >= res)
         {
-          if (tooltipText.length() > 6)
-          {
-            tooltipText.append("<br>");
-          }
-
           if (!groups[g].getName().startsWith("JTreeGroup")
                   && !groups[g].getName().startsWith("JGroup"))
           {
@@ -764,12 +759,13 @@ public class SeqPanel extends JPanel implements MouseListener,
     }
     else
     {
-      tooltipText.append("</html>");
       if (lastTooltip == null
               || !lastTooltip.equals(tooltipText.toString()))
       {
-        setToolTipText(JvSwingUtils.wrapTooltip(true,
-                tooltipText.toString()));
+        String formatedTooltipText = JvSwingUtils.wrapTooltip(true,
+                tooltipText.toString());
+        // String formatedTooltipText = tooltipText.toString();
+        setToolTipText(formatedTooltipText);
         lastTooltip = tooltipText.toString();
       }