X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=541028aa175fff782b4d850b3d63c6dc9948ce71;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=a9d0e7540b57ea938f8bb67613fc024ee3944527;hpb=2e2e69270705be9d26a6f9b44de3cedcef2b9042;p=jalview.git diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java index a9d0e75..541028a 100644 --- a/src/jalview/gui/JvSwingUtils.java +++ b/src/jalview/gui/JvSwingUtils.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -49,12 +49,12 @@ 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 */ @@ -62,15 +62,15 @@ public final class JvSwingUtils { 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 +78,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,