[jboss-svn-commits] JBL Code SVN: r23213 - labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace.

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

Author: szimano
Date: 2008-09-30 05:51:34 -0400 (Tue, 30 Sep 2008)
New Revision: 23213

Modified:
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/JSP2CSMarkupWikiTranslator.java
Log:
tables fixed

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java	2008-09-30 09:51:14 UTC (rev 23212)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java	2008-09-30 09:51:34 UTC (rev 23213)
@@ -305,10 +305,6 @@
 								.getContent(), pageDictionary,
 								pageDictionaryRev, log);
 
-						// TODO show content
-						if (page.getVersion() == page.getLastVersion())
-							System.out.println(content);
-
 						double parsingTime = ((double) (new Date().getTime() - start
 								.getTime()) / 1000);
 

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/JSP2CSMarkupWikiTranslator.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/JSP2CSMarkupWikiTranslator.java	2008-09-30 09:51:14 UTC (rev 23212)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/JSP2CSMarkupWikiTranslator.java	2008-09-30 09:51:34 UTC (rev 23213)
@@ -240,7 +240,7 @@
 			}
 
 			if (newLine && ch != '|' && m_istable) {
-				buf.append("</table>{code}\n");
+				//buf.append("</table>{code}\n");
 				m_istable = false;
 				m_closeTag = null;
 			}
@@ -360,7 +360,7 @@
 				break;
 
 			
-			//case '|': s = handleBar(newLine); break;
+			case '|': s = handleBar(newLine); break;
 			 
 
 			case '<':
@@ -615,7 +615,7 @@
 	}
 
 	private String handleBar(boolean newLine) throws IOException {
-		StringBuffer sb = new StringBuffer();
+		//StringBuffer sb = new StringBuffer();
 
 		if (!m_istable && !newLine) {
 			return "|";
@@ -623,31 +623,41 @@
 
 		if (newLine) {
 			if (!m_istable) {
-				sb.append("{code:html}<table>\n");
+				//sb.append("{code:html}<table>\n");
 				m_istable = true;
 			}
 
-			sb.append("<tr>");
-			m_closeTag = "</td></tr>";
+			//sb.append("<tr>");
+			//m_closeTag = "</td></tr>";
+			m_closeTag = "|";
 		}
 
 		int ch = nextToken();
 
 		if (ch == '|') {
 			if (!newLine) {
-				sb.append("</th>");
+				//sb.append("</th>");
 			}
-			sb.append("<th>");
-			m_closeTag = "</th></tr>";
-		} else {
+			//sb.append("<th>");
+			//m_closeTag = "</th></tr>";
+			m_closeTag = "||";
+			
+			return "||";
+		} else if (ch == '\n') {
+			// new line after bars - do not add them again
+			m_closeTag = null;
+			pushBack(ch);
+		}
+		else {
 			if (!newLine) {
-				sb.append("</td>");
+				//sb.append("</td>");
 			}
-			sb.append("<td>");
+			//sb.append("<td>");
 			pushBack(ch);
 		}
 
-		return sb.toString();
+		//return sb.toString();
+		return "|";
 	}
 
 	private String handleDefinitionList() throws IOException {