From: aclement <aclement>
Date: Sat, 7 Nov 2009 00:23:47 +0000 (+0000)
Subject: generics
X-Git-Tag: V1_6_7~142
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b7945ff4f34a70266c375ec85695e6e71ed875ae;p=aspectj.git

generics
---

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareAnnotation.java b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareAnnotation.java
index 3f8a01e69..94c55c251 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareAnnotation.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareAnnotation.java
@@ -326,8 +326,8 @@ public class DeclareAnnotation extends Declare {
 		if (annotation != null) {
 			return;
 		}
-		for (Iterator iter = containingAspect.getMethods(); iter.hasNext();) {
-			ResolvedMember member = (ResolvedMember) iter.next();
+		for (Iterator<ResolvedMember> iter = containingAspect.getMethods(false); iter.hasNext();) {
+			ResolvedMember member = iter.next();
 			if (member.getName().equals(annotationMethod)) {
 				AnnotationAJ[] annos = member.getAnnotations();
 				if (annos == null) {
@@ -388,8 +388,8 @@ public class DeclareAnnotation extends Declare {
 	 */
 	public ResolvedType getAnnotationType() {
 		if (annotationType == null) {
-			for (Iterator iter = containingAspect.getMethods(); iter.hasNext();) {
-				ResolvedMember member = (ResolvedMember) iter.next();
+			for (Iterator<ResolvedMember> iter = containingAspect.getMethods(false); iter.hasNext();) {
+				ResolvedMember member = iter.next();
 				if (member.getName().equals(annotationMethod)) {
 					ResolvedType[] annoTypes = member.getAnnotationTypes();
 					if (annoTypes == null) {