[jboss-svn-commits] JBL Code SVN: r26802 - in labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src: test/java/org/jboss/labs/clearspace/plugin/nfm/converter and 1 other directory.

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

Author: lkrzyzanek
Date: 2009-06-02 06:59:33 -0400 (Tue, 02 Jun 2009)
New Revision: 26802

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCode2CSHTMLParseEventHandler.java
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCodeConverterTest.java
Log:
added lists handlers

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCode2CSHTMLParseEventHandler.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCode2CSHTMLParseEventHandler.java	2009-06-02 01:18:26 UTC (rev 26801)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCode2CSHTMLParseEventHandler.java	2009-06-02 10:59:33 UTC (rev 26802)
@@ -76,6 +76,9 @@
         break;
       case BBCodeParser.EVENT_QUOTE:
         write("<pre __jive_macro_name=\"quote\" class=\"jive_text_macro jive_macro_quote\">");
+        if (string != null && string.length() > 0) {
+          write("\"" + StringEscapeUtils.escapeHtml(string) + "\" wrote:</br>");
+        }
         isInPre++;
         break;
       case BBCodeParser.EVENT_CODE:
@@ -83,12 +86,16 @@
         write("<pre __default_attr=\"java\" __jive_macro_name=\"code\" class=\"jive_text_macro jive_macro_code\">");
         break;
       case BBCodeParser.EVENT_UNORDERED_LIST:
+        write("<ul>");
         break;
       case BBCodeParser.EVENT_NUMERICALLY_ORDERED_LIST:
+        write("<ol type=\"1\">");
         break;
       case BBCodeParser.EVENT_ALPHABETICALLY_ORDERED_LIST:
+        write("<ol type=\"a\">");
         break;
       case BBCodeParser.EVENT_ITEM:
+        write("<li>");
         break;
       case BBCodeParser.EVENT_LINK:
         write("<a href=\"" + string + "\">" + string);
@@ -122,12 +129,14 @@
         isInPre--;
         break;
       case BBCodeParser.EVENT_UNORDERED_LIST:
+        write("</ul>");
         break;
       case BBCodeParser.EVENT_NUMERICALLY_ORDERED_LIST:
-        break;
       case BBCodeParser.EVENT_ALPHABETICALLY_ORDERED_LIST:
+        write("</ol>");
         break;
       case BBCodeParser.EVENT_ITEM:
+        write("</li>");
         break;
       case BBCodeParser.EVENT_LINK:
         write("</a>");
@@ -147,21 +156,7 @@
 
   private ParseEventHandler tagHandler = new ParseEventHandler() {
     public void handle(ParseEvent event) {
-      if (event instanceof TagParser.OpenEvent) {
-        // TagParser.OpenEvent openEvent = (TagParser.OpenEvent)event;
-        // switch (openEvent.getType())
-        // {
-        // case TagParser.EVENT_TAG:
-        // break;
-        // }
-      } else if (event instanceof TagParser.CloseEvent) {
-        // TagParser.CloseEvent closeEvent = (TagParser.CloseEvent)event;
-        // switch (closeEvent.getType())
-        // {
-        // case TagParser.EVENT_TAG:
-        // break;
-        // }
-      } else {
+      if (event instanceof TextEvent) {
         TextEvent textEvent = (TextEvent) event;
         lineBreakParser.parse(textEvent.chars(), textEvent.offset(), textEvent
             .length());

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCodeConverterTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCodeConverterTest.java	2009-06-02 01:18:26 UTC (rev 26801)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/converter/BBCodeConverterTest.java	2009-06-02 10:59:33 UTC (rev 26802)
@@ -34,8 +34,14 @@
     assertEquals("<p><span style=\"color: red\">color</span></p>", converter.convert("[color=red]color[/color]"));
     assertEquals("<p><span style=\"font-size: 7px; line-height: normal\">size7</span></p>", converter.convert("[size=7]size7[/size]"));
     assertEquals("<p><pre __jive_macro_name=\"quote\" class=\"jive_text_macro jive_macro_quote\">quote</pre></p>", converter.convert("[quote]quote[/quote]"));
+    assertEquals("<p><pre __jive_macro_name=\"quote\" class=\"jive_text_macro jive_macro_quote\">\"username at somedomain.com\" wrote:</br>quote</pre></p>", converter.convert("[quote=username at somedomain.com]quote[/quote]"));
     assertEquals("<p><pre __default_attr=\"java\" __jive_macro_name=\"code\" class=\"jive_text_macro jive_macro_code\">code</pre></p>", converter.convert("[code]code[/code]"));
     assertEquals("<p><a href=\"www.jboss.org\">www.jboss.org</a></p>", converter.convert("[url]www.jboss.org[/url]"));
+    
+    assertEquals("<p><ul><li>point1</li><li>point2</li></ul></p>", converter.convert("[list][*]point1[*]point2[/list]"));
+    assertEquals("<p><ol type=\"1\"><li>1</li><li>2</li></ol></p>", converter.convert("[list=1][*]1[*]2[/list]"));
+    assertEquals("<p><ol type=\"a\"><li>a</li><li>b</li></ol></p>", converter.convert("[list=a][*]a[*]b[/list]"));
+    
     String message1 = getContent("/bbcodetest1.txt");
     //IOUtils.write(converter.convert(message1), new FileOutputStream("/tmp/bbcodetest1result.txt"));
     String message1Result = getContent("/bbcodetest1result.txt");