From: aclement <aclement>
Date: Thu, 11 Jan 2007 16:09:01 +0000 (+0000)
Subject: 148190: reworked code to cope with new module ajde.core
X-Git-Tag: Root_extensions~42
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a8600ef8d7221fb6dbe42b92ff72ec1e05d248f8;p=aspectj.git

148190: reworked code to cope with new module ajde.core
---

diff --git a/ajde/.classpath b/ajde/.classpath
index 8b462a1e0..28a7989e4 100644
--- a/ajde/.classpath
+++ b/ajde/.classpath
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="testsrc"/>
-    <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="/util"/>
-    <classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/junit-src.jar"/>
-    <classpathentry kind="src" path="/bridge"/>
-    <classpathentry kind="src" path="/asm"/>
-    <classpathentry kind="src" path="/org.aspectj.ajdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
-    <classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="testsrc"/>
+	<classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
+	<classpathentry kind="src" path="/util"/>
+	<classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/junit-src.jar"/>
+	<classpathentry kind="src" path="/bridge"/>
+	<classpathentry kind="src" path="/asm"/>
+	<classpathentry kind="src" path="/org.aspectj.ajdt.core"/>
+	<classpathentry kind="src" path="/org.eclipse.jdt.core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ajde.core"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
index d8c3a18b7..94a6232fe 100644
--- a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
+++ b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
@@ -665,6 +665,7 @@ public class CompilerAdapter {
 	}
 	
 	public void setState(AjState buildState) {
+		init();
 		buildManager.setState(buildState);	
 		buildManager.setStructureModel(buildState.getStructureModel());
 	}