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

diff --git a/src/be/nikiroo/utils/StringUtils.java b/src/be/nikiroo/utils/StringUtils.java
index af69845..a50ec28 100644
--- a/src/be/nikiroo/utils/StringUtils.java
+++ b/src/be/nikiroo/utils/StringUtils.java
@@ -1,12 +1,7 @@
 package be.nikiroo.utils;
 
-import java.awt.Image;
-import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.Normalizer;
@@ -17,8 +12,6 @@ import java.util.Date;
 import java.util.Scanner;
 import java.util.regex.Pattern;
 
-import javax.imageio.ImageIO;
-
 import org.unbescape.html.HtmlEscape;
 import org.unbescape.html.HtmlEscapeLevel;
 import org.unbescape.html.HtmlEscapeType;
@@ -201,104 +194,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 {
-		return fromImage(image, null);
-	}
-
-	/**
-	 * Convert the given {@link Image} object into a Base64 representation of
-	 * the same {@link Image}. object.
-	 * 
-	 * @param image
-	 *            the {@link Image} object to convert
-	 * @param format
-	 *            the image format to use to serialise it (default is PNG)
-	 * 
-	 * @return the Base64 representation
-	 * 
-	 * @throws IOException
-	 *             in case of IO error
-	 */
-	static public String fromImage(BufferedImage image, String format)
-			throws IOException {
-		if (format == null) {
-			format = "png";
-		}
-
-		String imageString = null;
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-		ImageIO.write(image, format, 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}.
 	 * 
@@ -307,7 +202,7 @@ 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());