[jboss-cvs] JBossAS SVN: r105100 - in projects/jboss-reflect/branches: kabir_wip/src/main/java/org/jboss/reflect/plugins and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 21 11:23:25 EDT 2010
Author: kabir.khan at jboss.com
Date: 2010-05-21 11:23:24 -0400 (Fri, 21 May 2010)
New Revision: 105100
Added:
projects/jboss-reflect/branches/kabir_wip/
projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/ClassInfoEqualizer.java
projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/introspection/ParameterizedClassInfo.java
projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/javassist/JavassistClassInfo.java
Removed:
projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/introspection/ParameterizedClassInfo.java
projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/javassist/JavassistClassInfo.java
Log:
Copied: projects/jboss-reflect/branches/kabir_wip (from rev 105097, projects/jboss-reflect/trunk)
Copied: projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/ClassInfoEqualizer.java (from rev 105098, projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/ClassInfoEqualizer.java)
===================================================================
--- projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/ClassInfoEqualizer.java (rev 0)
+++ projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/ClassInfoEqualizer.java 2010-05-21 15:23:24 UTC (rev 105100)
@@ -0,0 +1,63 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.reflect.plugins;
+
+import org.jboss.reflect.plugins.introspection.ParameterizedClassInfo;
+import org.jboss.reflect.plugins.javassist.JavassistClassInfo;
+import org.jboss.reflect.plugins.javassist.JavassistParameterizedClassInfo;
+import org.jboss.reflect.spi.ClassInfo;
+import org.jboss.reflect.spi.DelegateClassInfo;
+
+/**
+ * A hacky attempt at unifying how we compare the different class infos
+ * This will become a problem if unknown class infos are added...
+ *
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ClassInfoEqualizer
+{
+ public boolean equals(ClassInfo infoA, ClassInfo infoB)
+ {
+ if (infoA instanceof DelegateClassInfo && infoB instanceof DelegateClassInfo == false)
+ {
+ return infoA.getName().equals(infoB.getName());
+ }
+ if (infoA instanceof DelegateClassInfo == false && infoB instanceof DelegateClassInfo)
+ {
+ return infoA.getName().equals(infoB.getName());
+ }
+ if (infoA instanceof JavassistClassInfo && infoB instanceof JavassistClassInfo)
+ {
+ ((JavassistClassInfo)infoA).getClassSignature()
+ }
+ if (infoA instanceof DelegateClassInfo && infoB instanceof DelegateClassInfo)
+ {
+ if (infoA instanceof ParameterizedClassInfo && infoB instanceof ParameterizedClassInfo)
+ {
+ return ((ParameterizedClassInfo)infoA).getParameterizedType().equals(((ParameterizedClassInfo)infoB).getParameterizedType());
+ }
+ }
+ return false;
+ }
+}
Deleted: projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/introspection/ParameterizedClassInfo.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/introspection/ParameterizedClassInfo.java 2010-05-21 14:24:32 UTC (rev 105097)
+++ projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/introspection/ParameterizedClassInfo.java 2010-05-21 15:23:24 UTC (rev 105100)
@@ -1,156 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.reflect.plugins.introspection;
-
-import java.lang.reflect.ParameterizedType;
-
-import org.jboss.reflect.plugins.ClassInfoImpl;
-import org.jboss.reflect.plugins.TypeVariableAware;
-import org.jboss.reflect.spi.ClassInfo;
-import org.jboss.reflect.spi.DelegateClassInfo;
-import org.jboss.reflect.spi.TypeInfo;
-import org.jboss.reflect.spi.TypeInfoFactory;
-import org.jboss.util.JBossStringBuilder;
-
-/**
- * ParameterizedClassInfo.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public class ParameterizedClassInfo extends DelegateClassInfo implements TypeVariableAware
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 2;
-
- /** The factory */
- protected transient IntrospectionTypeInfoFactoryImpl factory;
-
- /** The parameterized type */
- transient ParameterizedType parameterizedType;
-
- /** The owner type */
- private TypeInfo ownerType = ClassInfoImpl.UNKNOWN_TYPE;
-
- /** The type arguments */
- private TypeInfo[] typeArguments = ClassInfoImpl.UNKNOWN_TYPES;
-
- /** The component type */
- private transient TypeInfo componentType = ClassInfoImpl.UNKNOWN_TYPE;
-
- /** The key type */
- private transient TypeInfo keyType = ClassInfoImpl.UNKNOWN_TYPE;
-
- /** The key type */
- private transient TypeInfo valueType = ClassInfoImpl.UNKNOWN_TYPE;
-
- private volatile String typeVariable;
-
- /**
- * Create a new ParameterizedClassInfo.
- *
- * @param factory the factory
- * @param delegate the raw array info
- * @param parameterizedType the parameterized type
- */
- public ParameterizedClassInfo(IntrospectionTypeInfoFactoryImpl factory, ClassInfo delegate, ParameterizedType parameterizedType)
- {
- super(delegate);
- this.factory = factory;
- this.delegate = delegate;
- this.parameterizedType = parameterizedType;
- }
-
- public void setTypeVariable(String typeVariable)
- {
- this.typeVariable = typeVariable;
- }
-
- public String getTypeVariable()
- {
- return typeVariable;
- }
-
- @Override
- public TypeInfoFactory getTypeInfoFactory()
- {
- return factory;
- }
-
- @Override
- public TypeInfo[] getActualTypeArguments()
- {
- if (typeArguments == ClassInfoImpl.UNKNOWN_TYPES)
- typeArguments = factory.getActualTypeArguments(this);
- return typeArguments;
- }
-
- @Override
- public TypeInfo getOwnerType()
- {
- if (ownerType == ClassInfoImpl.UNKNOWN_TYPE)
- ownerType = factory.getOwnerType(this);
- return ownerType;
- }
-
- @Override
- public ClassInfo getRawType()
- {
- return delegate;
- }
-
- @Override
- public TypeInfo getComponentType()
- {
- if (componentType == ClassInfoImpl.UNKNOWN_TYPE)
- componentType = factory.getComponentType(this);
- return componentType;
- }
-
- @Override
- public TypeInfo getKeyType()
- {
- if (keyType == ClassInfoImpl.UNKNOWN_TYPE)
- keyType = factory.getKeyType(this);
- return keyType;
- }
-
- @Override
- public TypeInfo getValueType()
- {
- if (valueType == ClassInfoImpl.UNKNOWN_TYPE)
- valueType = factory.getValueType(this);
- return valueType;
- }
-
- @Override
- public void toShortString(JBossStringBuilder buffer)
- {
- buffer.append(parameterizedType);
- }
-
- @Override
- protected void toString(JBossStringBuilder buffer)
- {
- buffer.append(parameterizedType);
- }
-}
Copied: projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/introspection/ParameterizedClassInfo.java (from rev 105098, projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/introspection/ParameterizedClassInfo.java)
===================================================================
--- projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/introspection/ParameterizedClassInfo.java (rev 0)
+++ projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/introspection/ParameterizedClassInfo.java 2010-05-21 15:23:24 UTC (rev 105100)
@@ -0,0 +1,161 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.reflect.plugins.introspection;
+
+import java.lang.reflect.ParameterizedType;
+
+import org.jboss.reflect.plugins.ClassInfoImpl;
+import org.jboss.reflect.plugins.TypeVariableAware;
+import org.jboss.reflect.spi.ClassInfo;
+import org.jboss.reflect.spi.DelegateClassInfo;
+import org.jboss.reflect.spi.TypeInfo;
+import org.jboss.reflect.spi.TypeInfoFactory;
+import org.jboss.util.JBossStringBuilder;
+
+/**
+ * ParameterizedClassInfo.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class ParameterizedClassInfo extends DelegateClassInfo implements TypeVariableAware
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 2;
+
+ /** The factory */
+ protected transient IntrospectionTypeInfoFactoryImpl factory;
+
+ /** The parameterized type */
+ transient ParameterizedType parameterizedType;
+
+ /** The owner type */
+ private TypeInfo ownerType = ClassInfoImpl.UNKNOWN_TYPE;
+
+ /** The type arguments */
+ private TypeInfo[] typeArguments = ClassInfoImpl.UNKNOWN_TYPES;
+
+ /** The component type */
+ private transient TypeInfo componentType = ClassInfoImpl.UNKNOWN_TYPE;
+
+ /** The key type */
+ private transient TypeInfo keyType = ClassInfoImpl.UNKNOWN_TYPE;
+
+ /** The key type */
+ private transient TypeInfo valueType = ClassInfoImpl.UNKNOWN_TYPE;
+
+ private volatile String typeVariable;
+
+ /**
+ * Create a new ParameterizedClassInfo.
+ *
+ * @param factory the factory
+ * @param delegate the raw array info
+ * @param parameterizedType the parameterized type
+ */
+ public ParameterizedClassInfo(IntrospectionTypeInfoFactoryImpl factory, ClassInfo delegate, ParameterizedType parameterizedType)
+ {
+ super(delegate);
+ this.factory = factory;
+ this.delegate = delegate;
+ this.parameterizedType = parameterizedType;
+ }
+
+ public void setTypeVariable(String typeVariable)
+ {
+ this.typeVariable = typeVariable;
+ }
+
+ public String getTypeVariable()
+ {
+ return typeVariable;
+ }
+
+ @Override
+ public TypeInfoFactory getTypeInfoFactory()
+ {
+ return factory;
+ }
+
+ @Override
+ public TypeInfo[] getActualTypeArguments()
+ {
+ if (typeArguments == ClassInfoImpl.UNKNOWN_TYPES)
+ typeArguments = factory.getActualTypeArguments(this);
+ return typeArguments;
+ }
+
+ @Override
+ public TypeInfo getOwnerType()
+ {
+ if (ownerType == ClassInfoImpl.UNKNOWN_TYPE)
+ ownerType = factory.getOwnerType(this);
+ return ownerType;
+ }
+
+ @Override
+ public ClassInfo getRawType()
+ {
+ return delegate;
+ }
+
+ @Override
+ public TypeInfo getComponentType()
+ {
+ if (componentType == ClassInfoImpl.UNKNOWN_TYPE)
+ componentType = factory.getComponentType(this);
+ return componentType;
+ }
+
+ @Override
+ public TypeInfo getKeyType()
+ {
+ if (keyType == ClassInfoImpl.UNKNOWN_TYPE)
+ keyType = factory.getKeyType(this);
+ return keyType;
+ }
+
+ @Override
+ public TypeInfo getValueType()
+ {
+ if (valueType == ClassInfoImpl.UNKNOWN_TYPE)
+ valueType = factory.getValueType(this);
+ return valueType;
+ }
+
+ @Override
+ public void toShortString(JBossStringBuilder buffer)
+ {
+ buffer.append(parameterizedType);
+ }
+
+ @Override
+ protected void toString(JBossStringBuilder buffer)
+ {
+ buffer.append(parameterizedType);
+ }
+
+ public ParameterizedType getParameterizedType()
+ {
+ return parameterizedType;
+ }
+}
Deleted: projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/javassist/JavassistClassInfo.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistClassInfo.java 2010-05-21 14:24:32 UTC (rev 105097)
+++ projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/javassist/JavassistClassInfo.java 2010-05-21 15:23:24 UTC (rev 105100)
@@ -1,40 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.reflect.plugins.javassist;
-
-import javassist.bytecode.SignatureAttribute.ClassSignature;
-
-import org.jboss.reflect.spi.ClassInfo;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-interface JavassistClassInfo extends ClassInfo
-{
- ClassSignature getClassSignature();
-
- ClassLoader getClassLoaderInternal();
-
- JavassistTypeInfoFactoryImpl getFactory();
-}
Copied: projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/javassist/JavassistClassInfo.java (from rev 105098, projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistClassInfo.java)
===================================================================
--- projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/javassist/JavassistClassInfo.java (rev 0)
+++ projects/jboss-reflect/branches/kabir_wip/src/main/java/org/jboss/reflect/plugins/javassist/JavassistClassInfo.java 2010-05-21 15:23:24 UTC (rev 105100)
@@ -0,0 +1,40 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.reflect.plugins.javassist;
+
+import javassist.bytecode.SignatureAttribute.ClassSignature;
+
+import org.jboss.reflect.spi.ClassInfo;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface JavassistClassInfo extends ClassInfo
+{
+ ClassSignature getClassSignature();
+
+ ClassLoader getClassLoaderInternal();
+
+ JavassistTypeInfoFactoryImpl getFactory();
+}
More information about the jboss-cvs-commits
mailing list