[qdox-scm] [1279] trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java: Removed DefaultJavaClass.getTagsRecursive() and DefaultJavaClass.getMethodsFromSuperclassAndInterfaces() hack, can't be reproduced.

[rfscholte]

Title: [1279] trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java: Removed DefaultJavaClass.getTagsRecursive() and DefaultJavaClass.getMethodsFromSuperclassAndInterfaces() hack, can't be reproduced.

Revision

1279

Author

rfscholte

Date

2011-07-31 06:26:08 -0500 (Sun, 31 Jul 2011)

Log Message

Removed DefaultJavaClass.getTagsRecursive() and DefaultJavaClass.getMethodsFromSuperclassAndInterfaces() hack, can't be reproduced. Code analyze suggests that it's not possible anymore.

Modified Paths

trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java (1278 => 1279)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java	2011-07-31 11:01:08 UTC (rev 1278)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java	2011-07-31 11:26:08 UTC (rev 1279)
@@ -99,8 +99,8 @@
      * @see com.thoughtworks.qdox.model.JavaClass#getSuperClass()
      */
     public Type getSuperClass() {
-        Type OBJECT_TYPE = getSource().getJavaClassLibrary().getJavaClass( "java.lang.Object" ).asType();
-        Type ENUM_TYPE = getSource().getJavaClassLibrary().getJavaClass( "java.lang.Enum" ).asType();
+        Type OBJECT_TYPE = getJavaClassLibrary().getJavaClass( "java.lang.Object" ).asType();
+        Type ENUM_TYPE = getJavaClassLibrary().getJavaClass( "java.lang.Enum" ).asType();
         
         boolean iAmJavaLangObject = OBJECT_TYPE.equals(asType());
 
@@ -118,8 +118,8 @@
      */
     public JavaClass getSuperJavaClass() {
         JavaClass result;
-        JavaClass OBJECT_JAVACLASS = getSource().getJavaClassLibrary().getJavaClass( "java.lang.Object" );
-        JavaClass ENUM_JAVACLASS = getSource().getJavaClassLibrary().getJavaClass( "java.lang.Enum" );
+        JavaClass OBJECT_JAVACLASS = getJavaClassLibrary().getJavaClass( "java.lang.Object" );
+        JavaClass ENUM_JAVACLASS = getJavaClassLibrary().getJavaClass( "java.lang.Enum" );
         
         boolean iAmJavaLangObject = OBJECT_JAVACLASS.equals(this);
         
@@ -135,6 +135,7 @@
         }
         return result;
     }
+    
 
     /* (non-Javadoc)
      * @see com.thoughtworks.qdox.model.JavaClass#getImplements()
@@ -445,9 +446,7 @@
         }
 
         JavaClass superclass = callingClazz.getSuperJavaClass();
-
-        // TODO workaround for a bug in getSuperJavaClass
-        if ( ( superclass != null ) && ( superclass != callingClazz ) )
+        if ( superclass != null )
         {
             Map<String, JavaMethod> superClassMethods =
                 getMethodsFromSuperclassAndInterfaces( callingClazz, superclass );
@@ -784,9 +783,7 @@
         if (superclasses) {
             JavaClass superclass = javaClass.getSuperJavaClass();
 
-            // THIS IS A HACK AROUND A BUG THAT MUST BE SOLVED!!!
-            // SOMETIMES A CLASS RETURNS ITSELF AS SUPER ?!?!?!?!?!
-            if ((superclass != null) && (superclass != javaClass)) {
+            if ( superclass != null ) {
                 result.addAll(getTagsRecursive(superclass, name, superclasses));
             }
 

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email