Integrated pagelinks into RepositoryPage. Fixed string encoding.

1 files changed, 8 insertions, 17 deletions

diff --git a/src/com/gitblit/wicket/pages/MarkdownPage.java b/src/com/gitblit/wicket/pages/MarkdownPage.java
index 83083abf..64d3ce3f 100644
--- a/src/com/gitblit/wicket/pages/MarkdownPage.java
+++ b/src/com/gitblit/wicket/pages/MarkdownPage.java
@@ -1,7 +1,6 @@
 package com.gitblit.wicket.pages;

 

-import java.io.StringReader;

-import java.io.StringWriter;

+import java.text.ParseException;

 

 import org.apache.wicket.PageParameters;

 import org.apache.wicket.markup.html.basic.Label;

@@ -9,19 +8,14 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.eclipse.jgit.lib.Constants;

 import org.eclipse.jgit.lib.Repository;

 import org.eclipse.jgit.revwalk.RevCommit;

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

-import org.tautua.markdownpapers.Markdown;

-import org.tautua.markdownpapers.parser.ParseException;

 

 import com.gitblit.utils.JGitUtils;

+import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.RepositoryPage;

 import com.gitblit.wicket.WicketUtils;

 

 public class MarkdownPage extends RepositoryPage {

 	

-	private final Logger logger = LoggerFactory.getLogger(MarkdownPage.class);

-

 	public MarkdownPage(PageParameters params) {

 		super(params);

 

@@ -36,17 +30,14 @@ public class MarkdownPage extends RepositoryPage {
 		add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(repositoryName, objectId, markdownPath)));

 		add(new BookmarkablePageLink<Void>("headLink", MarkdownPage.class, WicketUtils.newPathParameter(repositoryName, Constants.HEAD, markdownPath)));

 

-		// Read raw markdown content and transform it to html

-		String htmlText = "";

+		// Read raw markdown content and transform it to html		

+		String markdownText = JGitUtils.getRawContentAsString(r, commit, markdownPath);

+		String htmlText;

 		try {

-			String rawText = JGitUtils.getRawContentAsString(r, commit, markdownPath);

-			StringReader reader = new StringReader(rawText);

-			StringWriter writer = new StringWriter();

-			Markdown md = new Markdown();

-			md.transform(reader, writer);

-			htmlText = writer.toString();

+			htmlText = StringUtils.transformMarkdown(markdownText);

 		} catch (ParseException p) {

-			logger.error("Failed to parse markdown text from " + markdownPath, p);

+			error(p.getMessage());

+			htmlText = markdownText;

 		}

 		

 		// Add the html to the page