From: tcofoegbu Date: Thu, 20 Aug 2015 14:00:13 +0000 (+0100) Subject: merge X-Git-Tag: Release_2_10_0~530 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=95dd7184bda6e9053dfa5c518410b2956feca73b;p=jalview.git merge --- 95dd7184bda6e9053dfa5c518410b2956feca73b diff --cc src/jalview/gui/JvSwingUtils.java index c4ed0dc,65be457..2cba586 --- a/src/jalview/gui/JvSwingUtils.java +++ b/src/jalview/gui/JvSwingUtils.java @@@ -62,8 -62,13 +62,8 @@@ public final class JvSwingUtil { Objects.requireNonNull(ttext, "Tootip text to format must not be null!"); ttext = ttext.trim(); - boolean maxLenghtExceeded = false; + boolean maxLengthExceeded = false; - /* - * Split into lines if already separated by
tags. - * - * TODO what about
,
,
? - */ if (ttext.contains("
")) { String[] htmllines = ttext.split("
"); @@@ -85,12 -90,10 +85,11 @@@ { return enclose ? "" + ttext + "" : ttext; } - else - { + - return enclose ? "

" - + ttext + "

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

" + + ttext + "

" + ((enclose ? "" : "")); - } ++ } public static JButton makeButton(String label, String tooltip,