Made model generation optional.

diff --git a/ajde/src/org/aspectj/ajde/BuildManager.java b/ajde/src/org/aspectj/ajde/BuildManager.java
index b92e658863c5ac3b4087af41b75ddf5a5e92a539..289ad197be6dd1fe732f565175271b3095c68600 100644 (file)
--- a/ajde/src/org/aspectj/ajde/BuildManager.java
+++ b/ajde/src/org/aspectj/ajde/BuildManager.java
@@ -58,12 +58,12 @@ public interface BuildManager {
 
        public BuildOptionsAdapter getBuildOptions();
 
-//    public CompilerAdapter getCurrCompiler();
-
     public boolean isStructureDirty();
 
     public void setStructureDirty(boolean structureDirty);
 
+       public void setBuildModelMode(boolean mode);
+
     public void addListener(BuildListener compilerListener);
 
     public void removeListener(BuildListener compilerListener);

diff --git a/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java b/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java
index 5263b21c1f3f8924987a8315f1eb41227ef7699e..84e0bb8ecc84628a515af9bcbe5a4a24ec451e1e 100644 (file)
--- a/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java
+++ b/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java
@@ -36,6 +36,7 @@ public class AspectJBuildManager implements BuildManager {
     private String lastConfigFile = null;
     private int lastCompileTime = 50;
     private boolean buildStructureOnly = false;
+       private boolean buildModelMode = true;
 
     public AspectJBuildManager(
        TaskListManager compilerMessages, 
@@ -161,7 +162,7 @@ public class AspectJBuildManager implements BuildManager {
                                Ajde.getDefault().logEvent("building with options: " 
                                        + getFormattedOptionsString(buildOptions, Ajde.getDefault().getProjectProperties()));
                 
-                succeeded = compilerAdapter.compile(configFile, progressMonitor);
+                succeeded = compilerAdapter.compile(configFile, progressMonitor, buildModelMode);
                 
                 long timeEnd = System.currentTimeMillis();
                 lastCompileTime = (int)(timeEnd - timeStart);
@@ -225,5 +226,10 @@ public class AspectJBuildManager implements BuildManager {
                        else { return s; }
                }
     }
+    
+       public void setBuildModelMode(boolean b) {
+               buildModelMode = b;
+       }
+
 }
 

diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
index c1b838e28a5c9d7fb79836378edcf3cbb764ff82..a56b88695aba8db0868e0ffde9b8ae245638f738 100644 (file)
--- a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
+++ b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
@@ -72,10 +72,11 @@ public class CompilerAdapter {
                this.structureDirty = structureDirty;
        }
 
-       public boolean compile(String configFile, BuildProgressMonitor progressMonitor) {
+       public boolean compile(String configFile, BuildProgressMonitor progressMonitor, boolean buildModel) {
                init();
                try { 
                        AjBuildConfig buildConfig = genBuildConfig(configFile);
+                       buildConfig.setGenerateModelMode(buildModel);
                        if (null == buildConfig) {
                 return false;
                        }