- Revision
- 601
- Author
- rfscholte
- Date
- 2009-05-23 04:42:34 -0500 (Sat, 23 May 2009)
Log Message
removed JavaClassCache from ClassLibrary
Modified Paths
- trunk/qdox/src/java/com/thoughtworks/qdox/model/ClassLibrary.java
- trunk/qdox/src/java/com/thoughtworks/qdox/model/ModelBuilder.java
- trunk/qdox/src/test/com/thoughtworks/qdox/model/ClassLibraryTest.java
- trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaSourceTest.java
- trunk/qdox/src/test/com/thoughtworks/qdox/model/TypeTest.java
Diff
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/model/ClassLibrary.java (600 => 601)
--- trunk/qdox/src/java/com/thoughtworks/qdox/model/ClassLibrary.java 2009-05-21 11:13:00 UTC (rev 600) +++ trunk/qdox/src/java/com/thoughtworks/qdox/model/ClassLibrary.java 2009-05-23 09:42:34 UTC (rev 601) @@ -23,22 +23,13 @@ private final Map classNameToClassMap = new HashMap(); private boolean defaultClassLoadersAdded = false; private transient List classLoaders = new ArrayList(); - private JavaClassCache cache; public ClassLibrary() {} - public ClassLibrary(JavaClassCache cache) { - this.cache = cache; - } - public void add(String className) { classNames.add(className); } - public JavaClass getClassByName(String name) { - return cache.getClassByName(name); - } - public boolean contains(String className) { if (classNames.contains(className)) { return true;
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/model/ModelBuilder.java (600 => 601)
--- trunk/qdox/src/java/com/thoughtworks/qdox/model/ModelBuilder.java 2009-05-21 11:13:00 UTC (rev 600) +++ trunk/qdox/src/java/com/thoughtworks/qdox/model/ModelBuilder.java 2009-05-23 09:42:34 UTC (rev 601) @@ -39,7 +39,7 @@ private final Map allPackages; public ModelBuilder() { - this(new JavaClassContext(new ClassLibrary(null)), new DefaultDocletTagFactory(), new HashMap()); + this(new JavaClassContext(new ClassLibrary()), new DefaultDocletTagFactory(), new HashMap()); } public ModelBuilder(JavaClassContext context, DocletTagFactory docletTagFactory, Map allPackages) {
Modified: trunk/qdox/src/test/com/thoughtworks/qdox/model/ClassLibraryTest.java (600 => 601)
--- trunk/qdox/src/test/com/thoughtworks/qdox/model/ClassLibraryTest.java 2009-05-21 11:13:00 UTC (rev 600) +++ trunk/qdox/src/test/com/thoughtworks/qdox/model/ClassLibraryTest.java 2009-05-23 09:42:34 UTC (rev 601) @@ -4,7 +4,7 @@ import java.util.Collection; -public class ClassLibraryTest extends TestCase implements JavaClassCache { +public class ClassLibraryTest extends TestCase { public ClassLibraryTest(String s) { super(s); @@ -21,7 +21,7 @@ } public void testAdd() throws Exception { - ClassLibrary c = new ClassLibrary(this); + ClassLibrary c = new ClassLibrary(); c.add("com.blah.Ping"); c.add("com.moo.Poo"); assertTrue(c.contains("com.blah.Ping")); @@ -30,7 +30,7 @@ } public void testListAll() throws Exception { - ClassLibrary c = new ClassLibrary(this); + ClassLibrary c = new ClassLibrary(); c.add("com.blah.Ping"); c.add("com.thing.Ping"); c.add("com.x.Goat"); @@ -47,12 +47,12 @@ } public void testNoClassLoaders() throws Exception { - ClassLibrary c = new ClassLibrary(this); + ClassLibrary c = new ClassLibrary(); assertTrue(!c.contains("java.lang.String")); } public void testWithClassLoader() throws Exception { - ClassLibrary c = new ClassLibrary(this); + ClassLibrary c = new ClassLibrary(); c.addClassLoader(getClass().getClassLoader()); assertTrue(c.contains("java.lang.String")); assertTrue(c.contains("java.util.Collection")); @@ -60,22 +60,11 @@ } public void testDefaultClassLoader() throws Exception { - ClassLibrary c = new ClassLibrary(this); + ClassLibrary c = new ClassLibrary(); c.addDefaultLoader(); assertTrue(c.contains("java.lang.String")); assertTrue(c.contains("java.util.Collection")); assertTrue(c.contains("java.util.Map$Entry")); assertTrue(!c.contains("java.util.GoatCrusher")); } - - public void testAccessingCache() throws Exception { - ClassLibrary c = new ClassLibrary(this); - JavaClass jclass = c.getClassByName("MyClass"); - assertNotNull(jclass); - assertEquals("MyClass", jclass.getName()); - } - - public void putClassByName(String name, JavaClass javaClass) { - //only required by interface - } }
Modified: trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaSourceTest.java (600 => 601)
--- trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaSourceTest.java 2009-05-21 11:13:00 UTC (rev 600) +++ trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaSourceTest.java 2009-05-23 09:42:34 UTC (rev 601) @@ -15,7 +15,7 @@ protected void setUp() throws Exception { super.setUp(); source = new JavaSource(); - source.setClassLibrary(new ClassLibrary(null)); + source.setClassLibrary(new ClassLibrary()); } public void testToStringOneClass() throws Exception {
Modified: trunk/qdox/src/test/com/thoughtworks/qdox/model/TypeTest.java (600 => 601)
--- trunk/qdox/src/test/com/thoughtworks/qdox/model/TypeTest.java 2009-05-21 11:13:00 UTC (rev 600) +++ trunk/qdox/src/test/com/thoughtworks/qdox/model/TypeTest.java 2009-05-23 09:42:34 UTC (rev 601) @@ -12,7 +12,7 @@ } public void testResolving() throws Exception { - ClassLibrary classLib = new ClassLibrary(null); + ClassLibrary classLib = new ClassLibrary(); JavaSource src = "" JavaSource(); src.setClassLibrary(classLib); src.addImport("foo.*"); @@ -48,7 +48,7 @@ public void testTypeHasJavaClass() { JavaSource javaSource = new JavaSource(new JavaClassContext(new JavaDocBuilder())); - javaSource.setClassLibrary(new ClassLibrary(null)); + javaSource.setClassLibrary(new ClassLibrary()); Type type = new Type("java.util.HashSet", 0, javaSource); JavaClass clazz = type.getJavaClass(); JavaClass superClass = clazz.getSuperJavaClass();
To unsubscribe from this list please visit:
