aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ajde/src/org/aspectj/ajde/Ajde.java3
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java10
2 files changed, 9 insertions, 4 deletions
diff --git a/ajde/src/org/aspectj/ajde/Ajde.java b/ajde/src/org/aspectj/ajde/Ajde.java
index 644f1c11d..093cee81c 100644
--- a/ajde/src/org/aspectj/ajde/Ajde.java
+++ b/ajde/src/org/aspectj/ajde/Ajde.java
@@ -294,9 +294,6 @@ public class Ajde {
* Writes the default configuration file if it has been selected for compilation
*/
public void compileStarted(String buildConfig) {
- // TODO: implement incremental policy
- AsmManager.getDefault().getRelationshipMap().clear();
-
String configFilePath = projectProperties.getDefaultBuildConfigFile();
if (buildConfig.equals(configFilePath)) {
configurationManager.writePaths(configFilePath, projectProperties.getProjectSourceFiles());
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 efa482548..93cad315d 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
@@ -166,9 +166,17 @@ public class AjBuildManager {
}
}
+ /**
+ * Responsible for managing the ASM model between builds. Contains the policy for
+ * maintaining the persistance of elements in the model.
+ *
+ * TODO: implement incremental policy.
+ */
private void setupModel() {
- String rootLabel = "<root>";
+ String rootLabel = "<root>";
IHierarchy model = AsmManager.getDefault().getHierarchy();
+ AsmManager.getDefault().getRelationshipMap().clear();
+
IProgramElement.Kind kind = IProgramElement.Kind.FILE_JAVA;
if (buildConfig.getConfigFile() != null) {
rootLabel = buildConfig.getConfigFile().getName();