From 7cc89195decaf1f2b862f24872ee387973e76cac Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Fri, 28 Nov 2008 20:44:34 +0000
Subject: [PATCH] 256937: test and fix

---
 .../aspectj/ajdt/internal/core/builder/AsmElementFormatter.java | 2 +-
 .../aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java | 2 +-
 2 files changed, 2 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 da61dfa0b..c1ca366a6 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
@@ -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 fc03e4923..2f7e6e074 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
@@ -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);
 			}
-- 
2.39.5