[jboss-cvs] JBossAS SVN: r102449 - in projects/jboss-reflect/trunk/src: main/java/org/jboss/reflect/plugins/javassist and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 16 05:40:13 EDT 2010
Author: kabir.khan at jboss.com
Date: 2010-03-16 05:40:12 -0400 (Tue, 16 Mar 2010)
New Revision: 102449
Modified:
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/AnnotationInfoImpl.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/AnnotationValueFactory.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/EnumInfoImpl.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/InterfaceInfoImpl.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/MethodAccessRestrictionTestCase.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistConstructorInfoTestCase.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistUtilTestCase.java
Log:
Tidy up a bit
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/AnnotationInfoImpl.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/AnnotationInfoImpl.java 2010-03-16 09:35:42 UTC (rev 102448)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/AnnotationInfoImpl.java 2010-03-16 09:40:12 UTC (rev 102449)
@@ -25,7 +25,6 @@
import org.jboss.reflect.spi.AnnotationAttribute;
import org.jboss.reflect.spi.AnnotationInfo;
-import org.jboss.reflect.spi.ModifierInfo;
/**
* Annotation Info
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/AnnotationValueFactory.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/AnnotationValueFactory.java 2010-03-16 09:35:42 UTC (rev 102448)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/AnnotationValueFactory.java 2010-03-16 09:40:12 UTC (rev 102449)
@@ -22,13 +22,8 @@
package org.jboss.reflect.plugins;
import java.lang.annotation.Annotation;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
-import java.util.Map;
-import org.jboss.beans.info.spi.BeanInfo;
import org.jboss.reflect.spi.AnnotationInfo;
import org.jboss.reflect.spi.AnnotationValue;
import org.jboss.reflect.spi.ArrayInfo;
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/EnumInfoImpl.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/EnumInfoImpl.java 2010-03-16 09:35:42 UTC (rev 102448)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/EnumInfoImpl.java 2010-03-16 09:40:12 UTC (rev 102449)
@@ -25,7 +25,6 @@
import org.jboss.reflect.spi.EnumConstantInfo;
import org.jboss.reflect.spi.EnumInfo;
-import org.jboss.reflect.spi.ModifierInfo;
/**
* Enumeration info
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/InterfaceInfoImpl.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/InterfaceInfoImpl.java 2010-03-16 09:35:42 UTC (rev 102448)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/InterfaceInfoImpl.java 2010-03-16 09:40:12 UTC (rev 102449)
@@ -22,7 +22,6 @@
package org.jboss.reflect.plugins;
import org.jboss.reflect.spi.InterfaceInfo;
-import org.jboss.reflect.spi.ModifierInfo;
/**
* Interface info
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java 2010-03-16 09:35:42 UTC (rev 102448)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java 2010-03-16 09:40:12 UTC (rev 102449)
@@ -68,7 +68,7 @@
*
* @version $Revision$
*/
-public class JavassistTypeInfoFactoryImpl extends WeakClassCache implements MutableTypeInfoFactory, AnnotationHelper
+public class JavassistTypeInfoFactoryImpl extends WeakClassCache<TypeInfo> implements MutableTypeInfoFactory, AnnotationHelper
{
private static ClassPoolFactory poolFactory = DefaultClassPoolFactory.getInstance();
@@ -148,7 +148,7 @@
@Override
@SuppressWarnings("unchecked")
- protected Object instantiate(Class clazz)
+ protected TypeInfo instantiate(Class clazz)
{
try
{
@@ -252,7 +252,7 @@
* @throws ClassNotFoundException when the class cannot be found
*/
@Override
- public Object get(String name, ClassLoader cl) throws ClassNotFoundException
+ public TypeInfo get(String name, ClassLoader cl) throws ClassNotFoundException
{
return get(name, cl, null);
}
@@ -490,7 +490,7 @@
@Override
@SuppressWarnings("unchecked")
- protected void generate(Class clazz, Object result)
+ protected void generate(Class clazz, TypeInfo result)
{
// Everything is done lazily
}
@@ -548,8 +548,8 @@
return getGenericArrayType((GenericArrayType)type);
else if (type instanceof TypeVariable)
return getTypeVariable((TypeVariable<?>) type);
-
- throw new org.jboss.util.NotImplementedException("getTypeInfo");
+ else
+ throw new UnsupportedOperationException("Unknown type: " + type + " class=" + type.getClass());
}
public AnnotationValue[] getAnnotations(Object obj)
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/MethodAccessRestrictionTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/MethodAccessRestrictionTestCase.java 2010-03-16 09:35:42 UTC (rev 102448)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/MethodAccessRestrictionTestCase.java 2010-03-16 09:40:12 UTC (rev 102449)
@@ -24,10 +24,10 @@
import java.lang.reflect.Method;
import junit.framework.Test;
+
+import org.jboss.reflect.plugins.introspection.ReflectMethodInfoImpl;
import org.jboss.reflect.spi.ClassInfo;
import org.jboss.reflect.spi.MethodInfo;
-import org.jboss.reflect.spi.TypeInfo;
-import org.jboss.reflect.plugins.introspection.ReflectMethodInfoImpl;
import org.jboss.test.classinfo.support.MethodsClass;
/**
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistConstructorInfoTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistConstructorInfoTestCase.java 2010-03-16 09:35:42 UTC (rev 102448)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistConstructorInfoTestCase.java 2010-03-16 09:40:12 UTC (rev 102449)
@@ -4,7 +4,6 @@
import org.jboss.reflect.spi.ModifierInfo;
import org.jboss.reflect.spi.MutableClassInfo;
import org.jboss.reflect.spi.MutableConstructorInfo;
-import org.jboss.reflect.spi.MutableFieldInfo;
import org.jboss.test.ContainerTest;
public class JavassistConstructorInfoTestCase extends ContainerTest
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistUtilTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistUtilTestCase.java 2010-03-16 09:35:42 UTC (rev 102448)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistUtilTestCase.java 2010-03-16 09:40:12 UTC (rev 102449)
@@ -32,11 +32,9 @@
import javassist.CtField;
import javassist.CtMethod;
import javassist.CtNewMethod;
-import javassist.Modifier;
import javassist.NotFoundException;
import org.jboss.reflect.plugins.javassist.JavassistUtil;
-import org.jboss.reflect.spi.ModifierInfo;
import org.jboss.test.ContainerTest;
/**
More information about the jboss-cvs-commits
mailing list