From 790c3829edafcb41d6eeb14301a23db22c559e96 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 01 Jul 2011 17:45:23 -0400
Subject: [PATCH] Documentation. Added upgrade info to site. Moved todos to GoogleCode.

---
 src/com/gitblit/utils/MarkdownUtils.java |   41 +++++++++++++++++++++++------------------
 1 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/com/gitblit/utils/MarkdownUtils.java b/src/com/gitblit/utils/MarkdownUtils.java
index 6cdb3be..697fa99 100644
--- a/src/com/gitblit/utils/MarkdownUtils.java
+++ b/src/com/gitblit/utils/MarkdownUtils.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gitblit.utils;
 
 import java.io.IOException;
@@ -11,43 +26,33 @@
 public class MarkdownUtils {
 
 	public static String transformMarkdown(String markdown) throws java.text.ParseException {
-		// Read raw markdown content and transform it to html		
-		StringReader reader = new StringReader(markdown);
-		StringWriter writer = new StringWriter();
 		try {
-			Markdown md = new Markdown();
-			md.transform(reader, writer);
-			return writer.toString();
-		} catch (ParseException p) {			
-			throw new java.text.ParseException(p.getMessage(), 0);
-		} finally {
-			reader.close();
-			try {
-				writer.close();
-			} catch (IOException e) {
-			}
+			return transformMarkdown(new StringReader(markdown));
+		} catch (NullPointerException p) {
+			throw new java.text.ParseException("Markdown string is null!", 0);
 		}
 	}
 
 	public static String transformMarkdown(Reader markdownReader) throws java.text.ParseException {
-		// Read raw markdown content and transform it to html				
+		// Read raw markdown content and transform it to html
 		StringWriter writer = new StringWriter();
 		try {
 			Markdown md = new Markdown();
 			md.transform(markdownReader, writer);
-			return writer.toString();
-		} catch (ParseException p) {			
+			return writer.toString().trim();
+		} catch (ParseException p) {
 			throw new java.text.ParseException(p.getMessage(), 0);
 		} finally {
 			try {
 				markdownReader.close();
 			} catch (IOException e) {
+				// IGNORE
 			}
 			try {
 				writer.close();
 			} catch (IOException e) {
+				// IGNORE
 			}
 		}
 	}
-
 }

--
Gitblit v1.9.1