test and fix for 166580: multiple output locations and incremental compilation

2 files changed, 21 insertions, 0 deletions

diff --git a/ajde/src/org/aspectj/ajde/OutputLocationManager.java b/ajde/src/org/aspectj/ajde/OutputLocationManager.java
index 3535722dc..cba91c1ec 100644
--- a/ajde/src/org/aspectj/ajde/OutputLocationManager.java
+++ b/ajde/src/org/aspectj/ajde/OutputLocationManager.java
@@ -12,6 +12,7 @@
 package org.aspectj.ajde;
 
 import java.io.File;
+import java.util.List;
 
 /**
  * Interface to be implemented by clients that wish to control the output
@@ -43,5 +44,16 @@ public interface OutputLocationManager {
 	 * should be copied
 	 */
 	File getOutputLocationForResource(File resource);
+
+	/**
+	 * Return a list of all output locations handled by this OutputLocationManager
+	 */
+	List /*File*/ getAllOutputLocations();
+	
+	/**
+	 * Return the default output location (for example, <my_project>/bin). This is
+	 * where classes which are on the inpath will be placed.
+	 */
+	File getDefaultOutputLocation();
 	
 }
diff --git a/ajde/src/org/aspectj/ajde/internal/OutputLocationAdapter.java b/ajde/src/org/aspectj/ajde/internal/OutputLocationAdapter.java
index 9ac479c8c..4ec041feb 100644
--- a/ajde/src/org/aspectj/ajde/internal/OutputLocationAdapter.java
+++ b/ajde/src/org/aspectj/ajde/internal/OutputLocationAdapter.java
@@ -12,6 +12,7 @@
 package org.aspectj.ajde.internal;
 
 import java.io.File;
+import java.util.List;
 
 import org.aspectj.ajde.OutputLocationManager;
 import org.aspectj.ajdt.internal.compiler.CompilationResultDestinationManager;
@@ -32,4 +33,12 @@ public class OutputLocationAdapter implements CompilationResultDestinationManage
 		return this.locationManager.getOutputLocationForResource(resource);
 	}
 
+	public List getAllOutputLocations() {
+		return this.locationManager.getAllOutputLocations();
+	}
+
+	public File getDefaultOutputLocation() {
+		return this.locationManager.getDefaultOutputLocation();
+	}
+
 }