summaryrefslogtreecommitdiffstats
path: root/ajde
diff options
context:
space:
mode:
Diffstat (limited to 'ajde')
-rw-r--r--ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
index 8bb83599e..13dc99cf0 100644
--- a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
+++ b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
@@ -88,9 +88,7 @@ public class CompilerAdapter {
public boolean compile(String configFile, BuildProgressMonitor progressMonitor, boolean buildModel) {
if (configFile == null) {
- Ajde.getDefault().getErrorHandler().handleError(
- "Tried to build null config file."
- );
+ Ajde.getDefault().getErrorHandler().handleError("Tried to build null config file.");
}
init();
try {
@@ -113,14 +111,17 @@ public class CompilerAdapter {
boolean incrementalEnabled =
buildConfig.isIncrementalMode()
|| buildConfig.isIncrementalFileMode();
+ boolean successfulBuild;
if (incrementalEnabled && nextBuild) {
- return buildManager.incrementalBuild(buildConfig, messageHandler);
+ successfulBuild = buildManager.incrementalBuild(buildConfig, messageHandler);
} else {
if (incrementalEnabled) {
nextBuild = incrementalEnabled;
}
- return buildManager.batchBuild(buildConfig, messageHandler);
+ successfulBuild = buildManager.batchBuild(buildConfig, messageHandler);
}
+ IncrementalStateManager.recordSuccessfulBuild(configFile,buildManager.getState());
+ return successfulBuild;
// } catch (OperationCanceledException ce) {
// Ajde.getDefault().getErrorHandler().handleWarning(
// "build cancelled by user");
@@ -629,4 +630,9 @@ public class CompilerAdapter {
this.buildNotifierAdapter = buildNotifierAdapter;
}
}
+
+ public void setState(AjState buildState) {
+ buildManager.setState(buildState);
+ buildManager.setStructureModel(buildState.getStructureModel());
+ }
}