generics

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Member.java b/org.aspectj.matcher/src/org/aspectj/weaver/Member.java
index a3c91d369cb940c1b90f6050689d128342700c69..5e684da3d1fe6a303b359024a33a61fac1b02105 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Member.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/Member.java
@@ -87,7 +87,7 @@ public interface Member extends Comparable {
 
        public AnnotationAJ[] getAnnotations();
 
-       public Collection/* ResolvedType */getDeclaringTypes(World world);
+       public Collection<ResolvedType> getDeclaringTypes(World world);
 
        public String[] getParameterNames(World world);
 

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java b/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java
index 878c38ffbc44c568d47a0345f53164fef8504d4e..553fed430e14e56993b379fcafddf7dd7b3d8ec2 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java
@@ -440,9 +440,9 @@ public class MemberImpl implements Member {
 
        // ---- fields 'n' stuff
 
-       public Collection/* ResolvedType */getDeclaringTypes(World world) {
+       public Collection<ResolvedType> getDeclaringTypes(World world) {
                ResolvedType myType = getDeclaringType().resolve(world);
-               Collection ret = new HashSet();
+               Collection<ResolvedType> ret = new HashSet<ResolvedType>();
                if (kind == CONSTRUCTOR) {
                        // this is wrong if the member doesn't exist, but that doesn't
                        // matter
@@ -456,14 +456,14 @@ public class MemberImpl implements Member {
                return ret;
        }
 
-       private boolean walkUp(Collection acc, ResolvedType curr) {
+       private boolean walkUp(Collection<ResolvedType> acc, ResolvedType curr) {
                if (acc.contains(curr)) {
                        return true;
                }
 
                boolean b = false;
-               for (Iterator i = curr.getDirectSupertypes(); i.hasNext();) {
-                       b |= walkUp(acc, (ResolvedType) i.next());
+               for (Iterator<ResolvedType> i = curr.getDirectSupertypes(); i.hasNext();) {
+                       b |= walkUp(acc, i.next());
                }
 
                if (!b && curr.isParameterizedType()) {