Repository: karaf Updated Branches: refs/heads/master aa9c0acff -> 9ddc2a751
[KARAF-1137] Fix rendering of the bundle:info command Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9ddc2a75 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9ddc2a75 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9ddc2a75 Branch: refs/heads/master Commit: 9ddc2a751cb8c8fb3f56cf6288c8f73028445ed8 Parents: aa9c0ac Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Jul 10 07:36:23 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Jul 10 07:36:23 2014 +0200 ---------------------------------------------------------------------- bundle/core/pom.xml | 1 + .../karaf/bundle/command/wikidoc/WikiParser.java | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/9ddc2a75/bundle/core/pom.xml ---------------------------------------------------------------------- diff --git a/bundle/core/pom.xml b/bundle/core/pom.xml index 1f568b7..dea1229 100644 --- a/bundle/core/pom.xml +++ b/bundle/core/pom.xml @@ -130,6 +130,7 @@ org.apache.karaf.bundle.command*, org.apache.karaf.bundle.core.internal, org.apache.karaf.bundle.core.internal.osgi, + org.apache.karaf.util, org.apache.karaf.util.jaas, org.apache.karaf.util.maven, org.apache.karaf.util.tracker, http://git-wip-us.apache.org/repos/asf/karaf/blob/9ddc2a75/bundle/core/src/main/java/org/apache/karaf/bundle/command/wikidoc/WikiParser.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/command/wikidoc/WikiParser.java b/bundle/core/src/main/java/org/apache/karaf/bundle/command/wikidoc/WikiParser.java index 8ec3d5b..d98208f 100644 --- a/bundle/core/src/main/java/org/apache/karaf/bundle/command/wikidoc/WikiParser.java +++ b/bundle/core/src/main/java/org/apache/karaf/bundle/command/wikidoc/WikiParser.java @@ -16,6 +16,8 @@ */ package org.apache.karaf.bundle.command.wikidoc; +import org.apache.karaf.util.StringEscapeUtils; + import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; @@ -33,10 +35,13 @@ public class WikiParser { } public void parse(String line) { - StringTokenizer tokenizer = new StringTokenizer(line , "[h*", true); + String unescaped = StringEscapeUtils.unescapeJava(line); + StringTokenizer tokenizer = new StringTokenizer(unescaped, "\u001B[h*", true); while (tokenizer.hasMoreTokens()) { String token = tokenizer.nextToken(); - if ("[".equals(token)) { + if ("\u001B".equals(token)) { + parseEsc(tokenizer, token); + } else if ("[".equals(token)) { parseLink(tokenizer); } else if ("h".equals(token)) { parseHeading(tokenizer); @@ -47,6 +52,10 @@ public class WikiParser { } } } + + private void parseEsc(StringTokenizer tokenizer, String token) { + visitor.text(token + tokenizer.nextToken() + tokenizer.nextToken("\u001B[]")); + } private void parseEnumeration(StringTokenizer tokenizer) { String text = tokenizer.nextToken("-\n");
