256937: test and fix

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 da61dfa0b01f911b54e621ce8c890b1c755a7ad0..c1ca366a61c09a9c388b9bfaf2935d011adb4d6f 100644 (file)
--- 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
@@ -187,7 +187,7 @@ public class AsmElementFormatter {
                                node.setKind(IProgramElement.Kind.ERROR);
                                node.setName(name);
                        }
-                       node.setCorrespondingType(itd.returnType.toString());
+                       node.setCorrespondingType(new String(itd.returnType.resolvedType.readableName()));
                        if (node.getKind() != IProgramElement.Kind.INTER_TYPE_FIELD) {
                                setParameters(methodDeclaration, node);
                        }

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 fc03e4923b67f4d148157e0e1e7ac85c522280e9..2f7e6e0746a4661cb332f1e6e2b56905e4b2b843 100644 (file)
--- 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
@@ -508,7 +508,7 @@ public class AsmHierarchyBuilder extends ASTVisitor {
                                peNode.setCorrespondingType(methodDeclaration.returnType.toString());
                        } else {
                                if (methodDeclaration.returnType.resolvedType != null)
-                                       peNode.setCorrespondingType(methodDeclaration.returnType.resolvedType.debugName());
+                                       peNode.setCorrespondingType(new String(methodDeclaration.returnType.resolvedType.readableName()));
                                else
                                        peNode.setCorrespondingType(null);
                        }