From 8b87677709624a56a7557104dc31ee8cc2ece748 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 25 Sep 2014 14:50:56 +0200
Subject: Adapt to changed Thrift RPC

---
 .../java/org/openslx/imagemaster/util/Util.java    | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'src/main/java/org/openslx/imagemaster/util')

diff --git a/src/main/java/org/openslx/imagemaster/util/Util.java b/src/main/java/org/openslx/imagemaster/util/Util.java
index 595c059..ffd3106 100644
--- a/src/main/java/org/openslx/imagemaster/util/Util.java
+++ b/src/main/java/org/openslx/imagemaster/util/Util.java
@@ -100,11 +100,23 @@ public class Util
 	 * @return The parsed int or 0 on error
 	 */
 	public static int tryToParseInt( String s )
+	{
+		return tryToParseInt( s, 0 );
+	}
+
+	/**
+	 * Tries to parse an int. Returns defaultValue on error.
+	 * 
+	 * @param s The strig to parse
+	 * @param defaultValue value to be returned if s is not parsable
+	 * @return The parsed int
+	 */
+	public static int tryToParseInt( String s, int defaultValue )
 	{
 		try {
 			return Integer.parseInt( s );
 		} catch ( NumberFormatException e ) {
-			return 0;
+			return defaultValue;
 		}
 	}
 
@@ -116,4 +128,12 @@ public class Util
 		return blocks;
 	}
 
+	public static String sanitizeFileName( String fileName )
+	{
+		fileName = fileName.replaceAll( "[^a-zA-Z0-9_\\-]+", "_" );
+		if ( fileName.length() > 40 )
+			fileName = fileName.substring( 0, 40 );
+		return fileName;
+	}
+
 }
-- 
cgit v1.2.3-55-g7522