X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=8a735ed6e937fab580fdaf9c60b7671f13384356;hb=0751c58086542f9e0466201b624f84d1efd547bb;hp=41287d29fd49047ae59c9c41ce44f9dabf2701ae;hpb=17e4ea278bc9a5fb280db1252ce78b7a295215f5;p=jalview.git diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java index 41287d2..8a735ed 100644 --- a/src/jalview/gui/JvSwingUtils.java +++ b/src/jalview/gui/JvSwingUtils.java @@ -20,14 +20,10 @@ */ package jalview.gui; -import jalview.util.MessageManager; - -import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; +import java.awt.Container; 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; @@ -39,15 +35,16 @@ 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 * @@ -56,12 +53,18 @@ 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 @@ -70,46 +73,40 @@ public final class JvSwingUtils { Objects.requireNonNull(ttext, "Tootip text to format must not be null!"); - ttext = ttext.trim(); - boolean maxLengthExceeded = false; + ttext = ttext.trim().replaceAll("
", "
"); - if (ttext.contains("
")) + boolean maxLengthExceeded = false; + 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, @@ -155,54 +152,23 @@ public final class JvSwingUtils } /** + * A convenience method that that adds a component with label to a container, + * sets a tooltip on both component and label, and optionally specifies layout + * constraints for the added component (but not the label) * - * @param panel + * @param container * @param tooltip * @param label - * @param valBox - * @return the GUI element created that was added to the layout so it's - * attributes can be changed. + * @param comp + * @param constraints */ - public static JPanel addtoLayout(JPanel panel, String tooltip, - JComponent label, JComponent valBox) + public static void addtoLayout(Container container, String tooltip, + JComponent label, JComponent comp, String constraints) { - JPanel laypanel = new JPanel(new GridLayout(1, 2)); - JPanel labPanel = new JPanel(new BorderLayout()); - JPanel valPanel = new JPanel(); - labPanel.setBounds(new Rectangle(7, 7, 158, 23)); - valPanel.setBounds(new Rectangle(172, 7, 270, 23)); - labPanel.add(label, BorderLayout.WEST); - valPanel.add(valBox); - laypanel.add(labPanel); - laypanel.add(valPanel); - valPanel.setToolTipText(tooltip); - labPanel.setToolTipText(tooltip); - valBox.setToolTipText(tooltip); - panel.add(laypanel); - panel.validate(); - return laypanel; - } - - 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); + container.add(label); + container.add(comp, constraints); + comp.setToolTipText(tooltip); // this doesn't seem to show? + label.setToolTipText(tooltip); } /** @@ -367,7 +333,7 @@ public final class JvSwingUtils /** * Adds a titled border to the component in the default font and position (top - * left), optionally witht italic text + * left), optionally with italic text * * @param comp * @param title