From: aclement <aclement>
Date: Mon, 2 Nov 2009 17:50:13 +0000 (+0000)
Subject: 293620:
X-Git-Tag: V1_6_7~163
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d476faa676acc89773fc2755449eead1db4883a0;p=aspectj.git

293620:
---

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java b/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java
index bcfcfb50c..caca8f444 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java
@@ -50,7 +50,7 @@ public class ReferenceType extends ResolvedType {
 	ResolvedMember[] parameterizedFields = null;
 	ResolvedMember[] parameterizedPointcuts = null;
 	ResolvedType[] parameterizedInterfaces = null;
-	Collection parameterizedDeclares = null;
+	Collection<Declare> parameterizedDeclares = null;
 	Collection parameterizedTypeMungers = null;
 
 	// During matching it can be necessary to temporary mark types as annotated. For example
@@ -803,11 +803,10 @@ public class ReferenceType extends ResolvedType {
 		}
 		Collection<Declare> declares = null;
 		if (ajMembersNeedParameterization()) {
-			Collection genericDeclares = delegate.getDeclares();
-			parameterizedDeclares = new ArrayList();
-			Map parameterizationMap = getAjMemberParameterizationMap();
-			for (Iterator iter = genericDeclares.iterator(); iter.hasNext();) {
-				Declare declareStatement = (Declare) iter.next();
+			Collection<Declare> genericDeclares = delegate.getDeclares();
+			parameterizedDeclares = new ArrayList<Declare>();
+			Map<String, UnresolvedType> parameterizationMap = getAjMemberParameterizationMap();
+			for (Declare declareStatement : genericDeclares) {
 				parameterizedDeclares.add(declareStatement.parameterizeWith(parameterizationMap, world));
 			}
 			declares = parameterizedDeclares;
@@ -821,7 +820,7 @@ public class ReferenceType extends ResolvedType {
 	}
 
 	@Override
-	public Collection getTypeMungers() {
+	public Collection<ConcreteTypeMunger> getTypeMungers() {
 		return delegate.getTypeMungers();
 	}