final implementation and tests for 101983: allow separate output folders

2 files changed, 6 insertions, 6 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java
index 9c544594f..5c7c30d4a 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java
@@ -26,21 +26,21 @@ public interface CompilationResultDestinationManager {
 	 * this method returns "target/classes" the resulting class file will be written
 	 * to "target/classes/a/b/C.class"
 	 * 
-	 * @param compilationUnitName  the fully-qualified name of the compilation unit that has been
+	 * @param compilationUnit  the compilation unit that has been
 	 *  compiled
 	 * @return a File object representing the root directory under which compilation results for this
 	 *  unit should be written
 	 */
-	File getOutputLocationForClass(String compilationUnitName);
+	File getOutputLocationForClass(File compilationUnit);
 	
 	/**
 	 * When copying resources from source folders to output location, return the
 	 * root directory under which the resource should be copied.
 	 * 
-	 * @param resourceName the fully-qualified name of the resource to be copied
+	 * @param resource the resource to be copied
 	 * @return a File object representing the root directory under which this resource
 	 * should be copied
 	 */
-	File getOutputLocationForResource(String resourceName);
+	File getOutputLocationForResource(File resource);
 	
 }
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index cda98088d..3d49c7e77 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -504,7 +504,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider,IBinarySourc
 		} else {
 			File destDir = buildConfig.getOutputDir();
 			if (buildConfig.getCompilationResultDestinationManager() != null) {
-				destDir = buildConfig.getCompilationResultDestinationManager().getOutputLocationForResource(srcLocation.getAbsolutePath());
+				destDir = buildConfig.getCompilationResultDestinationManager().getOutputLocationForResource(srcLocation);
 			}
 			try {
 				OutputStream fos = 
@@ -955,7 +955,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider,IBinarySourc
 				File destinationPath = buildConfig.getOutputDir();
 				if (buildConfig.getCompilationResultDestinationManager() != null) {
 					destinationPath = 
-						buildConfig.getCompilationResultDestinationManager().getOutputLocationForClass(new String(unitResult.fileName));
+						buildConfig.getCompilationResultDestinationManager().getOutputLocationForClass(new File(new String(unitResult.fileName)));
 				}
 				String outFile;
 				if (destinationPath == null) {