X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=0a765cbb27c21e46eaec86e611420d80b204042e;hb=797a5cffdb1e932a419094a828ad3ccf4c3e5568;hp=b6f85b3d11173c3394b28c20d717900aebdf9fcd;hpb=872491e84ca43e8ec17ef8c0395d1b7a45e6b5d4;p=jalview.git diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java index b6f85b3..0a765cb 100644 --- a/src/jalview/gui/JvSwingUtils.java +++ b/src/jalview/gui/JvSwingUtils.java @@ -20,12 +20,15 @@ */ package jalview.gui; +import jalview.util.MessageManager; + import java.awt.BorderLayout; import java.awt.Color; 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; @@ -37,8 +40,6 @@ import javax.swing.JPanel; import javax.swing.JScrollBar; import javax.swing.SwingConstants; -import jalview.util.MessageManager; - /** * useful functions for building Swing GUIs * @@ -48,27 +49,29 @@ import jalview.util.MessageManager; 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) { + Objects.requireNonNull(ttext, + "Tootip text to format must not be null!"); ttext = ttext.trim(); - boolean maxLenghtExceeded = false; + boolean maxLengthExceeded = false; if (ttext.contains("
")) { String[] htmllines = ttext.split("
"); for (String line : htmllines) { - maxLenghtExceeded = line.length() > 60; - if (maxLenghtExceeded) + maxLengthExceeded = line.length() > 60; + if (maxLengthExceeded) { break; } @@ -76,19 +79,18 @@ public final class JvSwingUtils } else { - maxLenghtExceeded = ttext.length() > 60; + maxLengthExceeded = ttext.length() > 60; } - if (!maxLenghtExceeded) + if (!maxLengthExceeded) { return enclose ? "" + ttext + "" : ttext; } - else - { - return (enclose ? "
" - : "") - + ttext + ((enclose ? "
" : "")); - } + + return (enclose ? "" : "") + + "

" + + ttext + "

" + ((enclose ? "" : "")); + } public static JButton makeButton(String label, String tooltip, @@ -118,8 +120,8 @@ public final class JvSwingUtils for (int i = 0, iSize = menu.getMenuComponentCount(); i < iSize; i++) { if (menu.getMenuComponent(i) instanceof JMenu - && ((JMenu) menu.getMenuComponent(i)).getText().equals( - submenu)) + && ((JMenu) menu.getMenuComponent(i)).getText() + .equals(submenu)) { submenuinstance = (JMenu) menu.getMenuComponent(i); } @@ -148,12 +150,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); @@ -201,8 +199,10 @@ public final class JvSwingUtils public static Font getLabelFont(boolean bold, boolean italic) { - return new java.awt.Font("Verdana", (!bold && !italic) ? Font.PLAIN - : (bold ? Font.BOLD : 0) + (italic ? Font.ITALIC : 0), 11); + return new java.awt.Font("Verdana", + (!bold && !italic) ? Font.PLAIN + : (bold ? Font.BOLD : 0) + (italic ? Font.ITALIC : 0), + 11); } /** @@ -278,8 +278,8 @@ public final class JvSwingUtils * of possible positions. */ float fraction = proportion - * (scrollbar.getMaximum() - scrollbar.getMinimum() - scrollbar - .getModel().getExtent()) + * (scrollbar.getMaximum() - scrollbar.getMinimum() + - scrollbar.getModel().getExtent()) + (scrollbar.getModel().getExtent() / 2f); return Math.min(Math.round(fraction), scrollbar.getMaximum()); }