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-4390 don't output alignment to text panel and stdout when lots of sequences proce...
[jalview.git]
/
src
/
jalview
/
util
/
ParseHtmlBodyAndLinks.java
diff --git
a/src/jalview/util/ParseHtmlBodyAndLinks.java
b/src/jalview/util/ParseHtmlBodyAndLinks.java
index
6d02d64
..
0f2d01d
100644
(file)
--- a/
src/jalview/util/ParseHtmlBodyAndLinks.java
+++ b/
src/jalview/util/ParseHtmlBodyAndLinks.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-20,6
+20,8
@@
*/
package jalview.util;
*/
package jalview.util;
+import java.util.Locale;
+
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
@@
-97,13
+99,13
@@
public class ParseHtmlBodyAndLinks
public ParseHtmlBodyAndLinks(String description, boolean removeHTML,
String newline)
{
public ParseHtmlBodyAndLinks(String description, boolean removeHTML,
String newline)
{
- StringBuilder sb = new StringBuilder(description.length());
if (description == null || description.length() == 0)
{
htmlContent = false;
return;
}
if (description == null || description.length() == 0)
{
htmlContent = false;
return;
}
- if (description.toUpperCase().indexOf("<HTML>") == -1)
+ StringBuilder sb = new StringBuilder(description.length());
+ if (description.toUpperCase(Locale.ROOT).indexOf("<HTML>") == -1)
{
htmlContent = false;
}
{
htmlContent = false;
}
@@
-129,7
+131,7
@@
public class ParseHtmlBodyAndLinks
token = token.substring(0, startTag);
}
token = token.substring(0, startTag);
}
- if (tag != null && tag.toUpperCase().startsWith("A HREF="))
+ if (tag != null && tag.toUpperCase(Locale.ROOT).startsWith("A HREF="))
{
if (token.length() > 0)
{
{
if (token.length() > 0)
{
@@
-153,8
+155,8
@@
public class ParseHtmlBodyAndLinks
{
// instead of parsing the html into plaintext
// clean the description ready for embedding in html
{
// instead of parsing the html into plaintext
// clean the description ready for embedding in html
- sb = new StringBuilder(LEFT_ANGLE_BRACKET_PATTERN
- .matcher(description).replaceAll("<"));
+ sb = new StringBuilder(LEFT_ANGLE_BRACKET_PATTERN.matcher(description)
+ .replaceAll("<"));
}
content = translateEntities(sb.toString());
}
}
content = translateEntities(sb.toString());
}