286539: test and fix (decanno type in model)

2 files changed, 27 insertions, 0 deletions

diff --git a/asm/src/org/aspectj/asm/IProgramElement.java b/asm/src/org/aspectj/asm/IProgramElement.java
index b51fd1731..a3a236b6b 100644
--- a/asm/src/org/aspectj/asm/IProgramElement.java
+++ b/asm/src/org/aspectj/asm/IProgramElement.java
@@ -403,4 +403,14 @@ public interface IProgramElement extends Serializable {
 	public void setAnnotationStyleDeclaration(boolean b);
 
 	public boolean isAnnotationStyleDeclaration();
+
+	/**
+	 * @param fullyQualifiedannotationType the annotation type, eg. p.q.r.Foo
+	 */
+	public void setAnnotationType(String fullyQualifiedannotationType);
+
+	/**
+	 * @return the fully qualified annotation type, eg. p.q.r.Foo
+	 */
+	public String getAnnotationType();
 }
\ No newline at end of file
diff --git a/asm/src/org/aspectj/asm/internal/ProgramElement.java b/asm/src/org/aspectj/asm/internal/ProgramElement.java
index 57f2fc31f..e9e6a9fb2 100644
--- a/asm/src/org/aspectj/asm/internal/ProgramElement.java
+++ b/asm/src/org/aspectj/asm/internal/ProgramElement.java
@@ -356,6 +356,23 @@ public class ProgramElement implements IProgramElement {
 		return (List) (kvpairs == null ? null : kvpairs.get("parentTypes"));
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public void setAnnotationType(String fullyQualifiedAnnotationType) {
+		if (kvpairs == Collections.EMPTY_MAP) {
+			kvpairs = new HashMap();
+		}
+		kvpairs.put("annotationType", fullyQualifiedAnnotationType);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getAnnotationType() {
+		return (String) (kvpairs == null ? null : kvpairs.get("annotationType"));
+	}
+
 	public String getCorrespondingType() {
 		return getCorrespondingType(false);
 	}