Fixed failing unit tests. Involved making paths work right in structure model,

and updating for differences in the 1.1 model.

2 files changed, 11 insertions, 2 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 d5937c487..fcde89c06 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
@@ -110,8 +110,10 @@ public class AjBuildManager {
             }
 
 			boolean weaved = weaveAndGenerateClassFiles(newState);
-			//XXX more sturucture disabling until it's optional
-			if (false) StructureModelManager.INSTANCE.fireModelUpdated();  
+			
+			if (buildConfig.isGenerateModelMode()) {
+				StructureModelManager.INSTANCE.fireModelUpdated();  
+			}
 			return weaved;
 		} catch (CoreException ce) {
             counter.handleMessage(new Message("core exception", IMessage.ABORT, ce, null));
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmBuilder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmBuilder.java
index c894d128b..e705748f2 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmBuilder.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmBuilder.java
@@ -222,6 +222,13 @@ public class AsmBuilder extends AbstractSyntaxTreeVisitorAdapter {
 			methodDeclaration.modifiers,
 			"",
 			new ArrayList());
+
+		if (kind == ProgramElementNode.Kind.METHOD) {
+			if (label.equals("main")) {
+				peNode.setRunnable(true);	
+			}	
+		}
+
 		if (methodDeclaration.binding != null) {
 			Member member = EclipseWorld.makeResolvedMember(methodDeclaration.binding);
 			peNode.setBytecodeName(member.getName());