From ec5e796a78f98328fff6d732e1fceb8f97999f2a Mon Sep 17 00:00:00 2001 From: aclement Date: Wed, 10 Dec 2008 21:37:29 +0000 Subject: [PATCH] 258325: fix --- .../ajde/core/IOutputLocationManager.java | 43 +++++++++---------- .../core/internal/OutputLocationAdapter.java | 13 +++--- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ajde.core/src/org/aspectj/ajde/core/IOutputLocationManager.java b/ajde.core/src/org/aspectj/ajde/core/IOutputLocationManager.java index ab76f28fd..8f7f541ba 100644 --- a/ajde.core/src/org/aspectj/ajde/core/IOutputLocationManager.java +++ b/ajde.core/src/org/aspectj/ajde/core/IOutputLocationManager.java @@ -15,53 +15,50 @@ import java.io.File; import java.util.List; /** - * Interface that handles where the compilation output is sent. Allows - * for the output folder to be different for different source files. + * Interface that handles where the compilation output is sent. Allows for the output folder to be different for different source + * files. */ public interface IOutputLocationManager { /** - * Return the directory root under which the results of compiling the given - * source file. For example, if the source file contains the type a.b.C, and - * this method returns "target/classes" the resulting class file will be written - * to "target/classes/a/b/C.class" + * Return the directory root under which the results of compiling the given source file. For example, if the source file + * contains the type a.b.C, and this method returns "target/classes" the resulting class file will be written to + * "target/classes/a/b/C.class" * - * @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 + * @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(File compilationUnit); /** - * For environments where multiple source folders are supported, they need to be included - * in the model. This method allows AspectJ to determine which source folder a source file - * came from. Example return values would be "src" or "main/java" - * + * For environments where multiple source folders are supported, they need to be included in the model. This method allows + * AspectJ to determine which source folder a source file came from. Example return values would be "src" or "main/java" + * * @param sourceFile the File object for the source file * @return the source folder where this file came from, or null if in project root or source folders not supported. */ String getSourceFolderForFile(File sourceFile); - + /** - * When copying resources from source folders to output location, return the - * root directory under which the resource should be copied. + * When copying resources from source folders to output location, return the root directory under which the resource should be + * copied. * * @param resource the resource to be copied - * @return a File object representing the root directory under which this resource - * should be copied + * @return a File object representing the root directory under which this resource should be copied */ File getOutputLocationForResource(File resource); /** * Return a list of all output locations handled by this OutputLocationManager */ - List /*File*/ getAllOutputLocations(); - + List /* File */getAllOutputLocations(); + /** - * Return the default output location (for example, /bin). This is - * where classes which are on the inpath will be placed. + * Return the default output location (for example, /bin). This is where classes which are on the inpath will be + * placed. */ File getDefaultOutputLocation(); - + void reportClassFileWrite(String outputfile); + } diff --git a/ajde.core/src/org/aspectj/ajde/core/internal/OutputLocationAdapter.java b/ajde.core/src/org/aspectj/ajde/core/internal/OutputLocationAdapter.java index decf080d9..04dee609c 100644 --- a/ajde.core/src/org/aspectj/ajde/core/internal/OutputLocationAdapter.java +++ b/ajde.core/src/org/aspectj/ajde/core/internal/OutputLocationAdapter.java @@ -19,21 +19,20 @@ import org.aspectj.ajde.core.IOutputLocationManager; import org.aspectj.ajdt.internal.compiler.CompilationResultDestinationManager; /** - * Enables the output locations detailed by the IOutputLocationManager - * implementation to be related to the comipler/weaver. + * Enables the output locations detailed by the IOutputLocationManager implementation to be related to the comipler/weaver. */ public class OutputLocationAdapter implements CompilationResultDestinationManager { private IOutputLocationManager locationManager; - + public OutputLocationAdapter(IOutputLocationManager mgr) { this.locationManager = mgr; } - + public File getOutputLocationForClass(File compilationUnit) { return this.locationManager.getOutputLocationForClass(compilationUnit); } - + public String getSourceFolderForFile(File sourceFile) { return this.locationManager.getSourceFolderForFile(sourceFile); } @@ -49,4 +48,8 @@ public class OutputLocationAdapter implements CompilationResultDestinationManage public File getDefaultOutputLocation() { return this.locationManager.getDefaultOutputLocation(); } + + public void reportClassFileWrite(String outputfile) { + this.locationManager.reportClassFileWrite(outputfile); + } } -- 2.39.5