modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/HtmlUtility.java
| 117 ----------
modules/enterprise/server/plugins/jboss-software/src/test/java/org/rhq/enterprise/server/plugins/jboss/software/HtmlUtilityTest.java
| 15 -
2 files changed, 132 deletions(-)
New commits:
commit 0b250a4c5d886ceeca36ca19a34c864dfd687e3b
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Tue Mar 30 10:37:25 2010 -0400
delete HtmlUtility class and its test, since it is no longer used
diff --git
a/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/HtmlUtility.java
b/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/HtmlUtility.java
deleted file mode 100644
index bc1ec97..0000000
---
a/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/HtmlUtility.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.rhq.enterprise.server.plugins.jboss.software;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Ian Springer
- */
-public class HtmlUtility {
- private static final Map<String, Character> ENTITY_TO_CHAR_MAP = new
HashMap<String, Character>();
-
- static {
- ENTITY_TO_CHAR_MAP.put("<", '<');
- ENTITY_TO_CHAR_MAP.put(">", '>');
- ENTITY_TO_CHAR_MAP.put("&", '&');
- ENTITY_TO_CHAR_MAP.put(""", '"');
- ENTITY_TO_CHAR_MAP.put("à", 'à');
- ENTITY_TO_CHAR_MAP.put("À", 'À');
- ENTITY_TO_CHAR_MAP.put("â", 'â');
- ENTITY_TO_CHAR_MAP.put("ä", 'ä');
- ENTITY_TO_CHAR_MAP.put("Ä", 'Ä');
- ENTITY_TO_CHAR_MAP.put("Â", 'Â');
- ENTITY_TO_CHAR_MAP.put("å", 'å');
- ENTITY_TO_CHAR_MAP.put("Å", 'Å');
- ENTITY_TO_CHAR_MAP.put("æ", 'æ');
- ENTITY_TO_CHAR_MAP.put("Æ", 'Æ');
- ENTITY_TO_CHAR_MAP.put("ç", 'ç');
- ENTITY_TO_CHAR_MAP.put("Ç", 'Ç');
- ENTITY_TO_CHAR_MAP.put("é", 'é');
- ENTITY_TO_CHAR_MAP.put("É", 'É');
- ENTITY_TO_CHAR_MAP.put("è", 'è');
- ENTITY_TO_CHAR_MAP.put("È", 'È');
- ENTITY_TO_CHAR_MAP.put("ê", 'ê');
- ENTITY_TO_CHAR_MAP.put("Ê", 'Ê');
- ENTITY_TO_CHAR_MAP.put("ë", 'ë');
- ENTITY_TO_CHAR_MAP.put("Ë", 'Ë');
- ENTITY_TO_CHAR_MAP.put("ï", 'ï');
- ENTITY_TO_CHAR_MAP.put("Ï", 'Ï');
- ENTITY_TO_CHAR_MAP.put("ô", 'ô');
- ENTITY_TO_CHAR_MAP.put("Ô", 'Ô');
- ENTITY_TO_CHAR_MAP.put("ö", 'ö');
- ENTITY_TO_CHAR_MAP.put("Ö", 'Ö');
- ENTITY_TO_CHAR_MAP.put("ø", 'ø');
- ENTITY_TO_CHAR_MAP.put("Ø", 'Ø');
- ENTITY_TO_CHAR_MAP.put("ß", 'ß');
- ENTITY_TO_CHAR_MAP.put("ù", 'ù');
- ENTITY_TO_CHAR_MAP.put("Ù", 'Ù');
- ENTITY_TO_CHAR_MAP.put("û", 'û');
- ENTITY_TO_CHAR_MAP.put("Û", 'Û');
- ENTITY_TO_CHAR_MAP.put("ü", 'ü');
- ENTITY_TO_CHAR_MAP.put("Ü", 'Ü');
- ENTITY_TO_CHAR_MAP.put(" ", ' ');
- ENTITY_TO_CHAR_MAP.put("®", '\u00a9');
- ENTITY_TO_CHAR_MAP.put("©", '\u00ae');
- ENTITY_TO_CHAR_MAP.put("€", '\u20a0');
- }
-
- public static String unescapeHTML(String string) {
- if (string == null) {
- return null;
- }
- if (string.length() < 4) {
- // This is an optimization, since we know that no entities are less than 4
characters in length
- // (< and > are the shortest ones).
- return string;
- }
-
- StringBuilder unescapedString = new StringBuilder((int) (string.length() *
1.1));
- int index = 0;
- while (index < string.length()) {
- int ampersandIndex = string.indexOf("&", index);
- if (ampersandIndex >= 0 && ampersandIndex < (string.length() -
3)) {
- int semicolonIndex = string.indexOf(";", ampersandIndex + 1);
- if (semicolonIndex >= 0) {
- // Found an entity.
-
- // Append the substring from the index up to but not including the
ampersand.
- unescapedString.append(string.substring(index, ampersandIndex));
-
- String entity = string.substring(ampersandIndex, semicolonIndex +
1);
- // See if the entity is one we grok.
- Character c = ENTITY_TO_CHAR_MAP.get(entity);
- if (c != null) {
- // If we were able to map the entity to a character, append the
character.
- unescapedString.append(c);
- } else {
- // Otherwise, append the unknown entity as is.
- unescapedString.append(entity);
- }
-
- index = semicolonIndex + 1;
- } else {
- // No semicolon found - not an entity. Append the substring from the
index up to and including the
- // ampersand.
- unescapedString.append(string.substring(index, ampersandIndex + 1));
- index = ampersandIndex + 1;
- }
- } else {
- // No more entities in the string - append the rest of the original
string.
- unescapedString.append(string.substring(index));
- index = string.length();
- }
- }
-
- return unescapedString.toString();
- }
-
- public static void main(String[] args) {
- if (args.length != 1) {
- System.err.println("Usage: java " + HtmlUtility.class.getName() +
" html");
- System.exit(1);
- }
- String html = args[0];
- String unescapedHtml = unescapeHTML(html);
- System.out.println(unescapedHtml);
- }
-}
diff --git
a/modules/enterprise/server/plugins/jboss-software/src/test/java/org/rhq/enterprise/server/plugins/jboss/software/HtmlUtilityTest.java
b/modules/enterprise/server/plugins/jboss-software/src/test/java/org/rhq/enterprise/server/plugins/jboss/software/HtmlUtilityTest.java
deleted file mode 100644
index 5333080..0000000
---
a/modules/enterprise/server/plugins/jboss-software/src/test/java/org/rhq/enterprise/server/plugins/jboss/software/HtmlUtilityTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.rhq.enterprise.server.plugins.jboss.software;
-
-import org.testng.annotations.Test;
-
-/**
- * @author Ian Springer
- */
-public class HtmlUtilityTest {
- @Test
- public void testUnescapeHTML() throws Exception {
- String result = HtmlUtility.unescapeHTML("
<html>\nblah \n</html>&foo&bleh;");
- System.out.println("result=[" + result + "]");
- assert result.equals(" <html>\nblah
\n</html>&foo&bleh;");
- }
-}