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

2 files changed, 17 insertions, 5 deletions

diff --git a/asm/src/org/aspectj/asm/IProgramElement.java b/asm/src/org/aspectj/asm/IProgramElement.java
index f45493e4e..8bf641ce8 100644
--- a/asm/src/org/aspectj/asm/IProgramElement.java
+++ b/asm/src/org/aspectj/asm/IProgramElement.java
@@ -49,8 +49,15 @@ public interface IProgramElement extends Serializable {
 	public String getDeclaringType();  // TODO: remove (Emacs uses it)
 	public String getPackageName();
 
-	public void setReturnType(String returnType);
-	public String getReturnType();
+	/**
+	 * @param method return types or field types
+	 */
+	public void setCorrespondingType(String returnType);
+
+	/** 
+	 * This correponds to both method return types and field types.
+	 */
+	public String getCorrespondingType();
 	
 	public String toSignatureString();
 	
@@ -72,6 +79,11 @@ public interface IProgramElement extends Serializable {
 	public String toString();
 
 	/**
+	 * @return the javadoc comment for this program element, null if not available
+	 */
+	public String getFormalComment();
+	
+	/**
 	 * Includes information about the origin of the node.
 	 */
 	public String toLinkLabelString();
diff --git a/asm/src/org/aspectj/asm/internal/ProgramElement.java b/asm/src/org/aspectj/asm/internal/ProgramElement.java
index 559abd353..6f83e3be9 100644
--- a/asm/src/org/aspectj/asm/internal/ProgramElement.java
+++ b/asm/src/org/aspectj/asm/internal/ProgramElement.java
@@ -33,7 +33,7 @@ public class ProgramElement implements IProgramElement {
 	protected List children = new ArrayList();
 	protected IMessage message = null;
 	protected ISourceLocation sourceLocation = null;
-		
+
 	private List modifiers = new ArrayList();
 	private List relations = new ArrayList();
 
@@ -281,11 +281,11 @@ public class ProgramElement implements IProgramElement {
 		this.kind = kind;
 	}
 
-	public void setReturnType(String returnType) {
+	public void setCorrespondingType(String returnType) {
 		this.returnType = returnType;
 	}
 
-	public String getReturnType() {
+	public String getCorrespondingType() {
 		return returnType;
 	}