[qdox-scm] [1459] trunk/qdox/src: DefaultJavaMethod.implements returns List

Wed, 28 Dec 2011 06:06:35 -0800

Title: [1459] trunk/qdox/src: DefaultJavaMethod.implements returns List<JavaClass>

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/impl/ModelBuilder.java (1458 => 1459)


--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/impl/ModelBuilder.java	2011-12-28 13:23:33 UTC (rev 1458)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/impl/ModelBuilder.java	2011-12-28 14:06:31 UTC (rev 1459)
@@ -157,7 +157,7 @@
 
         // implements
         Set<TypeDef> implementSet = newClass.isInterface() ? def.getExtends() : def.getImplements();
-        List<JavaType> implementz = new LinkedList<JavaType>();
+        List<JavaClass> implementz = new LinkedList<JavaClass>();
         for ( TypeDef implementType : implementSet )
         {
             implementz.add( createType( implementType, 0 ) );

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaClass.java (1458 => 1459)


--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaClass.java	2011-12-28 13:23:33 UTC (rev 1458)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaClass.java	2011-12-28 14:06:31 UTC (rev 1459)
@@ -43,7 +43,7 @@
  * @author <a href="" Walnes</a>
  * @author Aslak Helles&oslash;y
  */
-public class DefaultJavaClass<T extends JavaClass & JavaParameterizedType>
+public class DefaultJavaClass
     extends AbstractInheritableJavaEntity
     implements JavaClass
 {
@@ -64,7 +64,7 @@
 
     private JavaType superClass;
 
-    private List<T> implementz = new LinkedList<T>();
+    private List<JavaClass> implementz = new LinkedList<JavaClass>();
 
     private List<DefaultJavaTypeVariable<JavaClass>> typeParameters =
         new LinkedList<DefaultJavaTypeVariable<JavaClass>>();
@@ -227,7 +227,7 @@
         superClass = type;
     }
 
-    public void setImplementz( List<T> implementz )
+    public void setImplementz( List<JavaClass> implementz )
     {
         this.implementz = implementz;
     }

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java (1458 => 1459)


--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java	2011-12-28 13:23:33 UTC (rev 1458)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java	2011-12-28 14:06:31 UTC (rev 1459)
@@ -31,7 +31,7 @@
     public abstract void setDeclaringClass( C clazz, JavaClass declaringClazz );
     public abstract void setEnum(C clazz, boolean isEnum);
     public abstract void setFields(C clazz, List<JavaField> fields);
-    public abstract void setImplementz(C clazz, List<JavaType> implementz);
+    public abstract void setImplementz(C clazz, List<JavaClass> implementz);
     public abstract void setInterface(C clazz, boolean isInterface);
     public abstract void setMethods(C clazz, List<JavaMethod> method);
     public abstract void setModifiers(C clazz, List<String> modifiers);
@@ -820,10 +820,10 @@
         assertEquals("mcFnord", properties.get(2).getName());        
     }
     
-    private List<JavaType> type(String[] typeNames) {
-        List<JavaType> result = new LinkedList<JavaType>();
+    private List<JavaClass> type(String[] typeNames) {
+        List<JavaClass> result = new LinkedList<JavaClass>();
         for (int i = 0; i < typeNames.length; i++) {
-            result.add(newType(typeNames[i]));
+            result.add(newJavaClass(typeNames[i]));
         }
         return result;
     }

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaClassIT.java (1458 => 1459)


--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaClassIT.java	2011-12-28 13:23:33 UTC (rev 1458)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaClassIT.java	2011-12-28 14:06:31 UTC (rev 1459)
@@ -27,7 +27,7 @@
     public void testSuperJavaClass() throws Exception
     {
         JavaClass hashSetClass = library.getJavaClass( "java.util.HashSet" );
-        assertTrue( hashSetClass instanceof DefaultJavaClass<?> );
+        assertTrue( hashSetClass instanceof DefaultJavaClass );
         
         JavaClass superClass = hashSetClass.getSuperJavaClass();
         assertEquals( "java.util.AbstractSet", superClass.getFullyQualifiedName() );
@@ -38,7 +38,7 @@
     public void testIsAJavaClass() throws Exception
     {
         JavaClass hashSetClass = library.getJavaClass( "java.util.HashSet" );
-        assertTrue( hashSetClass instanceof DefaultJavaClass<?> );
+        assertTrue( hashSetClass instanceof DefaultJavaClass );
         
         JavaClass setClass = library.getJavaClass( "java.util.Set" );
         assertTrue( hashSetClass.isA( setClass ) );
@@ -51,7 +51,7 @@
     public void testDeclaringClass() throws Exception
     {
         JavaClass entryClass = library.getJavaClass( "java.util.Map$Entry" );
-        assertTrue( entryClass instanceof DefaultJavaClass<?> );
+        assertTrue( entryClass instanceof DefaultJavaClass );
         
         assertEquals( "java.util.Map", entryClass.getDeclaringClass().getFullyQualifiedName() );
         assertEquals( "java.util.Map", Class.forName( "java.util.Map$Entry" ).getDeclaringClass().getName() );
@@ -60,7 +60,7 @@
     @Test 
     public void testDeclaredClasses() throws Exception {
         JavaClass mapClass = library.getJavaClass( "java.util.Map" );
-        assertTrue( mapClass instanceof DefaultJavaClass<?> );
+        assertTrue( mapClass instanceof DefaultJavaClass );
         
         assertEquals( 1, mapClass.getNestedClasses().size() );
         assertEquals( "java.util.Map$Entry",  mapClass.getNestedClassByName( "Entry" ).getFullyQualifiedName() );
@@ -91,7 +91,7 @@
     {
         //subclass
         JavaClass entryClass = library.getJavaClass( "java.util.Map$Entry" );
-        assertTrue( entryClass instanceof DefaultJavaClass<?> );
+        assertTrue( entryClass instanceof DefaultJavaClass );
         
         assertEquals( "java.util.Map$Entry", entryClass.getFullyQualifiedName() );
         assertEquals( "java.util.Map$Entry", Class.forName( "java.util.Map$Entry" ).getName() );

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaClassTest.java (1458 => 1459)


--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaClassTest.java	2011-12-28 13:23:33 UTC (rev 1458)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaClassTest.java	2011-12-28 14:06:31 UTC (rev 1459)
@@ -63,7 +63,7 @@
         clazz.setEnum( isEnum );
     }
 
-    public void setImplementz( DefaultJavaClass clazz, List<JavaType> implementz )
+    public void setImplementz( DefaultJavaClass clazz, List<JavaClass> implementz )
     {
         clazz.setImplementz( implementz );
     }

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaTypeIT.java (1458 => 1459)


--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaTypeIT.java	2011-12-28 13:23:33 UTC (rev 1458)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaTypeIT.java	2011-12-28 14:06:31 UTC (rev 1459)
@@ -26,7 +26,7 @@
     public void testSuperClass()
     {
         JavaClass hashSetClass = library.getJavaClass( "java.util.HashSet" );
-        assertTrue( hashSetClass instanceof DefaultJavaClass<?> );
+        assertTrue( hashSetClass instanceof DefaultJavaClass );
         JavaType hashSetSuperClass = hashSetClass.getSuperClass();
         assertEquals( "java.util.AbstractSet", hashSetSuperClass.getFullyQualifiedName() );
         assertEquals( "java.util.AbstractSet", hashSetSuperClass.getCanonicalName() );

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to