From: aclement <aclement>
Date: Wed, 7 Jul 2010 18:24:53 +0000 (+0000)
Subject: generics
X-Git-Tag: V1_6_10RC1~136
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dc34940150f311eecacb8524da0ca9090c210827;p=aspectj.git

generics
---

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Checker.java b/org.aspectj.matcher/src/org/aspectj/weaver/Checker.java
index 9ae5b8311..384c5d6cd 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Checker.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/Checker.java
@@ -32,6 +32,7 @@ public class Checker extends ShadowMunger {
 	private String message;
 	private volatile int hashCode = -1;
 
+	@SuppressWarnings("unused")
 	private Checker() {
 	}
 
@@ -99,8 +100,8 @@ public class Checker extends ShadowMunger {
 	}
 
 	@Override
-	public Collection getThrownExceptions() {
-		return Collections.EMPTY_LIST;
+	public Collection<ResolvedType> getThrownExceptions() {
+		return Collections.emptyList();
 	}
 
 	// FIXME this perhaps ought to take account of the other fields in advice (use super.equals?)
@@ -128,7 +129,7 @@ public class Checker extends ShadowMunger {
 	 * Parameterize the Checker by parameterizing the pointcut
 	 */
 	@Override
-	public ShadowMunger parameterizeWith(ResolvedType declaringType, Map typeVariableMap) {
+	public ShadowMunger parameterizeWith(ResolvedType declaringType, Map<String, UnresolvedType> typeVariableMap) {
 		Checker ret = new Checker(this.pointcut.parameterizeWith(typeVariableMap, declaringType.getWorld()), this.start, this.end,
 				this.sourceContext, this.message, this.isError);
 		return ret;
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ShadowMunger.java b/org.aspectj.matcher/src/org/aspectj/weaver/ShadowMunger.java
index 0937d5469..585fb24bd 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ShadowMunger.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/ShadowMunger.java
@@ -243,12 +243,12 @@ public abstract class ShadowMunger implements PartialOrder.PartialComparable, IH
 	 */
 	public abstract boolean implementOn(Shadow shadow);
 
-	public abstract ShadowMunger parameterizeWith(ResolvedType declaringType, Map typeVariableMap);
+	public abstract ShadowMunger parameterizeWith(ResolvedType declaringType, Map<String, UnresolvedType> typeVariableMap);
 
 	/**
 	 * @return a Collection of ResolvedTypes for all checked exceptions that might be thrown by this munger
 	 */
-	public abstract Collection getThrownExceptions();
+	public abstract Collection<ResolvedType> getThrownExceptions();
 
 	/**
 	 * Does the munger have to check that its exception are accepted by the shadow ? It is not the case for annotation style around