[jboss-cvs] JBossAS SVN: r103757 - in projects/jboss-man/branches/Branch_2_1/metatype: src/main/java/org/jboss/metatype/plugins/types and 1 other directories.

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

Author: kabir.khan at jboss.com
Date: 2010-04-09 10:07:35 -0400 (Fri, 09 Apr 2010)
New Revision: 103757

Modified:
   projects/jboss-man/branches/Branch_2_1/metatype/pom.xml
   projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java
   projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
Log:
[JBMAN-96] Adjustments to work with javassist implementation of jboss-reflect

Modified: projects/jboss-man/branches/Branch_2_1/metatype/pom.xml
===================================================================
--- projects/jboss-man/branches/Branch_2_1/metatype/pom.xml	2010-04-09 14:03:39 UTC (rev 103756)
+++ projects/jboss-man/branches/Branch_2_1/metatype/pom.xml	2010-04-09 14:07:35 UTC (rev 103757)
@@ -55,6 +55,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.test</groupId>
       <artifactId>jboss-test</artifactId>
       <scope>test</scope>

Modified: projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java	2010-04-09 14:03:39 UTC (rev 103756)
+++ projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java	2010-04-09 14:07:35 UTC (rev 103757)
@@ -194,17 +194,13 @@
       {
          // See if this is a Map<String,?> type
          ClassInfo classInfo = (ClassInfo) typeInfo;
-         TypeInfo[] types = classInfo.getActualTypeArguments();
-         if (types != null)
+         TypeInfo keyType = classInfo.getKeyType();
+         TypeInfo valueType = classInfo.getValueType();
+         if(keyType.getName().equals(String.class.getName()))
          {
-            TypeInfo keyType = types[0];
-            TypeInfo valueType = types[1];
-            if(keyType.getName().equals(String.class.getName()))
-            {
-               // Use MapCompositeMetaType
-               MetaType valueMetaType = resolve(valueType);
-               return new MapCompositeMetaType(valueMetaType);
-            }
+            // Use MapCompositeMetaType
+            MetaType valueMetaType = resolve(valueType);
+            return new MapCompositeMetaType(valueMetaType);
          }
          // Map java.util.Properties to MapCompositeMetaType(SimpleMetaType.STRING)
          else if(typeInfo.getName().equals(Properties.class.getName()))
@@ -307,12 +303,7 @@
    @SuppressWarnings("unchecked")
    public CollectionMetaType generateCollection(ClassInfo typeInfo)
    {
-      TypeInfo elementType = objectTypeInfo;
-      
-      TypeInfo[] types = typeInfo.getActualTypeArguments();
-      if (types != null)
-         elementType = types[0];
-      
+      TypeInfo elementType = typeInfo.getComponentType();
       MetaType elementMetaType = resolve(elementType);
       return new CollectionMetaType(typeInfo.getName(), elementMetaType);
    }
@@ -325,15 +316,8 @@
     */
    public TableMetaType generateMap(ClassInfo typeInfo)
    {
-      TypeInfo keyType = objectTypeInfo;
-      TypeInfo valueType = objectTypeInfo;
-      
-      TypeInfo[] types = typeInfo.getActualTypeArguments();
-      if (types != null)
-      {
-         keyType = types[0];
-         valueType = types[1];
-      }
+      TypeInfo keyType = typeInfo.getKeyType();
+      TypeInfo valueType = typeInfo.getValueType();
       return createMapType(keyType, valueType);
    }
    

Modified: projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java	2010-04-09 14:03:39 UTC (rev 103756)
+++ projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java	2010-04-09 14:07:35 UTC (rev 103757)
@@ -894,14 +894,14 @@
    @SuppressWarnings("deprecation")
    protected Object unwrapTable(TableValue tableValue, TypeInfo type)
    {
-      if (type instanceof ParameterizedClassInfo)
+      if (type instanceof ClassInfo)
       {
-         ParameterizedClassInfo parameterizedType = (ParameterizedClassInfo)type;
-         ClassInfo rawType = parameterizedType.getRawType();
+         ClassInfo clazz = (ClassInfo)type;
+         ClassInfo rawType = clazz.getRawType();
          if (Map.class.isAssignableFrom(rawType.getType()))
          {
-            TypeInfo keyType = parameterizedType.getActualTypeArguments()[0];
-            TypeInfo valueType = parameterizedType.getActualTypeArguments()[1];
+            TypeInfo keyType = clazz.getKeyType();
+            TypeInfo valueType = clazz.getValueType();
             return createMap(tableValue, keyType, valueType);
          }
       }