X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=a022c85aa5e9af30856bb6ec6212ed57d9244727;hb=747167089ecf8d6afc70d417f5a20352e029bd95;hp=25ba68d2894a5aa0398fdaa0ea0d0de571e86188;hpb=c794c5033adeee182b03a5ea92c0a7495a29661f;p=jalview.git
diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index 25ba68d..a022c85 100644
--- 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.Color;
import java.awt.Component;
import java.awt.Container;
@@ -37,13 +35,18 @@ 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;
import javax.swing.border.TitledBorder;
+import jalview.util.MessageManager;
+import jalview.util.Platform;
+
/**
* useful functions for building Swing GUIs
*
@@ -52,12 +55,17 @@ import javax.swing.border.TitledBorder;
*/
public final class JvSwingUtils
{
+ static final String HTML_PREFIX = (Platform.isJS() ?
+ "
"
+ : "
"
+ );
/**
* wrap a bare html safe string to around 60 characters per line using a CSS
* style class specifying word-wrap and break-word
*
* @param enclose
- * if true, add <html> wrapper tags
+ * if true, add <html> wrapper tags (currently false for only
+ * two references -- both in Jws2Discoverer --
* @param ttext
*
* @return
@@ -66,40 +74,40 @@ public final class JvSwingUtils
{
Objects.requireNonNull(ttext,
"Tootip text to format must not be null!");
- ttext = ttext.trim();
+ ttext = ttext.trim().replaceAll("
", "
");
boolean maxLengthExceeded = false;
- if (ttext.contains("
"))
+ boolean isHTML = ttext.startsWith("");
+ if (isHTML)
{
- String[] htmllines = ttext.split("
");
- for (String line : htmllines)
- {
- maxLengthExceeded = line.length() > 60;
- if (maxLengthExceeded)
- {
+ ttext = ttext.substring(6);
+ }
+ if (ttext.endsWith(""))
+ {
+ isHTML = true;
+ ttext = ttext.substring(0, ttext.length() - 7);
+ }
+ boolean hasBR = ttext.contains("
");
+ enclose |= isHTML || hasBR;
+ if (hasBR)
+ {
+ int pt = -1, ptlast = -4;
+ while ((pt = ttext.indexOf("
", pt + 1)) >= 0) {
+ if (pt - ptlast - 4 > 60) {
+ maxLengthExceeded = true;
break;
}
}
}
- else
+ else
{
maxLengthExceeded = ttext.length() > 60;
}
- if (!maxLengthExceeded)
- {
- return enclose ? "" + ttext + "" : ttext;
- }
-
- return (enclose ? "" : "")
- // BH 2018
- + "
"
-// + "
"
- + ttext
- + "
"
-// + ""
- + ((enclose ? "" : ""));
+ String ret = (!enclose ? ttext : maxLengthExceeded ? HTML_PREFIX + ttext + "
" :
+ "" + ttext + "");
+ //System.out.println("JvSwUtil " + enclose + " " + maxLengthExceeded + " " + ret);
+ return ret;
}
public static JButton makeButton(String label, String tooltip,
@@ -164,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
*