From bf1d8e2fad7b8112fae9780ba344420eb7111ec3 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Tue, 1 Feb 2011 20:57:40 +0000
Subject: [PATCH] 333123

---
 .../core/builder/AsmHierarchyBuilder.java       | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 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 cc1c3e3e2..88c2c21cd 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
@@ -117,7 +117,8 @@ public class AsmHierarchyBuilder extends ASTVisitor {
 	 * 
 	 * @param cuDeclaration
 	 * @param buildConfig
-	 * @param structureModel hiearchy to add this unit's declarations to
+	 * @param structureModel
+	 *            hiearchy to add this unit's declarations to
 	 */
 	public void buildStructureForCompilationUnit(CompilationUnitDeclaration cuDeclaration, AsmManager structureModel,
 			AjBuildConfig buildConfig) {
@@ -667,7 +668,8 @@ public class AsmHierarchyBuilder extends ASTVisitor {
 
 	/**
 	 * @param left
-	 * @param pointcuts accumulator for named pointcuts
+	 * @param pointcuts
+	 *            accumulator for named pointcuts
 	 */
 	private void addAllNamed(Pointcut pointcut, List pointcuts) {
 		if (pointcut == null) {
@@ -834,10 +836,19 @@ public class AsmHierarchyBuilder extends ASTVisitor {
 		} else {
 			peNode = new ProgramElement(activeStructureModel, new String(fieldDeclaration.name), IProgramElement.Kind.FIELD,
 					makeLocation(fieldDeclaration), fieldDeclaration.modifiers, null, null);
-			peNode.setCorrespondingType(fieldDeclaration.type.toString());
+
+			if (fieldDeclaration.type.resolvedType != null) {
+				char[] cs = fieldDeclaration.type.resolvedType.readableName();
+				// fieldDeclaration.type.resolvedType.genericTypeSignature()
+				peNode.setCorrespondingType(new String(cs));
+			} else {
+				// peNode.setCorrespondingType(null);
+				peNode.setCorrespondingType(fieldDeclaration.type.toString());
+			}
 		}
 		peNode.setSourceSignature(genSourceSignature(fieldDeclaration));
 		peNode.setFormalComment(generateJavadocComment(fieldDeclaration));
+		// peNode.setBytecodeSignature(new String(fieldDeclaration.binding.type.signature()));
 
 		((IProgramElement) stack.peek()).addChild(peNode);
 		stack.push(peNode);
-- 
2.39.5