X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=0a765cbb27c21e46eaec86e611420d80b204042e;hb=91d45e7c90753d8061883f351da796c50f467ef5;hp=a9d0e7540b57ea938f8bb67613fc024ee3944527;hpb=2e2e69270705be9d26a6f9b44de3cedcef2b9042;p=jalview.git diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java index a9d0e75..0a765cb 100644 --- a/src/jalview/gui/JvSwingUtils.java +++ b/src/jalview/gui/JvSwingUtils.java @@ -49,28 +49,29 @@ 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) { - Objects.requireNonNull(ttext, "Tootip text to format must not be null!"); + 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; } @@ -78,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 + "

" - : ttext; - } + + return (enclose ? "" : "") + + "

" + + ttext + "

" + ((enclose ? "" : "")); + } public static JButton makeButton(String label, String tooltip, @@ -120,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); } @@ -199,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); } /** @@ -276,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()); }