[jboss-svn-commits] JBL Code SVN: r23286 - 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-10-03 06:44:13 -0400 (Fri, 03 Oct 2008)
New Revision: 23286

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

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-10-03 05:20:17 UTC (rev 23285)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/JSP2CSMarkupWikiTranslator.java	2008-10-03 10:44:13 UTC (rev 23286)
@@ -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;
 			}
@@ -359,9 +359,9 @@
 				}
 				break;
 
-			
-			case '|': s = handleBar(newLine); break;
-			 
+			case '|':
+				s = handleBar(newLine);
+				break;
 
 			case '<':
 				s = m_allowHTML ? "<" : "&lt;";
@@ -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,12 +623,12 @@
 
 		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 = "|";
 		}
 
@@ -636,27 +636,26 @@
 
 		if (ch == '|') {
 			if (!newLine) {
-				//sb.append("</th>");
+				// sb.append("</th>");
 			}
-			//sb.append("<th>");
-			//m_closeTag = "</th></tr>";
+			// 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 (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 "|";
 	}
 
@@ -688,7 +687,7 @@
 
 				pushBack(ch3);
 
-				//TODO page break for printer
+				// TODO page break for printer
 				return "\\";
 			}
 
@@ -833,12 +832,13 @@
 			// return null; // we do not include plugin links for now
 			// TODO make those CS macros
 			try {
-				logFile.write("Unknown inside plugin: "+link+" in page "+pageName+"\n");
+				logFile.write("Unknown inside plugin: " + link + " in page "
+						+ pageName + "\n");
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
-			//return link;
-			
+			// return link;
+
 			// do not show the link
 			return "";
 		}
@@ -856,23 +856,21 @@
 				text = link;
 			}
 		}
-		
-		/* can't be longer then 255 chars
-		if (text.length() > 255) {
-			System.out.println("Text longer !");
-			text = text.substring(0, 254);
-		}
-		
-		if (link.length() > 255) {
-			System.out.println("Link longer !");
-		}*/
 
+		/*
+		 * can't be longer then 255 chars if (text.length() > 255) {
+		 * System.out.println("Text longer !"); text = text.substring(0, 254); }
+		 * 
+		 * if (link.length() > 255) { System.out.println("Link longer !"); }
+		 */
+
 		// external link
 		if (isExternalLink(link)) {
 			if (checkImageLink(link)) {
 				result = "!" + link + "!";// external
 				try {
-					logFile.write("Check image "+link+" in page "+pageName+"\n");
+					logFile.write("Check image " + link + " in page "
+							+ pageName + "\n");
 				} catch (IOException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -898,7 +896,8 @@
 			else if (checkImageLink(link)) {
 				result = "!" + link + "!";
 				try {
-					logFile.write("Check image "+link+" in page "+pageName+"\n");
+					logFile.write("Check image " + link + " in page "
+							+ pageName + "\n");
 				} catch (IOException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -917,7 +916,12 @@
 				 * href=\"" + portalHome + wikiHome + page + wikiPage + language +
 				 * wPage.getLangCode() + "\">" + "?" + "</a>";
 				 */
-				return "[" + text + "|" + linkDict.get(link) + "]";
+				if (linkDict.get(cleanLink(link)) != null) {
+					return "[" + text + "|" + linkDict.get(cleanLink(link))
+							+ "]";
+				} else {
+					return "[" + text + "|" + link + "]";
+				}
 			}
 		}
 
@@ -1059,14 +1063,15 @@
 		mediaPatterns = ".png , .jpeg, .jpg , .gif , .bmp";
 	}
 
-	public String parse(String pageName, String pageContent, Map<String, String> linkDict,
-			Map<String, String> linkDictRev, FileWriter logFile) throws IOException {
+	public String parse(String pageName, String pageContent,
+			Map<String, String> linkDict, Map<String, String> linkDictRev,
+			FileWriter logFile) throws IOException {
 
 		this.linkDict = linkDict;
 		this.linkDictRev = linkDictRev;
 		this.logFile = logFile;
 		this.pageName = pageName;
-		
+
 		initTranslator();
 
 		String replace = parseLinks(pageContent);