For bridge method support - make backing generic member accessible.

diff --git a/weaver/src/org/aspectj/weaver/JoinPointSignature.java b/weaver/src/org/aspectj/weaver/JoinPointSignature.java
index fc65c1133beebe1af74c375a9ab7735e6200e7ac..f39b70fe783fdb697f2a47903789521975a83408 100644 (file)
--- a/weaver/src/org/aspectj/weaver/JoinPointSignature.java
+++ b/weaver/src/org/aspectj/weaver/JoinPointSignature.java
@@ -396,4 +396,12 @@ public class JoinPointSignature implements ResolvedMember {
        public int hashCode() {
                return 17 + (37 * realMember.hashCode()) + (37 * substituteDeclaringType.hashCode());
        }
+
+       public boolean hasBackingGenericMember() {
+               return realMember.hasBackingGenericMember();
+       }
+
+       public ResolvedMember getBackingGenericMember() {
+               return realMember.getBackingGenericMember();
+       }
 }

diff --git a/weaver/src/org/aspectj/weaver/ResolvedMember.java b/weaver/src/org/aspectj/weaver/ResolvedMember.java
index fe178a248766e33e60b098332e2366173976a789..ec9576417b492f9b23d53191599179dae207ca3c 100644 (file)
--- a/weaver/src/org/aspectj/weaver/ResolvedMember.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedMember.java
@@ -96,6 +96,10 @@ public interface ResolvedMember extends Member, AnnotatedElement, TypeVariableDe
        public String toGenericString();
        
        public String toDebugString();
+       
+
+       public boolean hasBackingGenericMember();
+       public ResolvedMember getBackingGenericMember();
 
        /**
         * Get the UnresolvedType for the return type, taking generic signature into account

diff --git a/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java b/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java
index 9942617e0f00dcad3e5397bfe563d502f544eae2..2cfb40085d19b752a3e0659f3e1aab834164f4c1 100644 (file)
--- a/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java
@@ -721,6 +721,13 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Anno
        private ResolvedMember myErasure = null;
        private boolean calculatedMyErasure = false;
        
+       public boolean hasBackingGenericMember() {
+               return backingGenericMember!=null;
+       }
+       
+       public ResolvedMember getBackingGenericMember() {
+               return backingGenericMember;
+       }
        
        /**
       * For ITDs, we use the default factory methods to build a resolved member, then alter a couple of characteristics