X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=052c3145a6fc0552da876cac47869d1fafc45aaf;hb=f41d78dbf890fbb7597f75019d05841312fa4f52;hp=a0bc7c9e91d55749f3d6e2d8392f7767cf4dd8be;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java index a0bc7c9..052c314 100644 --- a/src/jalview/gui/JvSwingUtils.java +++ b/src/jalview/gui/JvSwingUtils.java @@ -28,6 +28,7 @@ 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; @@ -48,27 +49,47 @@ import javax.swing.SwingConstants; public final class JvSwingUtils { /** - * wrap a bare html safe string to around 60 characters per line using a - * - * - * field - * @param enclose TODO - * @param ttext + * 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 + * @param ttext * * @return */ 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 maxLengthExceeded = false; + + if (ttext.contains("
")) { - return enclose ? "" + ttext + "" : ttext; + String[] htmllines = ttext.split("
"); + for (String line : htmllines) + { + maxLengthExceeded = line.length() > 60; + if (maxLengthExceeded) + { + break; + } + } } else { - return (enclose ? "" : "") - + "
" + ttext - + "
" + ((enclose ? "" : "")); + maxLengthExceeded = ttext.length() > 60; } + + if (!maxLengthExceeded) + { + return enclose ? "" + ttext + "" : ttext; + } + + return (enclose ? "" : "") + + "

" + + ttext + "

" + ((enclose ? "" : "")); + } public static JButton makeButton(String label, String tooltip, @@ -128,12 +149,8 @@ public final class JvSwingUtils JPanel laypanel = new JPanel(new GridLayout(1, 2)); JPanel labPanel = new JPanel(new BorderLayout()); JPanel valPanel = new JPanel(); - // laypanel.setSize(panel.getPreferredSize()); - // laypanel.setLayout(null); labPanel.setBounds(new Rectangle(7, 7, 158, 23)); valPanel.setBounds(new Rectangle(172, 7, 270, 23)); - // labPanel.setLayout(new GridLayout(1,1)); - // valPanel.setLayout(new GridLayout(1,1)); labPanel.add(label, BorderLayout.WEST); valPanel.add(valBox); laypanel.add(labPanel);