- Revision
- 817
- Author
- rfscholte
- Date
- 2010-10-23 15:49:41 -0500 (Sat, 23 Oct 2010)
Log Message
Remove every (old)ClassLibrary reference from JavaClassContext
Modified Paths
- trunk/qdox/src/java/com/thoughtworks/qdox/JavaClassContext.java
- trunk/qdox/src/java/com/thoughtworks/qdox/JavaDocBuilder.java
- trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClass.java
- trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClassParent.java
- trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaSource.java
- trunk/qdox/src/java/com/thoughtworks/qdox/model/ModelBuilder.java
- trunk/qdox/src/java/com/thoughtworks/qdox/model/Type.java
Diff
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/JavaClassContext.java (816 => 817)
--- trunk/qdox/src/java/com/thoughtworks/qdox/JavaClassContext.java 2010-10-23 20:41:22 UTC (rev 816) +++ trunk/qdox/src/java/com/thoughtworks/qdox/JavaClassContext.java 2010-10-23 20:49:41 UTC (rev 817) @@ -6,7 +6,6 @@ import java.util.Map; import java.util.Set; -import com.thoughtworks.qdox.model.ClassLibrary; import com.thoughtworks.qdox.model.JavaClass; import com.thoughtworks.qdox.model.JavaPackage; import com.thoughtworks.qdox.model.JavaSource; @@ -21,7 +20,6 @@ */ public class JavaClassContext implements Serializable { - private ClassLibrary classLibrary; private JavaDocBuilder builder; private Map classMap = new LinkedHashMap(); // <String, com.thoughtworks.qdox.model.JavaClass> private Map packageMap = new LinkedHashMap(); // <String, com.thoughtworks.qdox.model.JavaPackage> @@ -34,20 +32,6 @@ this.builder = builder; } - public void setClassLibrary(ClassLibrary classLibrary) { - this.classLibrary = classLibrary; - } - - /** - * temporary, this should be hidden - * @return classLibrary - * @todo remove - */ - public ClassLibrary getClassLibrary() { - return classLibrary; - } - - public JavaClass getClassByName(String name) { JavaClass result = (JavaClass) classMap.get( name ); if(result == null && builder != null) {
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/JavaDocBuilder.java (816 => 817)
--- trunk/qdox/src/java/com/thoughtworks/qdox/JavaDocBuilder.java 2010-10-23 20:41:22 UTC (rev 816) +++ trunk/qdox/src/java/com/thoughtworks/qdox/JavaDocBuilder.java 2010-10-23 20:49:41 UTC (rev 817) @@ -103,7 +103,6 @@ this.oldClassLibrary = new ClassLibrary(); this.oldClassLibrary.addDefaultLoader(); this.context = new JavaClassContext(this); - this.context.setClassLibrary(oldClassLibrary); //cross refs, this one should be removed this.oldClassLibrary.setContext( context ); this.builderFactory = new ModelBuilderFactory() { @@ -125,7 +124,6 @@ public JavaDocBuilder(final DocletTagFactory docletTagFactory, ClassLibrary classLibrary) { this.oldClassLibrary = classLibrary; this.context = new JavaClassContext(this); - this.context.setClassLibrary(classLibrary); //cross refs, this one should be removed this.oldClassLibrary.setContext( context ); this.builderFactory = new ModelBuilderFactory() {
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClass.java (816 => 817)
--- trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClass.java 2010-10-23 20:41:22 UTC (rev 816) +++ trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClass.java 2010-10-23 20:49:41 UTC (rev 817) @@ -764,4 +764,15 @@ return null; } } + + public com.thoughtworks.qdox.model.ClassLibrary getClassLibrary() + { + //JavaClass should always have a source... + if(source != null) { + return source.getClassLibrary(); + } + else { + return null; + } + } }
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClassParent.java (816 => 817)
--- trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClassParent.java 2010-10-23 20:41:22 UTC (rev 816) +++ trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClassParent.java 2010-10-23 20:49:41 UTC (rev 817) @@ -23,6 +23,8 @@ public JavaClass getNestedClassByName(String name); - public ClassLibrary getJavaClassLibrary(); + public com.thoughtworks.qdox.library.ClassLibrary getJavaClassLibrary(); + + public com.thoughtworks.qdox.model.ClassLibrary getClassLibrary(); }
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaSource.java (816 => 817)
--- trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaSource.java 2010-10-23 20:41:22 UTC (rev 816) +++ trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaSource.java 2010-10-23 20:49:41 UTC (rev 817) @@ -134,7 +134,6 @@ public void setClassLibrary(ClassLibrary classLibrary) { this.oldClassLibrary = classLibrary; - this.context.setClassLibrary(classLibrary); //should be removed } public String getCodeBlock() {
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/model/ModelBuilder.java (816 => 817)
--- trunk/qdox/src/java/com/thoughtworks/qdox/model/ModelBuilder.java 2010-10-23 20:41:22 UTC (rev 816) +++ trunk/qdox/src/java/com/thoughtworks/qdox/model/ModelBuilder.java 2010-10-23 20:49:41 UTC (rev 817) @@ -1,12 +1,10 @@ package com.thoughtworks.qdox.model; import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.ListIterator; -import java.util.Map; import java.util.Set; import com.thoughtworks.qdox.JavaClassContext; @@ -42,7 +40,6 @@ } public ModelBuilder(JavaClassContext context, ClassLibrary library, DocletTagFactory docletTagFactory) { - context.setClassLibrary( library ); //cross refs, this one should be removed library.setContext( context ); this.docletTagFactory = docletTagFactory; source = new JavaSource(library);
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/model/Type.java (816 => 817)
--- trunk/qdox/src/java/com/thoughtworks/qdox/model/Type.java 2010-10-23 20:41:22 UTC (rev 816) +++ trunk/qdox/src/java/com/thoughtworks/qdox/model/Type.java 2010-10-23 20:49:41 UTC (rev 817) @@ -288,9 +288,11 @@ if(javaClassParent.getJavaClassLibrary() != null) { result = javaClassParent.getJavaClassLibrary().getJavaClass( getFullyQualifiedName() ); } - JavaClassContext context = javaClassParent.getJavaClassContext(); - if (context != null && context.getClassLibrary() != null) { - result = context.getClassByName(getFullyQualifiedName()); + else { + JavaClassContext context = javaClassParent.getJavaClassContext(); + if (context != null && javaClassParent.getClassLibrary() != null) { + result = context.getClassByName(getFullyQualifiedName()); + } } } }
To unsubscribe from this list please visit:
