X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=e3992369361b633a856389b83baaf37a87780e40;hb=87841c5602b91a6639eddba560456d09951ea2c8;hp=65be457b655df42e62af87a5b3272b5835ca010b;hpb=91ef57a97eda85f9bb7b6f68bba52e06f19c29b8;p=jalview.git
diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index 65be457..e399236 100644
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -20,18 +20,22 @@
*/
package jalview.gui;
-import jalview.util.MessageManager;
-
import java.awt.BorderLayout;
import java.awt.Color;
+import java.awt.Component;
import java.awt.Font;
import java.awt.GridLayout;
import java.awt.Rectangle;
import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.List;
import java.util.Objects;
import javax.swing.AbstractButton;
+import javax.swing.BorderFactory;
import javax.swing.JButton;
+import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JMenu;
@@ -39,6 +43,10 @@ import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JScrollBar;
import javax.swing.SwingConstants;
+import javax.swing.border.Border;
+import javax.swing.border.TitledBorder;
+
+import jalview.util.MessageManager;
/**
* useful functions for building Swing GUIs
@@ -60,26 +68,23 @@ public final class JvSwingUtils
*/
public static String wrapTooltip(boolean enclose, String ttext)
{
- Objects.requireNonNull(ttext, "Tootip text to format must not be null!");
+ Objects.requireNonNull(ttext,
+ "Tootip text to format must not be null!");
ttext = ttext.trim();
boolean maxLengthExceeded = false;
- /*
- * Split into lines if already separated by
tags.
- *
- * TODO what about ,
,
?
- */
if (ttext.contains("
"))
{
- String[] htmllines = ttext.split("
");
- for (String line : htmllines)
- {
- maxLengthExceeded = line.length() > 60;
- if (maxLengthExceeded)
- {
- break;
- }
- }
+ maxLengthExceeded = false;
+// String[] htmllines = ttext.split("
");
+// for (String line : htmllines)
+// {
+// maxLengthExceeded = line.length() > 60;
+// if (maxLengthExceeded)
+// {
+// break;
+// }
+// }
}
else
{
@@ -91,9 +96,15 @@ public final class JvSwingUtils
return enclose ? "" + ttext + "" : ttext;
}
- return enclose ? "
" - + ttext + "
" - : ttext; + return (enclose ? "" : "") + // BH 2018 + + "" + + ttext + + "