[qdox-scm] [816] trunk/qdox/src/java/com/thoughtworks/qdox: Remove almost every (old)ClassLibrary reference from JavaClassContext

[rfscholte]

Title: [816] trunk/qdox/src/java/com/thoughtworks/qdox: Remove almost every (old)ClassLibrary reference from JavaClassContext

Revision

816

Author

rfscholte

Date

2010-10-23 15:41:22 -0500 (Sat, 23 Oct 2010)

Log Message

Remove almost 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/JavaSource.java

Diff

Modified: trunk/qdox/src/java/com/thoughtworks/qdox/JavaClassContext.java (815 => 816)

--- trunk/qdox/src/java/com/thoughtworks/qdox/JavaClassContext.java	2010-10-23 20:36:19 UTC (rev 815)
+++ trunk/qdox/src/java/com/thoughtworks/qdox/JavaClassContext.java	2010-10-23 20:41:22 UTC (rev 816)
@@ -34,12 +34,6 @@
 		this.builder = builder;
 	}
 	
-	
-	public JavaClassContext(ClassLibrary classLibrary) {
-		this.classLibrary = classLibrary;
-	}
-	
-	
 	public void setClassLibrary(ClassLibrary classLibrary) {
 		this.classLibrary = classLibrary;
 	}

Modified: trunk/qdox/src/java/com/thoughtworks/qdox/JavaDocBuilder.java (815 => 816)

--- trunk/qdox/src/java/com/thoughtworks/qdox/JavaDocBuilder.java	2010-10-23 20:36:19 UTC (rev 815)
+++ trunk/qdox/src/java/com/thoughtworks/qdox/JavaDocBuilder.java	2010-10-23 20:41:22 UTC (rev 816)
@@ -148,7 +148,7 @@
     }
     
     protected JavaClass createSourceClass(String name) {
-        File sourceFile = context.getClassLibrary().getSourceFile( name );
+        File sourceFile = oldClassLibrary.getSourceFile( name );
         if (sourceFile != null) {
             try
             {

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

--- trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaSource.java	2010-10-23 20:36:19 UTC (rev 815)
+++ trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaSource.java	2010-10-23 20:41:22 UTC (rev 816)
@@ -242,7 +242,7 @@
                 break lookup;
             }
 
-            if(classLibrary != null || context.getClassLibrary() != null) {
+            if(classLibrary != null || oldClassLibrary != null) {
                 // check for a class in the same package
                 resolvedName = resolveFromLibrary( getClassNamePrefix() + nestedName );
                 
@@ -293,13 +293,13 @@
             result = classLibrary.hasClassReference( typeName ) ? typeName : null;
         }
         else {
-            result = context.getClassLibrary().contains( typeName ) ? typeName : null;
+            result = oldClassLibrary.contains( typeName ) ? typeName : null;
         }
         return result;
     }
     
     private String resolveFullyQualifiedType(String typeName) {
-        if (classLibrary != null || context.getClassLibrary() != null) {
+        if (classLibrary != null || oldClassLibrary != null) {
             int indexOfLastDot = typeName.lastIndexOf('.');
             
             if (indexOfLastDot >= 0) {
@@ -318,7 +318,7 @@
                     return typeName;
                 }
             }
-            else if (context.getClassLibrary().contains(typeName)) {
+            else if (oldClassLibrary.contains(typeName)) {
                 return typeName;
             }
         }

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email