From 46b72b291ccd708accfa69353c443b35497dd166 Mon Sep 17 00:00:00 2001 From: aclement Date: Sat, 29 Nov 2008 20:46:44 +0000 Subject: [PATCH] 255555: pattern parser allowing for parentheses around declare anno signatures; cope with weaving broken code. --- .../lookup/EclipseResolvedMember.java | 60 ++++++++----------- 1 file changed, 24 insertions(+), 36 deletions(-) diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java index c92ffe8a7..e5123c882 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java @@ -38,11 +38,9 @@ import org.aspectj.weaver.UnresolvedType; import org.aspectj.weaver.World; /** - * In the pipeline world, we can be weaving before all types have come through - * from compilation. In some cases this means the weaver will want to ask - * questions of eclipse types and this subtype of ResolvedMemberImpl is here to - * answer some of those questions - it is backed by the real eclipse - * MethodBinding object and can translate from Eclipse -> Weaver information. + * In the pipeline world, we can be weaving before all types have come through from compilation. In some cases this means the weaver + * will want to ask questions of eclipse types and this subtype of ResolvedMemberImpl is here to answer some of those questions - it + * is backed by the real eclipse MethodBinding object and can translate from Eclipse -> Weaver information. */ public class EclipseResolvedMember extends ResolvedMemberImpl { @@ -54,20 +52,17 @@ public class EclipseResolvedMember extends ResolvedMemberImpl { private ResolvedType[] cachedAnnotationTypes; private EclipseFactory eclipseFactory; - public EclipseResolvedMember(MethodBinding binding, MemberKind memberKind, - ResolvedType realDeclaringType, int modifiers, - UnresolvedType rettype, String name, UnresolvedType[] paramtypes, - UnresolvedType[] extypes, EclipseFactory eclipseFactory) { - super(memberKind, realDeclaringType, modifiers, rettype, name, - paramtypes, extypes); + public EclipseResolvedMember(MethodBinding binding, MemberKind memberKind, ResolvedType realDeclaringType, int modifiers, + UnresolvedType rettype, String name, UnresolvedType[] paramtypes, UnresolvedType[] extypes, + EclipseFactory eclipseFactory) { + super(memberKind, realDeclaringType, modifiers, rettype, name, paramtypes, extypes); this.realBinding = binding; this.eclipseFactory = eclipseFactory; this.w = realDeclaringType.getWorld(); } - public EclipseResolvedMember(FieldBinding binding, MemberKind field, - ResolvedType realDeclaringType, int modifiers, ResolvedType type, - String string, UnresolvedType[] none) { + public EclipseResolvedMember(FieldBinding binding, MemberKind field, ResolvedType realDeclaringType, int modifiers, + ResolvedType type, String string, UnresolvedType[] none) { super(field, realDeclaringType, modifiers, type, string, none); this.realBinding = binding; this.w = realDeclaringType.getWorld(); @@ -93,7 +88,7 @@ public class EclipseResolvedMember extends ResolvedMemberImpl { return null; } AnnotationAJ[] annoAJs = new AnnotationAJ[annos.length]; - for (int i=0;i