[jboss-cvs] JBossAS SVN: r64535 - in projects/microcontainer/trunk: container/src/main/org/jboss/reflect/plugins/javassist and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2007-08-10 04:53:47 -0400 (Fri, 10 Aug 2007)
New Revision: 64535

Modified:
   projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoImpl.java
   projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java
   projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/DelegateClassInfo.java
   projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/PrimitiveInfo.java
   projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfo.java
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AbstractClassInfoTest.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractArrayMetaData.java
Log:
Removed depth parameter on getArrayClass and getArrayType methods.

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoImpl.java	2007-08-10 08:25:47 UTC (rev 64534)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoImpl.java	2007-08-10 08:53:47 UTC (rev 64535)
@@ -253,14 +253,12 @@
    /**
     * Get an array class
     *
-    * TODO JBMICROCONT-123 there must be a better way to do this!
     * @param clazz the class
-    * @param depth the depth
     * @return the array class
     */
-   public static Class getArrayClass(Class clazz, int depth)
+   public static Class getArrayClass(Class clazz)
    {
-      return Array.newInstance(clazz, depth).getClass();
+      return Array.newInstance(clazz, 0).getClass();
    }
 
    /**
@@ -512,9 +510,9 @@
       return false;
    }
 
-   public TypeInfo getArrayType(int depth)
+   public TypeInfo getArrayType()
    {
-      Class arrayClass = getArrayClass(getType(), depth);
+      Class arrayClass = getArrayClass(getType());
       return classInfoHelper.getTypeInfo(arrayClass);
    }
 

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java	2007-08-10 08:25:47 UTC (rev 64534)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java	2007-08-10 08:53:47 UTC (rev 64535)
@@ -349,19 +349,17 @@
    /**
     * Get an array class
     * 
-    * TODO JBMICROCONT-123 there must be a better way to do this!
     * @param clazz the class
-    * @param depth the depth
     * @return the array class
     */
-   public static Class getArrayClass(Class clazz, int depth)
+   public static Class getArrayClass(Class clazz)
    {
-      return Array.newInstance(clazz, depth).getClass();
+      return Array.newInstance(clazz, 0).getClass();
    }
 
-   public TypeInfo getArrayType(int depth)
+   public TypeInfo getArrayType()
    {
-      Class arrayClass = getArrayClass(getType(), depth);
+      Class arrayClass = getArrayClass(getType());
       return factory.getTypeInfo(arrayClass);
    }
 

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/DelegateClassInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/DelegateClassInfo.java	2007-08-10 08:25:47 UTC (rev 64534)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/DelegateClassInfo.java	2007-08-10 08:53:47 UTC (rev 64535)
@@ -226,9 +226,9 @@
       return delegate.convertValue(value, replaceProperties);
    }
 
-   public TypeInfo getArrayType(int depth)
+   public TypeInfo getArrayType()
    {
-      return delegate.getArrayType(depth);
+      return delegate.getArrayType();
    }
    
    @Deprecated

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/PrimitiveInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/PrimitiveInfo.java	2007-08-10 08:25:47 UTC (rev 64534)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/PrimitiveInfo.java	2007-08-10 08:53:47 UTC (rev 64535)
@@ -175,9 +175,9 @@
       return true;
    }
 
-   public TypeInfo getArrayType(int depth)
+   public TypeInfo getArrayType()
    {
-      Class arrayClass = ClassInfoImpl.getArrayClass(getType(), depth);
+      Class arrayClass = ClassInfoImpl.getArrayClass(getType());
       return typeInfoFactory.getTypeInfo(arrayClass);
    }
 

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfo.java	2007-08-10 08:25:47 UTC (rev 64534)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfo.java	2007-08-10 08:53:47 UTC (rev 64535)
@@ -115,12 +115,11 @@
    boolean isPrimitive();
    
    /**
-    * Whether this type is an array
+    * Get an array type
     * 
-    * @param depth the array depth
     * @return the array type
     */
-   TypeInfo getArrayType(int depth);
+   TypeInfo getArrayType();
    
    /**
     * Create a new array

Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AbstractClassInfoTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AbstractClassInfoTest.java	2007-08-10 08:25:47 UTC (rev 64534)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AbstractClassInfoTest.java	2007-08-10 08:53:47 UTC (rev 64535)
@@ -103,16 +103,16 @@
 
    protected void testArray(Class<?> clazz, TypeInfo info) throws Throwable
    {
-      TypeInfo arrayType = info.getArrayType(1);
-      getLog().debug("ArrayType(1): " + arrayType);
+      TypeInfo arrayType = info.getArrayType();
+      getLog().debug("ArrayType(0): " + arrayType);
       assertTrue(arrayType.isArray());
-      Class<?> arrayClass = Array.newInstance(clazz, 1).getClass();
+      Class<?> arrayClass = Array.newInstance(clazz, 0).getClass();
       assertEquals(arrayClass, arrayType.getType());
 
-      arrayType = info.getArrayType(5);
-      getLog().debug("ArrayType(5): " + arrayType);
+      arrayType = info.getArrayType();
+      getLog().debug("ArrayType(0): " + arrayType);
       assertTrue(arrayType.isArray());
-      arrayClass = Array.newInstance(clazz, 5).getClass();
+      arrayClass = Array.newInstance(clazz, 0).getClass();
       assertEquals(arrayClass, arrayType.getType());
    }
    

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractArrayMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractArrayMetaData.java	2007-08-10 08:25:47 UTC (rev 64534)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractArrayMetaData.java	2007-08-10 08:53:47 UTC (rev 64535)
@@ -62,7 +62,7 @@
             info = getElementClassInfo(cl, null);
             if (info == null)
                return null;
-            info = info.getArrayType(0);
+            info = info.getArrayType();
          }
          // Not a class 
          if (info instanceof ClassInfo == false)