adding output dir/jar by default to classpath to permit resolving types in incremental compile

Might need to be more discriminating and/or to document.

1 files changed, 22 insertions, 16 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
index 02d1bac09..339fc8eb9 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
@@ -249,22 +249,28 @@ public class AjBuildConfig { // XXX needs bootclasspath?
         return (null != incrementalFile);
     }
 
-	/**
-	 * This includes injars and aspectpath
-	 */
-	public List getFullClasspath() {
-		if (inJars.isEmpty() && aspectpath.isEmpty()) return getClasspath();
-		List full = new ArrayList();
-		for (Iterator i = inJars.iterator(); i.hasNext(); ) {
-			full.add(((File)i.next()).getAbsolutePath());
-		}
-		for (Iterator i = aspectpath.iterator(); i.hasNext(); ) {
-			full.add(((File)i.next()).getAbsolutePath());
-		}
-		full.addAll(getClasspath());
-		return full;
-	}
-
+    /**
+     * @return List (String) classpath of injars, aspectpath entries,
+     *   specified classpath (bootclasspath, extdirs, and classpath),
+     *   and output dir or jar
+     */
+    public List getFullClasspath() {
+        List full = new ArrayList();
+        for (Iterator i = inJars.iterator(); i.hasNext(); ) {
+            full.add(((File)i.next()).getAbsolutePath());
+        }
+        for (Iterator i = aspectpath.iterator(); i.hasNext(); ) {
+            full.add(((File)i.next()).getAbsolutePath());
+        }
+        full.addAll(getClasspath());
+        if (null != outputDir) {
+            full.add(outputDir.getAbsolutePath());
+        } else if (null != outputJar) {
+            full.add(outputJar.getAbsolutePath());
+        }
+        return full;
+    }
+    
 	public String getLintMode() {
 		return lintMode;
 	}