Fixed generation and access of return types on IProgramElements(s).

2 files changed, 8 insertions, 3 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 eddc09cde..14e89d232 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
@@ -38,7 +38,7 @@ public class AsmElementFormatter {
 			node.setKind(IProgramElement.Kind.ADVICE);
 
 			if (ad.kind == AdviceKind.Around) {
-				node.setReturnType(ad.returnType.toString()); //returnTypeToString(0));
+				node.setCorrespondingType(ad.returnType.toString()); //returnTypeToString(0));
 			}
 	
 			String details = "";
@@ -131,7 +131,7 @@ public class AsmElementFormatter {
 				node.setKind(IProgramElement.Kind.ERROR);
 			}
 			node.setName(name);
-			node.setReturnType(itd.returnType.toString());
+			node.setCorrespondingType(itd.returnType.toString());
 			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 3091094d7..2aa2e07ca 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
@@ -276,6 +276,7 @@ public class AsmHierarchyBuilder extends ASTVisitor {
 		formatter.genLabelAndKind(methodDeclaration, peNode);
 		genBytecodeInfo(methodDeclaration, peNode);
 		peNode.setModifiers(methodDeclaration.modifiers);
+		peNode.setCorrespondingType(methodDeclaration.returnType.toString());
 
 		// TODO: add return type test
 		if (peNode.getKind().equals(IProgramElement.Kind.METHOD)) {
@@ -285,6 +286,7 @@ public class AsmHierarchyBuilder extends ASTVisitor {
 				((IProgramElement)stack.peek()).setRunnable(true);
 			}	
 		}
+		
 		stack.push(peNode);
 		return true;
 	}
@@ -351,7 +353,10 @@ public class AsmHierarchyBuilder extends ASTVisitor {
 			makeLocation(fieldDeclaration),
 			fieldDeclaration.modifiers,
 			"",
-			new ArrayList());	
+			new ArrayList());
+		
+		peNode.setCorrespondingType(fieldDeclaration.type.toString());
+		
 		((IProgramElement)stack.peek()).addChild(peNode);
 		stack.push(peNode);
 		return true;