diff options
author | Simon Rettberg | 2014-09-25 14:50:56 +0200 |
---|---|---|
committer | Simon Rettberg | 2014-09-25 14:50:56 +0200 |
commit | 8b87677709624a56a7557104dc31ee8cc2ece748 (patch) | |
tree | 570d9bf3216ea9aa2c5c4158409ec3475e246963 /src/main/java/org/openslx/imagemaster/util | |
parent | Adapted classes to new filetransfer. (diff) | |
download | masterserver-8b87677709624a56a7557104dc31ee8cc2ece748.tar.gz masterserver-8b87677709624a56a7557104dc31ee8cc2ece748.tar.xz masterserver-8b87677709624a56a7557104dc31ee8cc2ece748.zip |
Adapt to changed Thrift RPC
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/util')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/util/Util.java | 22 |
1 files changed, 21 insertions, 1 deletions
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 @@ -101,10 +101,22 @@ public class Util */ 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; + } + } |