[jboss-cvs] JBossAS SVN: r103750 - in projects/jboss-man/trunk/metatype: src/main/java/org/jboss/metatype/plugins/types and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 9 07:38:55 EDT 2010
Author: kabir.khan at jboss.com
Date: 2010-04-09 07:38:54 -0400 (Fri, 09 Apr 2010)
New Revision: 103750
Modified:
projects/jboss-man/trunk/metatype/pom.xml
projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java
projects/jboss-man/trunk/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/trunk/metatype/pom.xml
===================================================================
--- projects/jboss-man/trunk/metatype/pom.xml 2010-04-09 10:27:23 UTC (rev 103749)
+++ projects/jboss-man/trunk/metatype/pom.xml 2010-04-09 11:38:54 UTC (rev 103750)
@@ -55,10 +55,14 @@
<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>
-
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java
===================================================================
--- projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java 2010-04-09 10:27:23 UTC (rev 103749)
+++ projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java 2010-04-09 11:38:54 UTC (rev 103750)
@@ -192,17 +192,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()))
@@ -305,12 +301,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);
}
@@ -323,15 +314,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/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
===================================================================
--- projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java 2010-04-09 10:27:23 UTC (rev 103749)
+++ projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java 2010-04-09 11:38:54 UTC (rev 103750)
@@ -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);
}
}
More information about the jboss-cvs-commits
mailing list