You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dh...@apache.org on 2014/08/04 18:20:57 UTC

git commit: CAMEL-7656: Fixed Javadoc parser to handle incorrect non-breaking space parsing in Java6 javax swing Parser

Repository: camel
Updated Branches:
  refs/heads/master 2e00b551c -> 3b0b54995


CAMEL-7656: Fixed Javadoc parser to handle incorrect non-breaking space parsing in Java6 javax swing Parser


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3b0b5499
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3b0b5499
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3b0b5499

Branch: refs/heads/master
Commit: 3b0b549957263f3574cb5b07e1329bd3d62d2fd6
Parents: 2e00b55
Author: Dhiraj Bokde <dh...@yahoo.com>
Authored: Mon Aug 4 09:18:56 2014 -0700
Committer: Dhiraj Bokde <dh...@yahoo.com>
Committed: Mon Aug 4 09:20:12 2014 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/camel/maven/JavadocParser.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/3b0b5499/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
index 24e4489..706e0b5 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
@@ -37,6 +37,7 @@ import org.apache.commons.lang.StringEscapeUtils;
 public class JavadocParser extends Parser {
 
     private static final String NON_BREAKING_SPACE = "\u00A0";
+    private static final String JAVA6_NON_BREAKING_SPACE = "&nbsp";
 
     private final String hrefPattern;
 
@@ -121,7 +122,8 @@ public class JavadocParser extends Parser {
     }
 
     private static String unescapeHtml(String htmlString) {
-        String result = StringEscapeUtils.unescapeHtml(htmlString).replaceAll(NON_BREAKING_SPACE, " ");
+        String result = StringEscapeUtils.unescapeHtml(htmlString).replaceAll(NON_BREAKING_SPACE, " ")
+            .replaceAll(JAVA6_NON_BREAKING_SPACE, " ");
         try {
             result = URLDecoder.decode(result, "UTF-8");
         } catch (UnsupportedEncodingException ignored) {