[jboss-svn-commits] JBL Code SVN: r32334 - in labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src: test/java/org/jboss/labs/sbs/plugin/bm and 1 other directory.

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

Author: lkrzyzanek
Date: 2010-04-01 05:15:21 -0400 (Thu, 01 Apr 2010)
New Revision: 32334

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java
Log:
Added indention and changed PRE to SBS's PRE with plain highlighting

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java	2010-04-01 08:31:25 UTC (rev 32333)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java	2010-04-01 09:15:21 UTC (rev 32334)
@@ -319,7 +319,8 @@
         }
         if (isInPre) {
           description.append("<p>");
-          description.append(line);
+          // correct indention
+          description.append(StringUtils.replace(line, " ", "&nbsp;"));
           description.append("</p>");
         } else {
           description.append(line);
@@ -330,7 +331,10 @@
         }
       }
     }
-    bean.setBody(description.toString());
+    String body = StringUtils.replaceAll(description.toString(), "<pre>",
+        "<pre class=\"jive_text_macro jive_macro_code\" jivemacro=\"code\" ___default_attr=\"plain\">");
+
+    bean.setBody(body);
     br.close();
 
     if (meta != null && meta.exists()) {

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java	2010-04-01 08:31:25 UTC (rev 32333)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java	2010-04-01 09:15:21 UTC (rev 32334)
@@ -63,11 +63,14 @@
     OldBlogEntryBean pretest = manager.loadOldBlogPost(new File(repoPath + "user1/pretest.txt"), new File(repoPath
         + "user1/pretest.meta"), "UTF-8");
     final String emptyLine = "<p></p>" + DbOldBlogsManager.LINE_SEPARATOR;
-    assertEquals("<p>data</p>" + DbOldBlogsManager.LINE_SEPARATOR + "<pre>" + DbOldBlogsManager.LINE_SEPARATOR
-        + "<p>  import java.lang.*;</p>" + DbOldBlogsManager.LINE_SEPARATOR + emptyLine
-        + "<p>  public class Test {</p>" + DbOldBlogsManager.LINE_SEPARATOR + emptyLine
-        + "<p>    private String test;</p>" + DbOldBlogsManager.LINE_SEPARATOR + emptyLine + "<p>  }</p>"
-        + DbOldBlogsManager.LINE_SEPARATOR + "</pre>" + DbOldBlogsManager.LINE_SEPARATOR, pretest.getBody());
+    assertEquals("<p>data</p>" + DbOldBlogsManager.LINE_SEPARATOR
+        + "<pre class=\"jive_text_macro jive_macro_code\" jivemacro=\"code\" ___default_attr=\"plain\">"
+        + DbOldBlogsManager.LINE_SEPARATOR + "<p>&nbsp;&nbsp;import&nbsp;java.lang.*;</p>"
+        + DbOldBlogsManager.LINE_SEPARATOR + emptyLine + "<p>&nbsp;&nbsp;public&nbsp;class&nbsp;Test&nbsp;{</p>"
+        + DbOldBlogsManager.LINE_SEPARATOR + emptyLine
+        + "<p>&nbsp;&nbsp;&nbsp;&nbsp;private&nbsp;String&nbsp;test;</p>" + DbOldBlogsManager.LINE_SEPARATOR
+        + emptyLine + "<p>&nbsp;&nbsp;}</p>" + DbOldBlogsManager.LINE_SEPARATOR + "</pre>"
+        + DbOldBlogsManager.LINE_SEPARATOR, pretest.getBody());
   }
 
   @Test