Got advice relationships working.

3 files changed, 7 insertions, 5 deletions

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 162f852d0..4fea43a00 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
@@ -118,7 +118,7 @@ public class AjBuildManager {
             if (batch) {
                 // System.err.println("XXXX batch: " + buildConfig.getFiles());
                 if (buildConfig.isEmacsSymMode() || buildConfig.isGenerateModelMode()) {  
-                    bcelWorld.setModel(StructureModelManager.getDefault().getStructureModel());
+                    bcelWorld.setModel(StructureModelManager.getDefault().getModel());
                     // in incremental build, only get updated model?
                 }
                 performCompilation(buildConfig.getFiles());
@@ -167,7 +167,7 @@ public class AjBuildManager {
      
     private void setupModel() {
         String rootLabel = "<root>";
-        StructureModel model = StructureModelManager.getDefault().getStructureModel();
+        StructureModel model = StructureModelManager.getDefault().getModel();
         IProgramElement.Kind kind = IProgramElement.Kind.FILE_JAVA;
         if (buildConfig.getConfigFile() != null) {
             rootLabel = buildConfig.getConfigFile().getName();
@@ -247,12 +247,14 @@ public class AjBuildManager {
 				bcelWeaver.dumpUnwoven(buildConfig.getOutputJar());
 			} else {
 				bcelWeaver.dumpUnwoven();
+				bcelWeaver.dumpResourcesToOutPath();
 			}
 		} else {
 			if (buildConfig.getOutputJar() != null) {
 				bcelWeaver.weave(buildConfig.getOutputJar());
 			} else {
 				bcelWeaver.weave();
+				bcelWeaver.dumpResourcesToOutPath();
 			}
 		}
 		if (progressListener != null) progressListener.setProgress(1.0);
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java
index 2f11f5e8d..651231bc1 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java
@@ -32,11 +32,11 @@ public class EmacsStructureModelManager {
     }
 
     public void externalizeModel() {
-    	if (!StructureModelManager.getDefault().getStructureModel().isValid()) return;
+    	if (!StructureModelManager.getDefault().getModel().isValid()) return;
         
         try {
             //Set fileSet = StructureModelManager.INSTANCE.getStructureModel().getFileMap().entrySet(); 
-			Set fileSet = StructureModelManager.getDefault().getStructureModel().getFileMapEntrySet(); 
+			Set fileSet = StructureModelManager.getDefault().getModel().getFileMapEntrySet(); 
             for (Iterator it = fileSet.iterator(); it.hasNext(); ) {
                 IProgramElement peNode = (IProgramElement)((Map.Entry)it.next()).getValue();
                 dumpStructureToFile(peNode);
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java
index 4a2fa7567..c1d6840da 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java
@@ -73,7 +73,7 @@ public class AjBuildManagerTest extends TestCase {
 				 }, messageWriter);
         String err = parser.getOtherMessages(true);		
         assertTrue(err, null == err);
-        manager.setStructureModel(StructureModelManager.getDefault().getStructureModel());
+        manager.setStructureModel(StructureModelManager.getDefault().getModel());
 		MessageHandler handler = new MessageHandler();
         manager.batchBuild(buildConfig, handler);
         assertCompileMessagesValid(handler);