ajdoc: fixes for 58520 from Helen.

2 files changed, 3 insertions, 2 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
index e62a4a05b..f096a1283 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
@@ -292,7 +292,7 @@ public class AsmElementFormatter {
 		if (argArray == null) return;
 		for (int i = 0; i < argArray.length; i++) {
 			String argName = new String(argArray[i].name);
-			String argType = argArray[i].type.toString();
+			String argType = argArray[i].type.resolvedType.debugName();
 			if (acceptArgument(argName, argType)) { 
 				names.add(argName);
 				types.add(argType);
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 a749205ee..8ea177455 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
@@ -418,7 +418,8 @@ public class AsmHierarchyBuilder extends ASTVisitor {
 		
 		// TODO: add return type test
 		if (peNode.getKind().equals(IProgramElement.Kind.METHOD)) {
-			if (peNode.toLabelString().equals("main(String[])")
+			if ((peNode.toLabelString().equals("main(String[])")
+					|| peNode.toLabelString().equals("main(java.lang.String[])"))
 				&& peNode.getModifiers().contains(IProgramElement.Modifiers.STATIC)
 				&& peNode.getAccessibility().equals(IProgramElement.Accessibility.PUBLIC)) {
 				((IProgramElement)stack.peek()).setRunnable(true);