Author: bayard
Date: Tue Nov 13 06:35:33 2007
New Revision: 594551
URL: http://svn.apache.org/viewvc?rev=594551&view=rev
Log:
Moved toClass from ArrayUtils to ClassUtils as per Joerg's comment in LANG-333
Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/ArrayUtils.java
commons/proper/lang/trunk/src/java/org/apache/commons/lang/ClassUtils.java
commons/proper/lang/trunk/src/test/org/apache/commons/lang/ArrayUtilsTest.java
commons/proper/lang/trunk/src/test/org/apache/commons/lang/ClassUtilsTest.java
Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/ArrayUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/ArrayUtils.java?rev=594551&r1=594550&r2=594551&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/java/org/apache/commons/lang/ArrayUtils.java
(original)
+++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/ArrayUtils.java
Tue Nov 13 06:35:33 2007
@@ -4414,27 +4414,4 @@
return result;
}
- /**
- * <p>Converts an array of <code>Object</code> in to an Array of
<code>Class</code> objects.</p>
- *
- * <p>This method returns <code>null</code> for a <code>null</code> input
array.</p>
- *
- * @param array an <code>Object</code> array
- * @return a <code>Class</code> array, <code>null</code> if null array
input
- * @since 2.4
- */
- public static Class[] toClass(Object[] array)
- {
- if (array == null) {
- return null;
- } else if (array.length == 0) {
- return EMPTY_CLASS_ARRAY;
- }
- Class[] classes = new Class[array.length];
- for (int i = 0; i < array.length; i++) {
- classes[i] = array[i].getClass();
- }
- return classes;
- }
-
}
Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/ClassUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/ClassUtils.java?rev=594551&r1=594550&r2=594551&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/java/org/apache/commons/lang/ClassUtils.java
(original)
+++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/ClassUtils.java
Tue Nov 13 06:35:33 2007
@@ -739,4 +739,26 @@
return className;
}
+ /**
+ * <p>Converts an array of <code>Object</code> in to an Array of
<code>Class</code> objects.</p>
+ *
+ * <p>This method returns <code>null</code> for a <code>null</code> input
array.</p>
+ *
+ * @param array an <code>Object</code> array
+ * @return a <code>Class</code> array, <code>null</code> if null array
input
+ * @since 2.4
+ */
+ public static Class[] toClass(Object[] array)
+ {
+ if (array == null) {
+ return null;
+ } else if (array.length == 0) {
+ return ArrayUtils.EMPTY_CLASS_ARRAY;
+ }
+ Class[] classes = new Class[array.length];
+ for (int i = 0; i < array.length; i++) {
+ classes[i] = array[i].getClass();
+ }
+ return classes;
+ }
}
Modified:
commons/proper/lang/trunk/src/test/org/apache/commons/lang/ArrayUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/ArrayUtilsTest.java?rev=594551&r1=594550&r2=594551&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/test/org/apache/commons/lang/ArrayUtilsTest.java
(original)
+++
commons/proper/lang/trunk/src/test/org/apache/commons/lang/ArrayUtilsTest.java
Tue Nov 13 06:35:33 2007
@@ -2420,24 +2420,6 @@
new double[] { Double.MIN_VALUE, Double.MAX_VALUE, 9999999
})));
}
- public void testToClass_object() {
- assertEquals(null, ArrayUtils.toClass(null));
-
- assertSame(
- ArrayUtils.EMPTY_CLASS_ARRAY,
- ArrayUtils.toClass(new Class[0]));
-
- Object[] array = new Object[3];
- array[0] = new String("Test");
- array[1] = new Integer(1);
- array[2] = new Double(99);
-
- Class[] results = ArrayUtils.toClass(array);
- assertEquals("String", ClassUtils.getShortClassName(results[0]));
- assertEquals("Integer", ClassUtils.getShortClassName(results[1]));
- assertEquals("Double", ClassUtils.getShortClassName(results[2]));
- }
-
//-----------------------------------------------------------------------
/**
* Test for [EMAIL PROTECTED] ArrayUtils#isEmpty(java.lang.Object[])}.
Modified:
commons/proper/lang/trunk/src/test/org/apache/commons/lang/ClassUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/ClassUtilsTest.java?rev=594551&r1=594550&r2=594551&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/test/org/apache/commons/lang/ClassUtilsTest.java
(original)
+++
commons/proper/lang/trunk/src/test/org/apache/commons/lang/ClassUtilsTest.java
Tue Nov 13 06:35:33 2007
@@ -581,4 +581,22 @@
assertEquals(Object.class.getMethod("toString", new Class[0]),
toStringMethod);
}
+ public void testToClass_object() {
+ assertEquals(null, ClassUtils.toClass(null));
+
+ assertSame(
+ ArrayUtils.EMPTY_CLASS_ARRAY,
+ ClassUtils.toClass(new Class[0]));
+
+ Object[] array = new Object[3];
+ array[0] = new String("Test");
+ array[1] = new Integer(1);
+ array[2] = new Double(99);
+
+ Class[] results = ClassUtils.toClass(array);
+ assertEquals("String", ClassUtils.getShortClassName(results[0]));
+ assertEquals("Integer", ClassUtils.getShortClassName(results[1]));
+ assertEquals("Double", ClassUtils.getShortClassName(results[2]));
+ }
+
}
