X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fstreams%2FReplaceInputStream.java;h=f5138eefeafc327dbd865e3b89713843c027aa0a;hp=5eac0b448fef0262b9f2ded53a4c199a2c41d0b7;hb=c8ce09c4dc57142f94afcdc290dd79c4bddf7820;hpb=8e76f6ab13a8a4a651f2518b6c91d5e6424c7922

diff --git a/src/be/nikiroo/utils/streams/ReplaceInputStream.java b/src/be/nikiroo/utils/streams/ReplaceInputStream.java
index 5eac0b4..f5138ee 100644
--- a/src/be/nikiroo/utils/streams/ReplaceInputStream.java
+++ b/src/be/nikiroo/utils/streams/ReplaceInputStream.java
@@ -2,11 +2,10 @@ package be.nikiroo.utils.streams;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 
 /**
- * This {@link InputStream} will replace some of its content by replacing it
- * with something else.
+ * This {@link InputStream} will change some of its content by replacing it with
+ * something else.
  * 
  * @author niki
  */
@@ -30,7 +29,7 @@ public class ReplaceInputStream extends BufferedInputStream {
 	 *            the {@link String} to replace with
 	 */
 	public ReplaceInputStream(InputStream in, String from, String to) {
-		this(in, bytes(from), bytes(to));
+		this(in, StreamUtils.bytes(from), StreamUtils.bytes(to));
 	}
 
 	/**
@@ -69,7 +68,8 @@ public class ReplaceInputStream extends BufferedInputStream {
 		// Note: very simple, not efficient implementation, sorry.
 		int count = 0;
 		while (spos < slen && count < buffer.length - to.length) {
-			if (from.length > 0 && startsWith(from, source, spos, slen)) {
+			if (from.length > 0
+					&& StreamUtils.startsWith(from, source, spos, slen)) {
 				System.arraycopy(to, 0, buffer, spos, to.length);
 				count += to.length;
 				spos += from.length;
@@ -80,22 +80,4 @@ public class ReplaceInputStream extends BufferedInputStream {
 
 		return count;
 	}
-
-	/**
-	 * Return the bytes array representation of the given {@link String} in
-	 * UTF-8.
-	 * 
-	 * @param str
-	 *            the string to transform into bytes
-	 * @return the content in bytes
-	 */
-	static private byte[] bytes(String str) {
-		try {
-			return str.getBytes("UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			// All conforming JVM must support UTF-8
-			e.printStackTrace();
-			return null;
-		}
-	}
 }