git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 70f9c47)
JAL-1627 removed extra spaces at end of tooltip
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 12 Jun 2015 16:50:02 +0000 (17:50 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 12 Jun 2015 16:50:02 +0000 (17:50 +0100)
src/jalview/gui/JvSwingUtils.java patch | blob | history

diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index e4cbf61..b6f85b3 100644 (file)
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -20,8 +20,6 @@
  */
 package jalview.gui;
 
-import jalview.util.MessageManager;
-
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Font;
@@ -39,6 +37,8 @@ import javax.swing.JPanel;
 import javax.swing.JScrollBar;
 import javax.swing.SwingConstants;
 
+import jalview.util.MessageManager;
+
 /**
  * useful functions for building Swing GUIs
  * 
@@ -60,15 +60,34 @@ public final class JvSwingUtils
   public static String wrapTooltip(boolean enclose, String ttext)
   {
     ttext = ttext.trim();
-    if (ttext.length() < 60)
+    boolean maxLenghtExceeded = false;
+
+    if (ttext.contains("<br>"))
+    {
+      String[] htmllines = ttext.split("<br>");
+      for (String line : htmllines)
+      {
+        maxLenghtExceeded = line.length() > 60;
+        if (maxLenghtExceeded)
+        {
+          break;
+        }
+      }
+    }
+    else
+    {
+      maxLenghtExceeded = ttext.length() > 60;
+    }
+
+    if (!maxLenghtExceeded)
     {
       return enclose ? "<html>" + ttext + "</html>" : ttext;
     }
     else
     {
-      return (enclose ? "<html>" : "")
-              + "<table width=350 border=0><tr><td>" + ttext
-              + "</td></tr></table>" + ((enclose ? "</html>" : ""));
+      return (enclose ? "<html><table width=350 border=0><tr><td align=justify>"
+              : "")
+              + ttext + ((enclose ? "</td></tr></table></html>" : ""));
     }
   }