249551: cleanup by default

2 files changed, 19 insertions, 8 deletions

diff --git a/ajde.core/src/org/aspectj/ajde/core/AjCompiler.java b/ajde.core/src/org/aspectj/ajde/core/AjCompiler.java
index 221f0b58c..758073d83 100644
--- a/ajde.core/src/org/aspectj/ajde/core/AjCompiler.java
+++ b/ajde.core/src/org/aspectj/ajde/core/AjCompiler.java
@@ -27,11 +27,11 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
  */
 public class AjCompiler {
 
-	private String compilerId;
-	private ICompilerConfiguration compilerConfig;
-	private IBuildProgressMonitor monitor;
-	private IBuildMessageHandler handler;
-	private AjdeCoreBuildManager buildManager;
+	private final String compilerId;
+	private final ICompilerConfiguration compilerConfig;
+	private final IBuildProgressMonitor monitor;
+	private final IBuildMessageHandler handler;
+	private final AjdeCoreBuildManager buildManager;
 
 	/**
 	 * Creates a new AjCompiler for the given id, ICompilerConfiguration, IBuildProgressMonitor and IBuildMessageHandler. None of
@@ -89,6 +89,13 @@ public class AjCompiler {
 	}
 
 	/**
+	 * Cleanup the compiler instance, ready for removal.
+	 */
+	public void cleanup() {
+		buildManager.cleanup();
+	}
+
+	/**
 	 * Perform a full build.
 	 */
 	public void buildFresh() {
diff --git a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java b/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
index b4de526f3..c22248f46 100644
--- a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
+++ b/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
@@ -45,10 +45,10 @@ import org.aspectj.util.LangUtil;
  */
 public class AjdeCoreBuildManager {
 
-	private AjCompiler compiler;
+	private final AjCompiler compiler;
 	private AjdeCoreBuildNotifierAdapter buildEventNotifier = null;
-	private AjBuildManager ajBuildManager;
-	private IMessageHandler msgHandlerAdapter;
+	private final AjBuildManager ajBuildManager;
+	private final IMessageHandler msgHandlerAdapter;
 
 	public AjdeCoreBuildManager(AjCompiler compiler) {
 		this.compiler = compiler;
@@ -390,4 +390,8 @@ public class AjdeCoreBuildManager {
 	public Object getCustomMungerFactory() {
 		return ajBuildManager.getCustomMungerFactory();
 	}
+
+	public void cleanup() {
+		ajBuildManager.cleanup();
+	}
 }