From: aclement Date: Sat, 7 Nov 2009 00:23:11 +0000 (+0000) Subject: generics X-Git-Tag: V1_6_7~143 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=abb818d0290a8127d770ec05e2a616e2e97ab887;p=aspectj.git generics --- diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Member.java b/org.aspectj.matcher/src/org/aspectj/weaver/Member.java index a3c91d369..5e684da3d 100644 --- 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 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 878c38ffb..553fed430 100644 --- 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 getDeclaringTypes(World world) { ResolvedType myType = getDeclaringType().resolve(world); - Collection ret = new HashSet(); + Collection ret = new HashSet(); 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 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 i = curr.getDirectSupertypes(); i.hasNext();) { + b |= walkUp(acc, i.next()); } if (!b && curr.isParameterizedType()) {