Declare annotation: creates DeclareAnnotations of the right types (using typesafeenum...

diff --git a/weaver/src/org/aspectj/weaver/patterns/PatternParser.java b/weaver/src/org/aspectj/weaver/patterns/PatternParser.java
index 17b6388c2fc363ffb59342ea375b003d67af0261..c9ca1ccf6c2d6a787821debd5bc6bfa8128e6c6d 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/PatternParser.java
+++ b/weaver/src/org/aspectj/weaver/patterns/PatternParser.java
@@ -150,7 +150,7 @@ public class PatternParser {
        }
        
        public DeclareAnnotation parseDeclareAtType() {
-               return new DeclareAnnotation("type",parseTypePattern());
+               return new DeclareAnnotation(DeclareAnnotation.AT_TYPE,parseTypePattern());
        }
 
        public DeclareAnnotation parseDeclareAtMethod(boolean isMethod) {
@@ -162,11 +162,12 @@ public class PatternParser {
                if (!isMethod && !isConstructorPattern) {
                        throw new ParserException("constructor signature pattern",tokenSource.peek(-1));
                }
-               return new DeclareAnnotation("method",sp); // sp itself differentiates...
+               if (isConstructorPattern) return new DeclareAnnotation(DeclareAnnotation.AT_CONSTRUCTOR,sp);
+               else                      return new DeclareAnnotation(DeclareAnnotation.AT_METHOD,sp);
        }
 
        public DeclareAnnotation parseDeclareAtField() {
-               return new DeclareAnnotation("field",parseFieldSignaturePattern());             
+               return new DeclareAnnotation(DeclareAnnotation.AT_FIELD,parseFieldSignaturePattern());          
        }
 
        public DeclarePrecedence parseDominates() {