[qdox-scm] [813] trunk/qdox/src/java/com/thoughtworks/qdox: First step into removing JavaClassContext of JavaClass

[rfscholte]

Title: [813] trunk/qdox/src/java/com/thoughtworks/qdox: First step into removing JavaClassContext of JavaClass

Revision

813

Author

rfscholte

Date

2010-10-23 09:40:19 -0500 (Sat, 23 Oct 2010)

Log Message

First step into removing JavaClassContext of JavaClass

Modified Paths

• trunk/qdox/src/java/com/thoughtworks/qdox/JavaDocBuilder.java
• trunk/qdox/src/java/com/thoughtworks/qdox/model/ClassLibrary.java
• trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClass.java
• trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaSource.java

Diff

Modified: trunk/qdox/src/java/com/thoughtworks/qdox/JavaDocBuilder.java (812 => 813)

--- trunk/qdox/src/java/com/thoughtworks/qdox/JavaDocBuilder.java	2010-10-23 09:53:22 UTC (rev 812)
+++ trunk/qdox/src/java/com/thoughtworks/qdox/JavaDocBuilder.java	2010-10-23 14:40:19 UTC (rev 813)
@@ -240,7 +240,6 @@
             for (int classIndex = 0; classIndex < javaClasses.length; classIndex++) {
                 JavaClass cls = javaClasses[classIndex];
                 context.add(cls);
-                cls.setJavaClassContext(context);
             }
         }
 

Modified: trunk/qdox/src/java/com/thoughtworks/qdox/model/ClassLibrary.java (812 => 813)

--- trunk/qdox/src/java/com/thoughtworks/qdox/model/ClassLibrary.java	2010-10-23 09:53:22 UTC (rev 812)
+++ trunk/qdox/src/java/com/thoughtworks/qdox/model/ClassLibrary.java	2010-10-23 14:40:19 UTC (rev 813)
@@ -151,4 +151,8 @@
     public JavaClass getJavaClass(String name) {
         return context.getClassByName( name );
     }
+    
+    public JavaClass[] getJavaClasses() {
+        return context.getClasses();
+    }
 }

Modified: trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClass.java (812 => 813)

--- trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClass.java	2010-10-23 09:53:22 UTC (rev 812)
+++ trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClass.java	2010-10-23 14:40:19 UTC (rev 813)
@@ -672,8 +672,11 @@
         if( source.getJavaClassLibrary() != null ) {
             classes = source.getJavaClassLibrary().getJavaClasses();
         }
+        else if (source.getClassLibrary() != null ) {
+            classes = source.getClassLibrary().getJavaClasses();
+        }
         else {
-            classes = context.getClasses();    
+            classes = new JavaClass[0];
         }
         
 

Modified: trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaSource.java (812 => 813)

--- trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaSource.java	2010-10-23 09:53:22 UTC (rev 812)
+++ trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaSource.java	2010-10-23 14:40:19 UTC (rev 813)
@@ -42,14 +42,17 @@
     private Map resolvedTypeCache = new HashMap();
     private URL url;
 
+    //@todo remove
     public JavaSource() {
     	this(new JavaClassContext());
     }
     
+    //@todo remove
     public JavaSource(JavaClassContext context) {
     	this.context = context;
     }
     
+    //@todo remove
     public JavaSource(com.thoughtworks.qdox.model.ClassLibrary classLibrary) {
         this.oldClassLibrary = classLibrary;
         this.context = classLibrary.getContext();

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email