[qdox-scm] [1086] trunk/qdox/src/test/com/thoughtworks/qdox/model:

[rfscholte]

Title: [1086] trunk/qdox/src/test/com/thoughtworks/qdox/model:

Revision

1086

Author

rfscholte

Date

2011-02-27 07:44:38 -0600 (Sun, 27 Feb 2011)

Log Message

Modified Paths

• trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaSourceTest.java
• trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaSourceTest.java

Diff

Modified: trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaSourceTest.java (1085 => 1086)

--- trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaSourceTest.java	2011-02-27 13:39:58 UTC (rev 1085)
+++ trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaSourceTest.java	2011-02-27 13:44:38 UTC (rev 1086)
@@ -1,7 +1,7 @@
 package com.thoughtworks.qdox.model;
 
 
-public class DefaultJavaSourceTest extends JavaSourceTest
+public class DefaultJavaSourceTest extends JavaSourceTest<DefaultJavaSource>
 {
 
     public DefaultJavaSourceTest( String s )
@@ -9,7 +9,7 @@
         super( s );
     }
 
-    public JavaSource newJavaSource(com.thoughtworks.qdox.library.ClassLibrary classLibrary)
+    public DefaultJavaSource newJavaSource(com.thoughtworks.qdox.library.ClassLibrary classLibrary)
     {
         return new DefaultJavaSource(classLibrary);
     }
@@ -35,9 +35,9 @@
         return new DefaultJavaPackage(name);
     }
 
-    public void setPackage( JavaSource source, JavaPackage pckg )
+    public void setPackage( DefaultJavaSource source, JavaPackage pckg )
     {
-        ((DefaultJavaSource) source).setPackage( pckg );
+        source.setPackage( pckg );
     }
 
     public void addImport( JavaSource source, String imp )

Modified: trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaSourceTest.java (1085 => 1086)

--- trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaSourceTest.java	2011-02-27 13:39:58 UTC (rev 1085)
+++ trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaSourceTest.java	2011-02-27 13:44:38 UTC (rev 1086)
@@ -4,19 +4,24 @@
 
 import junit.framework.TestCase;
 
-public abstract class JavaSourceTest extends TestCase {
+public abstract class JavaSourceTest<S extends JavaSource> extends TestCase {
 
-    private JavaSource source;
+    private S source;
 
     public JavaSourceTest(String s) {
         super(s);
     }
+
+    //constructors
+    public abstract S newJavaSource(com.thoughtworks.qdox.library.ClassLibrary classLibrary);
     
-    public abstract JavaSource newJavaSource(com.thoughtworks.qdox.library.ClassLibrary classLibrary);
+    
+    //setters
+    public abstract void setPackage(S source, JavaPackage pckg);
+
     public abstract JavaClass newJavaClass();
     public abstract JavaPackage newJavaPackage(String name);
-    
-    public abstract void setPackage(JavaSource source, JavaPackage pckg);
+
     public abstract void setName(JavaClass clazz, String name);
     
     public abstract void addClass(JavaSource source, JavaClass clazz);

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email