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

diff --git a/ajde/.classpath b/ajde/.classpath
index 8b462a1e0be52a51bef8a0f8ee65692f3b3f6b01..28a7989e4e869f9769593839e341095448912295 100644 (file)
--- 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 d8c3a18b72f7a1485d8e9c8e1102117ef4c1f83c..94a6232fe27326aa6c79e0e4ae6ed441f790fe5c 100644 (file)
--- 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());
        }