From 17c417dad5c7be28df4b6e1fd25ec56b484faaff Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 26 May 2011 17:22:03 -0400
Subject: [PATCH] Changed git.otherUrls to web.otherUrls.

---
 src/com/gitblit/utils/StringUtils.java |   77 ++++++++++++++------------------------
 1 files changed, 29 insertions(+), 48 deletions(-)

diff --git a/src/com/gitblit/utils/StringUtils.java b/src/com/gitblit/utils/StringUtils.java
index d52be0e..4a9c88d 100644
--- a/src/com/gitblit/utils/StringUtils.java
+++ b/src/com/gitblit/utils/StringUtils.java
@@ -1,16 +1,24 @@
+/*
+ * 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;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
-
-import org.tautua.markdownpapers.Markdown;
-import org.tautua.markdownpapers.parser.ParseException;
 
 public class StringUtils {
 
@@ -38,17 +46,22 @@
 				retStr.append("&nbsp;");
 			} else if (changeSpace && inStr.charAt(i) == '\t') {
 				retStr.append(" &nbsp; &nbsp;");
-			} else
+			} else {
 				retStr.append(inStr.charAt(i));
+			}
 			i++;
 		}
 		return retStr.toString();
 	}
 
 	public static String flattenStrings(List<String> values) {
+		return flattenStrings(values, " ");
+	}
+
+	public static String flattenStrings(List<String> values, String separator) {
 		StringBuilder sb = new StringBuilder();
 		for (String value : values) {
-			sb.append(value).append(" ");
+			sb.append(value).append(separator);
 		}
 		return sb.toString().trim();
 	}
@@ -104,8 +117,9 @@
 			byte[] sha1hash = md.digest();
 			StringBuilder sb = new StringBuilder(sha1hash.length * 2);
 			for (int i = 0; i < sha1hash.length; i++) {
-				if (((int) sha1hash[i] & 0xff) < 0x10)
-					sb.append("0");
+				if (((int) sha1hash[i] & 0xff) < 0x10) {
+					sb.append('0');
+				}
 				sb.append(Long.toString((int) sha1hash[i] & 0xff, 16));
 			}
 			return sb.toString();
@@ -114,43 +128,10 @@
 		}
 	}
 
-	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) {
-			}
+	public static String getRootPath(String path) {
+		if (path.indexOf('/') > -1) {
+			return path.substring(0, path.indexOf('/'));
 		}
-	}
-	
-	public static String transformMarkdown(Reader markdownReader) throws java.text.ParseException {
-		// 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) {			
-			throw new java.text.ParseException(p.getMessage(), 0);
-		} finally {
-			try {
-				markdownReader.close();
-			} catch (IOException e) {
-			}
-			try {
-				writer.close();
-			} catch (IOException e) {
-			}
-		}
+		return "";
 	}
 }

--
Gitblit v1.9.1