Fixed ProgramElement modifiers bug.

1 files changed, 6 insertions, 4 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
index 1cdc99870..b7fd8d1be 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
@@ -272,18 +272,20 @@ public class AsmHierarchyBuilder extends AbstractSyntaxTreeVisitorAdapter {
 			makeLocation(methodDeclaration),
 			methodDeclaration.modifiers,
 			"",
-			new ArrayList());
+			new ArrayList());  
 
 		formatter.genLabelAndKind(methodDeclaration, peNode);
 		genBytecodeInfo(methodDeclaration, peNode);
+		peNode.setModifiers(methodDeclaration.modifiers);
 
-		// TODO: should improve determining what the main method is
+		// TODO: add return type test
 		if (peNode.getKind().equals(IProgramElement.Kind.METHOD)) {
-			if (peNode.getName().equals("main")) {
+			if (peNode.getName().equals("main(String[])")
+				&& peNode.getModifiers().contains(IProgramElement.Modifiers.STATIC)
+				&& peNode.getAccessibility().equals(IProgramElement.Accessibility.PUBLIC)) {
 				((IProgramElement)stack.peek()).setRunnable(true);
 			}	
 		}
-		
 		stack.push(peNode);
 		return true;
 	}