[qdox-scm] [1258] trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java: Logic of Type.isA() should use JavaClass.isA()

[rfscholte]

Title: [1258] trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java: Logic of Type.isA() should use JavaClass.isA()

Revision

1258

Author

rfscholte

Date

2011-06-04 10:52:50 -0500 (Sat, 04 Jun 2011)

Log Message

Logic of Type.isA() should use JavaClass.isA()

Modified Paths

• trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java (1257 => 1258)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java	2011-06-01 18:26:37 UTC (rev 1257)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java	2011-06-04 15:52:50 UTC (rev 1258)
@@ -279,16 +279,13 @@
     }
 
     public JavaClass getJavaClass() {
-    	JavaClass result = null;
+    	JavaClass result;
     	
         JavaClassParent javaClassParent = getJavaClassParent();
-        if (javaClassParent != null) {
-        	result = javaClassParent.getNestedClassByName(getFullyQualifiedName());
-	        if(result == null) {
-	            if(javaClassParent.getJavaClassLibrary() != null) {
-	                result = javaClassParent.getJavaClassLibrary().getJavaClass( getFullyQualifiedName(), true );
-	            }
-	        }
+    	result = javaClassParent.getNestedClassByName(getFullyQualifiedName());
+        if(result == null) 
+        {
+            result = javaClassParent.getJavaClassLibrary().getJavaClass( getFullyQualifiedName(), true );
         }
         return result;
     }
@@ -297,25 +294,13 @@
      * @since 1.3
      */
     public boolean isA(Type type) {
-        if (this.equals(type)) {
+        if (this == type) {
             return true;
         } else {
             JavaClass cls = getJavaClass();
+            
             if (cls != null) {
-                // ask our interfaces
-                for (Type implementz : cls.getImplements()) {
-                    if (implementz.isA(type)) {
-                        return true;
-                    }
-                }
-
-                // ask our superclass
-                Type supertype = cls.getSuperClass();
-                if (supertype != null) {
-                    if (supertype.isA(type)) {
-                        return true;
-                    }
-                }
+                return cls.isA( type.getJavaClass() );
             }
         }
         // We'we walked up the hierarchy and found nothing.

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email