X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FStringUtils.java;h=1e9d7ed7463a6b2356677f9af0e158ff2b283820;hb=e8aa5bf9227a0d6a6d0bb6a8bc0cc04d0f4d601a;hp=a50ec28f19481363c9c09af476507b4cc5901826;hpb=b771aed5070864bbcbae286c8de74478f6837618;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/StringUtils.java b/src/be/nikiroo/utils/StringUtils.java
index a50ec28..1e9d7ed 100644
--- a/src/be/nikiroo/utils/StringUtils.java
+++ b/src/be/nikiroo/utils/StringUtils.java
@@ -2,6 +2,7 @@ package be.nikiroo.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.Normalizer;
@@ -35,8 +36,7 @@ public class StringUtils {
 		End
 	}
 
-	static private Pattern marks = Pattern
-			.compile("[\\p{InCombiningDiacriticalMarks}\\p{IsLm}\\p{IsSk}]+");
+	static private Pattern marks = getMarks();
 
 	/**
 	 * Fix the size of the given {@link String} either with space-padding or by
@@ -50,7 +50,7 @@ public class StringUtils {
 	 * @return the resulting {@link String} of size <i>size</i>
 	 */
 	static public String padString(String text, int width) {
-		return padString(text, width, true, Alignment.Beginning);
+		return padString(text, width, true, null);
 	}
 
 	/**
@@ -66,13 +66,17 @@ public class StringUtils {
 	 *            cut the {@link String} shorter if needed
 	 * @param align
 	 *            align the {@link String} in this position if we have enough
-	 *            space
+	 *            space (default is Alignment.Beginning)
 	 * 
 	 * @return the resulting {@link String} of size <i>size</i> minimum
 	 */
 	static public String padString(String text, int width, boolean cut,
 			Alignment align) {
 
+		if (align == null) {
+			align = Alignment.Beginning;
+		}
+
 		if (width >= 0) {
 			if (text == null)
 				text = "";
@@ -141,7 +145,9 @@ public class StringUtils {
 
 		if (removeAllAccents) {
 			input = Normalizer.normalize(input, Form.NFKD);
-			input = marks.matcher(input).replaceAll("");
+			if (marks != null) {
+				input = marks.matcher(input).replaceAll("");
+			}
 		}
 
 		input = Normalizer.normalize(input, Form.NFKC);
@@ -163,11 +169,15 @@ public class StringUtils {
 	}
 
 	/**
-	 * Convert between time in milliseconds to {@link String} in a "static" way
-	 * (to exchange data over the wire, for instance).
+	 * Convert between the time in milliseconds to a {@link String} in a "fixed"
+	 * way (to exchange data over the wire, for instance).
+	 * <p>
+	 * Precise to the second.
 	 * 
 	 * @param time
-	 *            the time in milliseconds
+	 *            the specified number of milliseconds since the standard base
+	 *            time known as "the epoch", namely January 1, 1970, 00:00:00
+	 *            GMT
 	 * 
 	 * @return the time as a {@link String}
 	 */
@@ -177,21 +187,24 @@ public class StringUtils {
 	}
 
 	/**
-	 * Convert between time as a {@link String} to milliseconds in a "static"
+	 * Convert between the time as a {@link String} to milliseconds in a "fixed"
 	 * way (to exchange data over the wire, for instance).
+	 * <p>
+	 * Precise to the second.
 	 * 
 	 * @param displayTime
 	 *            the time as a {@link String}
 	 * 
-	 * @return the time in milliseconds
+	 * @return the number of milliseconds since the standard base time known as
+	 *         "the epoch", namely January 1, 1970, 00:00:00 GMT, or -1 in case
+	 *         of error
+	 * 
+	 * @throws ParseException
+	 *             in case of parse error
 	 */
-	static public long toTime(String displayTime) {
+	static public long toTime(String displayTime) throws ParseException {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		try {
-			return sdf.parse(displayTime).getTime();
-		} catch (ParseException e) {
-			return -1;
-		}
+		return sdf.parse(displayTime).getTime();
 	}
 
 	/**
@@ -205,7 +218,7 @@ public class StringUtils {
 	static public String getMd5Hash(String input) {
 		try {
 			MessageDigest md = MessageDigest.getInstance("MD5");
-			md.update(input.getBytes());
+			md.update(input.getBytes("UTF-8"));
 			byte byteData[] = md.digest();
 
 			StringBuffer hexString = new StringBuffer();
@@ -219,6 +232,8 @@ public class StringUtils {
 			return hexString.toString();
 		} catch (NoSuchAlgorithmException e) {
 			return input;
+		} catch (UnsupportedEncodingException e) {
+			return input;
 		}
 	}
 
@@ -286,6 +301,14 @@ public class StringUtils {
 				HtmlEscapeLevel.LEVEL_1_ONLY_MARKUP_SIGNIFICANT);
 	}
 
+	/**
+	 * Zip the data and then encode it into Base64.
+	 * 
+	 * @param data
+	 *            the data
+	 * 
+	 * @return the Base64 zipped version
+	 */
 	public static String zip64(String data) {
 		try {
 			return Base64.encodeBytes(data.getBytes(), Base64.GZIP);
@@ -295,6 +318,17 @@ public class StringUtils {
 		}
 	}
 
+	/**
+	 * Unconvert from Base64 then unzip the content.
+	 * 
+	 * @param data
+	 *            the data in Base64 format
+	 * 
+	 * @return the raw data
+	 * 
+	 * @throws IOException
+	 *             in case of I/O error
+	 */
 	public static String unzip64(String data) throws IOException {
 		ByteArrayInputStream in = new ByteArrayInputStream(Base64.decode(data,
 				Base64.GZIP));
@@ -307,4 +341,19 @@ public class StringUtils {
 			scan.close();
 		}
 	}
+
+	/**
+	 * The "remove accents" pattern.
+	 * 
+	 * @return the pattern, or NULL if a problem happens
+	 */
+	private static Pattern getMarks() {
+		try {
+			return Pattern
+					.compile("[\\p{InCombiningDiacriticalMarks}\\p{IsLm}\\p{IsSk}]+");
+		} catch (Exception e) {
+			// Can fail on Android...
+			return null;
+		}
+	}
 }