git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2668 add tests for HMMER commands, annotation and io
[jalview.git]
/
src
/
jalview
/
gui
/
JvSwingUtils.java
diff --git
a/src/jalview/gui/JvSwingUtils.java
b/src/jalview/gui/JvSwingUtils.java
index
a9d0e75
..
052c314
100644
(file)
--- a/
src/jalview/gui/JvSwingUtils.java
+++ b/
src/jalview/gui/JvSwingUtils.java
@@
-49,12
+49,12
@@
import javax.swing.SwingConstants;
public final class JvSwingUtils
{
/**
public final class JvSwingUtils
{
/**
- * wrap a bare html safe string to around 60 characters per line using a
- * <table width=350>
- * <tr>
- * <td></td> 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
*/
*
* @return
*/
@@
-62,15
+62,15
@@
public final class JvSwingUtils
{
Objects.requireNonNull(ttext, "Tootip text to format must not be null!");
ttext = ttext.trim();
{
Objects.requireNonNull(ttext, "Tootip text to format must not be null!");
ttext = ttext.trim();
- boolean maxLenghtExceeded = false;
+ boolean maxLengthExceeded = false;
if (ttext.contains("<br>"))
{
String[] htmllines = ttext.split("<br>");
for (String line : htmllines)
{
if (ttext.contains("<br>"))
{
String[] htmllines = ttext.split("<br>");
for (String line : htmllines)
{
- maxLenghtExceeded = line.length() > 60;
- if (maxLenghtExceeded)
+ maxLengthExceeded = line.length() > 60;
+ if (maxLengthExceeded)
{
break;
}
{
break;
}
@@
-78,19
+78,18
@@
public final class JvSwingUtils
}
else
{
}
else
{
- maxLenghtExceeded = ttext.length() > 60;
+ maxLengthExceeded = ttext.length() > 60;
}
}
- if (!maxLenghtExceeded)
+ if (!maxLengthExceeded)
{
return enclose ? "<html>" + ttext + "</html>" : ttext;
}
{
return enclose ? "<html>" + ttext + "</html>" : ttext;
}
- else
- {
- return enclose ? "<html><style> p.ttip {width: 350; text-align: justify; word-wrap: break-word;}</style><p class=\"ttip\">"
- + ttext + "</p></html>"
- : ttext;
- }
+
+ return (enclose ? "<html>" : "")
+ + "<style> p.ttip {width: 350; text-align: justify; word-wrap: break-word;}</style><p class=\"ttip\">"
+ + ttext + "</p>" + ((enclose ? "</html>" : ""));
+
}
public static JButton makeButton(String label, String tooltip,
}
public static JButton makeButton(String label, String tooltip,