X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=c4ed0dc4b664e473a27d2103358cd7a8ab8b12b6;hb=72e606411a2f5ceed085c87f5440574128a43098;hp=f38407b2f4f652e3395790281da908aa9ab01a2c;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git
diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index f38407b..c4ed0dc 100644
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -1,6 +1,6 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
@@ -20,17 +20,24 @@
*/
package jalview.gui;
+import jalview.util.MessageManager;
+
+import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Font;
+import java.awt.GridLayout;
import java.awt.Rectangle;
import java.awt.event.ActionListener;
+import java.util.Objects;
+import javax.swing.AbstractButton;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
+import javax.swing.JScrollBar;
import javax.swing.SwingConstants;
/**
@@ -53,15 +60,36 @@ public final class JvSwingUtils
*/
public static String wrapTooltip(boolean enclose, String ttext)
{
- if (ttext.length() < 60)
+ Objects.requireNonNull(ttext, "Tootip text to format must not be null!");
+ ttext = ttext.trim();
+ boolean maxLenghtExceeded = false;
+
+ if (ttext.contains("
"))
+ {
+ String[] htmllines = ttext.split("
");
+ for (String line : htmllines)
+ {
+ maxLenghtExceeded = line.length() > 60;
+ if (maxLenghtExceeded)
+ {
+ break;
+ }
+ }
+ }
+ else
+ {
+ maxLenghtExceeded = ttext.length() > 60;
+ }
+
+ if (!maxLenghtExceeded)
{
return enclose ? "" + ttext + "" : ttext;
}
else
{
return (enclose ? "" : "")
- + "
" + ttext - + " |
" + + ttext + "
" + ((enclose ? "