]> source.dussan.org Git - aspectj.git/commitdiff
170467: methods with parameterized parameters not working in ITD overrides relationsh...
authoraclement <aclement>
Tue, 23 Jan 2007 10:45:34 +0000 (10:45 +0000)
committeraclement <aclement>
Tue, 23 Jan 2007 10:45:34 +0000 (10:45 +0000)
weaver/src/org/aspectj/weaver/Member.java
weaver/src/org/aspectj/weaver/MemberImpl.java
weaver/src/org/aspectj/weaver/ResolvedType.java

index f7505f08852e5a006753cfecff235b3fe41965d2..2b4d9d6d7037775ea2a376c9d29aabce526c4c84 100644 (file)
@@ -67,6 +67,7 @@ public interface Member {
        public UnresolvedType getReturnType();
        
        public UnresolvedType getGenericReturnType();
+       public UnresolvedType[] getGenericParameterTypes();
 
        public UnresolvedType getType();
 
index cad1e78e0410e5dc816049841f622adbf69b393e..65050638cbd2cd01b97b81c29470c5544600c39b 100644 (file)
@@ -466,6 +466,7 @@ public class MemberImpl implements Comparable, AnnotatedElement,Member {
     public UnresolvedType getReturnType() { return returnType; }
     
     public UnresolvedType getGenericReturnType() { return getReturnType(); }
+    public UnresolvedType[] getGenericParameterTypes() { return getParameterTypes(); }
     /* (non-Javadoc)
         * @see org.aspectj.weaver.Member#getType()
         */
index be05dd0a7c662cb73fc296f0b3e45478119f1035..598b403f1a91b17baea2615bc45d8198f12a7a16 100644 (file)
@@ -429,8 +429,11 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl
                return true;
        }
        
-       UnresolvedType[] p1 = m1.getParameterTypes();
-       UnresolvedType[] p2 = m2.getParameterTypes();
+       
+       UnresolvedType[] p1 = m1.getGenericParameterTypes();
+       UnresolvedType[] p2 = m2.getGenericParameterTypes();
+       if (p1==null) p1 = m1.getParameterTypes();
+       if (p2==null) p2 = m2.getParameterTypes();
        int n = p1.length;
        if (n != p2.length) return false;