ajdoc: fixes from Helen for 119453

2 files changed, 13 insertions, 2 deletions

diff --git a/asm/src/org/aspectj/asm/IProgramElement.java b/asm/src/org/aspectj/asm/IProgramElement.java
index b754fa9b9..d1175df74 100644
--- a/asm/src/org/aspectj/asm/IProgramElement.java
+++ b/asm/src/org/aspectj/asm/IProgramElement.java
@@ -75,7 +75,8 @@ public interface IProgramElement extends Serializable {
 	/** 
 	 * This correponds to both method return types and field types.
 	 */
-	public String getCorrespondingType();
+	public String getCorrespondingType();	
+	public String getCorrespondingType(boolean getFullyQualifiedType);
 	
 	public String toSignatureString();
 	
diff --git a/asm/src/org/aspectj/asm/internal/ProgramElement.java b/asm/src/org/aspectj/asm/internal/ProgramElement.java
index 4a5d002a0..0c7c8683c 100644
--- a/asm/src/org/aspectj/asm/internal/ProgramElement.java
+++ b/asm/src/org/aspectj/asm/internal/ProgramElement.java
@@ -297,6 +297,17 @@ public class ProgramElement implements IProgramElement {
 	}
 
 	public String getCorrespondingType() {
+		return getCorrespondingType(false);
+	}
+	
+	public String getCorrespondingType(boolean getFullyQualifiedType) {
+		if (getFullyQualifiedType) {
+			return returnType;
+		}
+		int index = returnType.lastIndexOf(".");
+		if (index != -1) {
+			return returnType.substring(index);
+		}
 		return returnType;
 	}
 
@@ -493,6 +504,5 @@ public class ProgramElement implements IProgramElement {
 	public ExtraInformation getExtraInfo() {
 		return info;
 	}
-
 }