X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FStringUtils.java;h=0ceb673104902170a6860294a4aa37b19547a610;hb=3f8349b761d29cd3d5381f076d706014574eeb43;hp=dc40e878d9c68a3b8b25af2ba03011ef39f57f7c;hpb=db31c35860081535d6e7ddc83ab4af573bb0522e;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/StringUtils.java b/src/be/nikiroo/utils/StringUtils.java
index dc40e87..0ceb673 100644
--- a/src/be/nikiroo/utils/StringUtils.java
+++ b/src/be/nikiroo/utils/StringUtils.java
@@ -1,13 +1,8 @@
 package be.nikiroo.utils;
 
-import java.awt.Image;
-import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.Normalizer;
@@ -17,9 +12,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Scanner;
 import java.util.regex.Pattern;
-import java.util.zip.ZipInputStream;
-
-import javax.imageio.ImageIO;
 
 import org.unbescape.html.HtmlEscape;
 import org.unbescape.html.HtmlEscapeLevel;
@@ -203,81 +195,6 @@ public class StringUtils {
 		}
 	}
 
-	/**
-	 * Convert the given {@link Image} object into a Base64 representation of
-	 * the same {@link Image}. object.
-	 * 
-	 * @param image
-	 *            the {@link Image} object to convert
-	 * 
-	 * @return the Base64 representation
-	 * 
-	 * @throws IOException
-	 *             in case of IO error
-	 */
-	static public String fromImage(BufferedImage image) throws IOException {
-		String imageString = null;
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-		ImageIO.write(image, "jpeg", out);
-		byte[] imageBytes = out.toByteArray();
-
-		imageString = new String(Base64.encodeBytes(imageBytes));
-
-		out.close();
-
-		return imageString;
-	}
-
-	/**
-	 * Convert the given image into a Base64 representation of the same
-	 * {@link File}.
-	 * 
-	 * @param in
-	 *            the image to convert
-	 * 
-	 * @return the Base64 representation
-	 * 
-	 * @throws IOException
-	 *             in case of IO error
-	 */
-	static public String fromStream(InputStream in) throws IOException {
-		String fileString = null;
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-		byte[] buf = new byte[8192];
-
-		int c = 0;
-		while ((c = in.read(buf, 0, buf.length)) > 0) {
-			out.write(buf, 0, c);
-		}
-		out.flush();
-		in.close();
-
-		fileString = new String(Base64.encodeBytes(out.toByteArray()));
-		out.close();
-
-		return fileString;
-	}
-
-	/**
-	 * Convert the given Base64 representation of an image into an {@link Image}
-	 * object.
-	 * 
-	 * @param b64data
-	 *            the {@link Image} in Base64 format
-	 * 
-	 * @return the {@link Image} object
-	 * 
-	 * @throws IOException
-	 *             in case of IO error
-	 */
-	static public BufferedImage toImage(String b64data) throws IOException {
-		ByteArrayInputStream in = new ByteArrayInputStream(
-				Base64.decode(b64data));
-		return IOUtils.toImage(in);
-	}
-
 	/**
 	 * Return a hash of the given {@link String}.
 	 * 
@@ -286,10 +203,10 @@ public class StringUtils {
 	 * 
 	 * @return the hash
 	 */
-	static public String getHash(String input) {
+	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();
@@ -303,6 +220,8 @@ public class StringUtils {
 			return hexString.toString();
 		} catch (NoSuchAlgorithmException e) {
 			return input;
+		} catch (UnsupportedEncodingException e) {
+			return input;
 		}
 	}