Refactoring for 2.0 complete.

Adding notIndexOf-esque methods to ArrayUtils.
rkalla · May 6, 2011 · 225a3e6 · 225a3e6
1 parent 29aaf3a
commit 225a3e6
Show file tree

Hide file tree

Showing 10 changed files with 867 additions and 643 deletions.
diff --git a/src/main/java/com/thebuzzmedia/common/charset/DecodingUtils.java b/src/main/java/com/thebuzzmedia/common/charset/DecodingUtils.java
@@ -41,21 +41,21 @@ public class DecodingUtils {
 	}
 
 	public static char[] decode(byte[] array) {
-		return (array == null ? null : decode(0, array.length, array,
-				UTF8_CHARSET));
+		return (array == null ? null : decode(array, UTF8_CHARSET, 0,
+				array.length));
 	}
 
 	public static char[] decode(byte[] array, Charset charset) {
-		return (array == null ? null : decode(0, array.length, array, charset));
+		return (array == null ? null : decode(array, charset, 0, array.length));
 	}
 
-	public static char[] decode(int index, int length, byte[] array) {
+	public static char[] decode(byte[] array, int index, int length) {
 		return (array == null ? null : decode(
 				ByteBuffer.wrap(array, index, length), UTF8_CHARSET));
 	}
 
-	public static char[] decode(int index, int length, byte[] array,
-			Charset charset) {
+	public static char[] decode(byte[] array, Charset charset, int index,
+			int length) {
 		return (array == null ? null : decode(
 				ByteBuffer.wrap(array, index, length), charset));
 	}

diff --git a/src/main/java/com/thebuzzmedia/common/charset/EncodingUtils.java b/src/main/java/com/thebuzzmedia/common/charset/EncodingUtils.java
@@ -41,21 +41,21 @@ public class EncodingUtils {
 	}
 
 	public static byte[] encode(char[] array) {
-		return (array == null ? null : encode(0, array.length, array,
-				UTF8_CHARSET));
+		return (array == null ? null : encode(array, UTF8_CHARSET, 0,
+				array.length));
 	}
 
 	public static byte[] encode(char[] array, Charset charset) {
-		return (array == null ? null : encode(0, array.length, array, charset));
+		return (array == null ? null : encode(array, charset, 0, array.length));
 	}
 
-	public static byte[] encode(int index, int length, char[] array) {
+	public static byte[] encode(char[] array, int index, int length) {
 		return (array == null ? null : encode(
 				CharBuffer.wrap(array, index, length), UTF8_CHARSET));
 	}
 
-	public static byte[] encode(int index, int length, char[] array,
-			Charset charset) {
+	public static byte[] encode(char[] array, Charset charset, int index,
+			int length) {
 		return (array == null ? null : encode(
 				CharBuffer.wrap(array, index, length), charset));
 	}