[jboss-cvs] JBossAS SVN: r93003 - in projects/annotations/trunk/core/src/main/java/org/jboss/annotations: javalangreflect and 1 other directory.

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

Author: jesper.pedersen
Date: 2009-08-30 07:20:13 -0400 (Sun, 30 Aug 2009)
New Revision: 93003

Modified:
   projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AbstractJavassistAnnotationScanner.java
   projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/ClassInfo.java
   projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javalangreflect/JavaClass.java
Log:
[JBANN-3] Support inheritance (Part 5)

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AbstractJavassistAnnotationScanner.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AbstractJavassistAnnotationScanner.java	2009-08-30 08:08:55 UTC (rev 93002)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AbstractJavassistAnnotationScanner.java	2009-08-30 11:20:13 UTC (rev 93003)
@@ -90,8 +90,6 @@
 
          if (ctClass.getSuperclass() != null && !ctClass.getSuperclass().getName().startsWith("java."))
          {
-            ci.setSuperClassName(ctClass.getSuperclass().getName());
-
             ClassInfo sci = classInfo.get(ctClass.getSuperclass().getName());
             if (sci == null)
             {

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/ClassInfo.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/ClassInfo.java	2009-08-30 08:08:55 UTC (rev 93002)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/ClassInfo.java	2009-08-30 11:20:13 UTC (rev 93003)
@@ -42,9 +42,6 @@
    /** The class name */
    private String className;
 
-   /** The super class name */
-   private String superClassName;
-
    /** Is interface */
    private boolean isInterface;
 
@@ -64,7 +61,6 @@
    public ClassInfo(String className)
    {
       this.className = className;
-      this.superClassName = null;
       this.isInterface = false;
       this.isAbstract = false;
       this.annotations = null;
@@ -81,24 +77,6 @@
    }
 
    /**
-    * Get the super class name
-    * @return The class name; <code>null</code> if part of the java package name space
-    */
-   public String getSuperClassName()
-   {
-      return superClassName;
-   }
-
-   /**
-    * Set the super class name
-    * @param clz The class name; <code>null</code> if part of the java package name space
-    */
-   public void setSuperClassName(String clz)
-   {
-      superClassName = clz;
-   }
-
-   /**
     * Does the class represent an interface
     * @return True if interface; false if class
     */
@@ -210,7 +188,6 @@
 
       sb = sb.append("{");
       sb = sb.append("ClassName=" + className + ",");
-      sb = sb.append("SuperClass=" + superClassName + ",");
       sb = sb.append("Annotations=" + annotations + ",");
       sb = sb.append("IsInterface=" + isInterface + ",");
       sb = sb.append("IsAbstract=" + isAbstract + ",");

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javalangreflect/JavaClass.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javalangreflect/JavaClass.java	2009-08-30 08:08:55 UTC (rev 93002)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javalangreflect/JavaClass.java	2009-08-30 11:20:13 UTC (rev 93003)
@@ -124,8 +124,6 @@
 
                               if (clz.getSuperclass() != null && !clz.getSuperclass().getName().startsWith("java."))
                               {
-                                 ci.setSuperClassName(clz.getSuperclass().getName());
-                              
                                  ClassInfo sci = classInfo.get(clz.getSuperclass().getName());
                                  if (sci == null)
                                  {