X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FStringUtils.java;h=baa8e26c17fcfac7ba09c21188d6c6f30b765e23;hp=954d34113d09650c4b33d5ccd1dbb70f51ed32a1;hb=f28a134e4d06ee40d62c0c62123fc4799d49d8eb;hpb=f04d5e49e91832e122617fbbaa5cdb053459a7e7

diff --git a/src/be/nikiroo/utils/StringUtils.java b/src/be/nikiroo/utils/StringUtils.java
index 954d341..baa8e26 100644
--- a/src/be/nikiroo/utils/StringUtils.java
+++ b/src/be/nikiroo/utils/StringUtils.java
@@ -21,6 +21,9 @@ import org.unbescape.html.HtmlEscape;
 import org.unbescape.html.HtmlEscapeLevel;
 import org.unbescape.html.HtmlEscapeType;
 
+import be.nikiroo.utils.streams.Base64InputStream;
+import be.nikiroo.utils.streams.Base64OutputStream;
+
 /**
  * This class offer some utilities based around {@link String}s.
  * 
@@ -604,12 +607,11 @@ public class StringUtils {
 	 * @throws IOException
 	 *             in case of I/O errors
 	 */
+	@Deprecated
 	public static OutputStream base64(OutputStream data, boolean zip,
 			boolean breakLines) throws IOException {
-		OutputStream out = new Base64.OutputStream(data,
-				breakLines ? Base64.DO_BREAK_LINES & Base64.ENCODE
-						: Base64.ENCODE);
-
+		OutputStream out = new Base64OutputStream(data, true);
+		
 		if (zip) {
 			out = new java.util.zip.GZIPOutputStream(out);
 		}
@@ -634,14 +636,14 @@ public class StringUtils {
 	 * @throws IOException
 	 *             in case of I/O errors
 	 */
+	@Deprecated
 	public static InputStream base64(InputStream data, boolean zip,
 			boolean breakLines) throws IOException {
 		if (zip) {
 			data = new java.util.zip.GZIPInputStream(data);
 		}
 
-		return new Base64.InputStream(data, breakLines ? Base64.DO_BREAK_LINES
-				& Base64.ENCODE : Base64.ENCODE);
+		return new Base64InputStream(data, true);
 	}
 
 	/**
@@ -682,9 +684,11 @@ public class StringUtils {
 	 * @throws IOException
 	 *             in case of I/O errors
 	 */
+	@Deprecated
 	public static OutputStream unbase64(OutputStream data, boolean zip)
 			throws IOException {
-		OutputStream out = new Base64.OutputStream(data, Base64.DECODE);
+		OutputStream out = new Base64OutputStream(data, false);
+		
 
 		if (zip) {
 			out = new java.util.zip.GZIPOutputStream(out);
@@ -708,13 +712,14 @@ public class StringUtils {
 	 * @throws IOException
 	 *             in case of I/O errors
 	 */
+	@Deprecated
 	public static InputStream unbase64(InputStream data, boolean zip)
 			throws IOException {
 		if (zip) {
 			data = new java.util.zip.GZIPInputStream(data);
 		}
 
-		return new Base64.InputStream(data, Base64.DECODE);
+		return new Base64InputStream(data, false);
 	}
 
 	/**