[jboss-svn-commits] JBL Code SVN: r29893 - labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/java/org/jboss/labs/clearspace/plugin/wiki.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2009-11-02 10:53:37 -0500 (Mon, 02 Nov 2009)
New Revision: 29893

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/java/org/jboss/labs/clearspace/plugin/wiki/WikiMacro.java
Log:
Changed implementation of method convertToOriginalWikiText.
Line endings are added after content of P and BR tags.

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/java/org/jboss/labs/clearspace/plugin/wiki/WikiMacro.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/java/org/jboss/labs/clearspace/plugin/wiki/WikiMacro.java	2009-11-02 15:43:32 UTC (rev 29892)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/java/org/jboss/labs/clearspace/plugin/wiki/WikiMacro.java	2009-11-02 15:53:37 UTC (rev 29893)
@@ -78,6 +78,27 @@
   }
 
   @Override
+  protected String convertToOriginalWikiText(Element element) {
+    StringBuilder value = new StringBuilder();
+    NodeList childNodes = element.getChildNodes();
+    for (int i = 0; i < childNodes.getLength(); i++) {
+      Node node = childNodes.item(i);
+      String nodeContent = node.getTextContent();
+      if ("p".equalsIgnoreCase(node.getNodeName())) {
+        value.append(nodeContent);
+        if (!nodeContent.endsWith("\n")) {
+          value.append("\n");
+        }
+      } else if ("br".equalsIgnoreCase(node.getNodeName())) {
+        value.append("\n");
+      } else {
+        value.append(nodeContent);
+      }
+    }
+    return value.toString();
+  }
+
+  @Override
   public int getOrder() {
     // very important - we need to ensure to run this macro before other macros
     // like code, document etc.