251277: making asmmanager non-singleton

2 files changed, 20 insertions, 2 deletions

diff --git a/ajde.core/src/org/aspectj/ajde/core/AjCompiler.java b/ajde.core/src/org/aspectj/ajde/core/AjCompiler.java
index 72eb4058c..5755c4173 100644
--- a/ajde.core/src/org/aspectj/ajde/core/AjCompiler.java
+++ b/ajde.core/src/org/aspectj/ajde/core/AjCompiler.java
@@ -12,6 +12,7 @@ package org.aspectj.ajde.core;
 
 import org.aspectj.ajde.core.internal.AjdeCoreBuildManager;
 import org.aspectj.ajdt.internal.core.builder.IncrementalStateManager;
+import org.aspectj.asm.AsmManager;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.Message;
 import org.aspectj.org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
@@ -148,4 +149,12 @@ public class AjCompiler {
 	public Object getCustomMungerFactory() {
 		return buildManager.getCustomMungerFactory();
 	}
+
+	public AsmManager getModel() {
+		return buildManager.getStructureModel();
+	}
+
+	// public AsmManager getStructureModel() {
+	// return buildManager.getStructureModel();
+	// }
 }
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 074222b51..db4fe814d 100644
--- a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
+++ b/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
@@ -63,6 +63,10 @@ public class AjdeCoreBuildManager {
 		AsmManager.attemptIncrementalModelRepairs = true;
 	}
 
+	// public AsmManager getStructureModel() {
+	// return ajBuildManager.
+	// }
+
 	/**
 	 * Execute a full or incremental build
 	 * 
@@ -77,8 +81,9 @@ public class AjdeCoreBuildManager {
 				// No existing state so we must do a full build
 				fullBuild = true;
 			} else {
-				AsmManager.getDefault().setRelationshipMap(existingState.getRelationshipMap());
-				AsmManager.getDefault().setHierarchy(existingState.getStructureModel());
+				AsmManager.setLastActiveStructureModel(existingState.getStructureModel());
+				// AsmManager.getDefault().setRelationshipMap(existingState.getRelationshipMap());
+				// AsmManager.getDefault().setHierarchy(existingState.getStructureModel());
 			}
 		}
 		try {
@@ -394,4 +399,8 @@ public class AjdeCoreBuildManager {
 	public void cleanupEnvironment() {
 		ajBuildManager.cleanupEnvironment();
 	}
+
+	public AsmManager getStructureModel() {
+		return ajBuildManager.getStructureModel();
+	}
 }