[jboss-cvs] JBossAS SVN: r106426 - in projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins: javassist and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2010-07-05 11:12:45 -0400 (Mon, 05 Jul 2010)
New Revision: 106426

Modified:
   projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/bytecode/BytecodeInheritableAnnotationHolder.java
   projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/bytecode/BytecodeTypeInfo.java
   projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistInheritableAnnotationHolder.java
   projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java
Log:
[JBAS-8116] Make getSuperHolder() return classinfo

Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/bytecode/BytecodeInheritableAnnotationHolder.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/bytecode/BytecodeInheritableAnnotationHolder.java	2010-07-05 15:08:00 UTC (rev 106425)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/bytecode/BytecodeInheritableAnnotationHolder.java	2010-07-05 15:12:45 UTC (rev 106426)
@@ -28,6 +28,7 @@
 import org.jboss.reflect.plugins.AnnotationHelper;
 import org.jboss.reflect.plugins.bytecode.bytes.ClassBytes;
 import org.jboss.reflect.spi.AnnotationValue;
+import org.jboss.reflect.spi.ClassInfo;
 
 /**
  *
@@ -109,7 +110,7 @@
    @Override
    public void setupAnnotations(AnnotationValue[] annotations)
    {
-      BytecodeInheritableAnnotationHolder superHolder = getSuperHolder();
+      ClassInfo superHolder = getSuperHolder();
       AnnotationValue[] superAllAnnotations = (superHolder != null) ? superHolder.getAnnotations() : null;
       allAnnotations = new HashMap<String, AnnotationValue>();
 
@@ -171,5 +172,5 @@
    }
 
 
-   public abstract BytecodeInheritableAnnotationHolder getSuperHolder();
+   public abstract ClassInfo getSuperHolder();
 }

Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/bytecode/BytecodeTypeInfo.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/bytecode/BytecodeTypeInfo.java	2010-07-05 15:08:00 UTC (rev 106425)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/bytecode/BytecodeTypeInfo.java	2010-07-05 15:12:45 UTC (rev 106426)
@@ -798,11 +798,11 @@
    }
 
    @Override
-   public BytecodeInheritableAnnotationHolder getSuperHolder()
+   public ClassInfo getSuperHolder()
    {
       TypeInfo info = getSuperclass();
       if (info instanceof BytecodeInheritableAnnotationHolder)
-         return (BytecodeInheritableAnnotationHolder)info;
+         return (ClassInfo)info;
       return null;
    }
 

Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistInheritableAnnotationHolder.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistInheritableAnnotationHolder.java	2010-07-05 15:08:00 UTC (rev 106425)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistInheritableAnnotationHolder.java	2010-07-05 15:12:45 UTC (rev 106426)
@@ -28,7 +28,10 @@
 import javassist.CtClass;
 
 import org.jboss.reflect.plugins.AnnotationHelper;
+import org.jboss.reflect.spi.AnnotatedInfo;
 import org.jboss.reflect.spi.AnnotationValue;
+import org.jboss.reflect.spi.ClassInfo;
+import org.jboss.reflect.spi.TypeInfo;
 
 /**
  *
@@ -108,7 +111,8 @@
    @Override
    public void setupAnnotations(AnnotationValue[] annotations)
    {
-      JavassistInheritableAnnotationHolder superHolder = getSuperHolder();
+      ClassInfo superHolder = (ClassInfo)getSuperHolder();
+      //JavassistInheritableAnnotationHolder superHolder = getSuperHolder();
       AnnotationValue[] superAllAnnotations = (superHolder != null) ? superHolder.getAnnotations() : null;
       allAnnotations = new HashMap<String, AnnotationValue>();
 
@@ -170,5 +174,5 @@
    }
 
 
-   public abstract JavassistInheritableAnnotationHolder getSuperHolder();
+   public abstract ClassInfo getSuperHolder();
 }

Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java	2010-07-05 15:08:00 UTC (rev 106425)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java	2010-07-05 15:12:45 UTC (rev 106426)
@@ -812,7 +812,7 @@
    }
 
    @Override
-   public JavassistInheritableAnnotationHolder getSuperHolder()
+   public ClassInfo getSuperHolder()
    {
       try
       {
@@ -821,7 +821,7 @@
          {
             return null;
          }
-         return (JavassistTypeInfo)factory.getTypeInfo(zuper);
+         return (ClassInfo)factory.getTypeInfo(zuper);
       }
       catch (NotFoundException e)
       {