diff options
| author | mkersten <mkersten> | 2002-12-18 18:35:12 +0000 |
|---|---|---|
| committer | mkersten <mkersten> | 2002-12-18 18:35:12 +0000 |
| commit | 360ec841b0bb5c98c831a169bf5bdc2c4216b0ab (patch) | |
| tree | 822b4e3e9afbafea3e7c0cfa1e27d2388fe07a38 | |
| parent | 8ff468dda46894084e0878fd9cf68c5798bbdfcf (diff) | |
| download | aspectj-360ec841b0bb5c98c831a169bf5bdc2c4216b0ab.tar.gz aspectj-360ec841b0bb5c98c831a169bf5bdc2c4216b0ab.zip | |
Added condition for model building.
| -rw-r--r-- | ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java | 1 | ||||
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java index 3132288fb..19ede47fd 100644 --- 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 34d0a95a2..ea877e9e4 100644 --- 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()) { |