Moved clearning of relationship map to AjBuildManager in order to make

repeated invocations with -emacssym work (refer to Matthew's patch in 41181).

diff --git a/ajde/src/org/aspectj/ajde/Ajde.java b/ajde/src/org/aspectj/ajde/Ajde.java
index 644f1c11d557ad97e4c3de5d1b8b2ff750f6be33..093cee81cef74705dace2bf005cb290c7ada229f 100644 (file)
--- 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 efa48254829251471056f8535989578796768a87..93cad315da1554ac72f57666785b3fe0d5af46ce 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
@@ -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();