Added condition for model building.

diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
index 3132288fb42e8a1eb00db6b4154c18258947c391..19ede47fde609ee6e3cd0425230a2ebc64212d95 100644 (file)
--- a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
+++ b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
@@ -54,6 +54,7 @@ public class CompilerAdapter {
                init();
                try {    
                        AjBuildConfig buildConfig = genBuildConfig(configFile);
+                       buildConfig.setGenerateModelMode(true);
                        currNotifier = new BuildNotifierAdapter(
                                AjBuildManager.DEFAULT_PROJECT,
                                progressMonitor,

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 34d0a95a25eb328ce2b29ed509cb6660955f47d5..ea877e9e4d171e5d950e593625b25329a1fb464f 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -98,8 +98,9 @@ public class AjBuildManager {
                 return false;
             }
 
-                       //XXX disabling structure building until Mik can make it optional
-                       if (buildConfig.isEmacsSymMode())  bcelWorld.setModel(StructureModelManager.INSTANCE.getStructureModel());
+                       if (buildConfig.isEmacsSymMode() || buildConfig.isGenerateModelMode()) {  
+                               bcelWorld.setModel(StructureModelManager.INSTANCE.getStructureModel());
+                       }
                        BatchBuilder builder = new BatchBuilder(javaBuilder, counter);
                        State newState = builder.run();
                        if (buildConfig.isEmacsSymMode()) {