X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=a022c85aa5e9af30856bb6ec6212ed57d9244727;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=8a735ed6e937fab580fdaf9c60b7671f13384356;hpb=49db0dff1da16c3355b43a41498c1fc93ef47e91;p=jalview.git
diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index 8a735ed..a022c85 100644
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -35,8 +35,10 @@ import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JComboBox;
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;
import javax.swing.border.Border;
@@ -57,7 +59,6 @@ public final class JvSwingUtils
"
"
: "
"
);
-
/**
* wrap a bare html safe string to around 60 characters per line using a CSS
* style class specifying word-wrap and break-word
@@ -74,8 +75,8 @@ public final class JvSwingUtils
Objects.requireNonNull(ttext,
"Tootip text to format must not be null!");
ttext = ttext.trim().replaceAll("
", "
");
-
boolean maxLengthExceeded = false;
+
boolean isHTML = ttext.startsWith("");
if (isHTML)
{
@@ -171,6 +172,29 @@ public final class JvSwingUtils
label.setToolTipText(tooltip);
}
+ // From 2.11.2 merge
+ public static void mgAddtoLayout(JPanel cpanel, String tooltip,
+ JLabel jLabel, JComponent name)
+ {
+ mgAddtoLayout(cpanel, tooltip, jLabel, name, null);
+ }
+
+ public static void mgAddtoLayout(JPanel cpanel, String tooltip,
+ JLabel jLabel, JComponent name, String params)
+ {
+ cpanel.add(jLabel);
+ if (params == null)
+ {
+ cpanel.add(name);
+ }
+ else
+ {
+ cpanel.add(name, params);
+ }
+ name.setToolTipText(tooltip);
+ jLabel.setToolTipText(tooltip);
+ }
+
/**
* standard font for labels and check boxes in dialog boxes
*