X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Futil%2FParseHtmlBodyAndLinks.java;h=0f2d01d0b7618405e1f51ad5da68d1f4a5993856;hb=a9177efb4097815d9a8031aa22700c61a7d6260a;hp=102beadb8c926be24d4d4e9be5895a1fb375235a;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git
diff --git a/src/jalview/util/ParseHtmlBodyAndLinks.java b/src/jalview/util/ParseHtmlBodyAndLinks.java
index 102bead..0f2d01d 100644
--- a/src/jalview/util/ParseHtmlBodyAndLinks.java
+++ b/src/jalview/util/ParseHtmlBodyAndLinks.java
@@ -1,24 +1,29 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
- * Copyright (C) 2014 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.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.util;
+import java.util.Locale;
+
import java.util.ArrayList;
+import java.util.List;
import java.util.StringTokenizer;
import java.util.regex.Pattern;
@@ -30,6 +35,9 @@ import java.util.regex.Pattern;
*/
public class ParseHtmlBodyAndLinks
{
+ private static final Pattern LEFT_ANGLE_BRACKET_PATTERN = Pattern
+ .compile("<");
+
String orig = null;
public String getOrig()
@@ -47,9 +55,9 @@ public class ParseHtmlBodyAndLinks
return htmlContent;
}
- ArrayList links = new ArrayList();
+ List links = new ArrayList();
- StringBuffer sb = new StringBuffer();
+ String content;
/**
* result of parsing description - with or without HTML tags
@@ -59,7 +67,7 @@ public class ParseHtmlBodyAndLinks
public String getContent()
{
- return sb.toString();
+ return content;
}
/**
@@ -67,12 +75,19 @@ public class ParseHtmlBodyAndLinks
*
* @return
*/
- public ArrayList getLinks()
+ public List getLinks()
{
return links;
}
/**
+ * Parses the given html and
+ *
+ * - extracts any 'href' links to a list of "displayName|url" strings,
+ * retrievable by #getLinks
+ * - extracts the remaining text (with %LINK% placeholders replacing hrefs),
+ * retrievable by #getContent
+ *
*
* @param description
* - html or text content to be parsed
@@ -89,7 +104,8 @@ public class ParseHtmlBodyAndLinks
htmlContent = false;
return;
}
- if (description.toUpperCase().indexOf("") == -1)
+ StringBuilder sb = new StringBuilder(description.length());
+ if (description.toUpperCase(Locale.ROOT).indexOf("") == -1)
{
htmlContent = false;
}
@@ -100,7 +116,7 @@ public class ParseHtmlBodyAndLinks
String tag = null;
while (st.hasMoreElements())
{
- token = st.nextToken("&>");
+ token = st.nextToken(">");
if (token.equalsIgnoreCase("html") || token.startsWith("/"))
{
continue;
@@ -115,7 +131,7 @@ public class ParseHtmlBodyAndLinks
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)
{
@@ -130,18 +146,6 @@ public class ParseHtmlBodyAndLinks
{
sb.append(newline);
}
- else if (token.startsWith("lt;"))
- {
- sb.append("<" + token.substring(3));
- }
- else if (token.startsWith("gt;"))
- {
- sb.append(">" + token.substring(3));
- }
- else if (token.startsWith("amp;"))
- {
- sb.append("&" + token.substring(4));
- }
else
{
sb.append(token);
@@ -151,11 +155,18 @@ public class ParseHtmlBodyAndLinks
{
// instead of parsing the html into plaintext
// clean the description ready for embedding in html
- sb = new StringBuffer(Pattern.compile("<").matcher(description)
+ sb = new StringBuilder(LEFT_ANGLE_BRACKET_PATTERN.matcher(description)
.replaceAll("<"));
-
}
+ content = translateEntities(sb.toString());
+ }
+ private String translateEntities(String s)
+ {
+ s = s.replaceAll("&", "&");
+ s = s.replaceAll("<", "<");
+ s = s.replaceAll(">", ">");
+ return s;
}
/**
@@ -166,7 +177,7 @@ public class ParseHtmlBodyAndLinks
*/
public String getNonHtmlContent()
{
- return isHtmlContent() ? sb.toString() : orig;
+ return isHtmlContent() ? content : orig;
}
}