Weaken Collection declarations

Reports on declarations of Collection variables made by using the collection class as the type, rather than an appropriate interface.

Signed-off-by: Lars Grefer <eclipse@larsgrefer.de>

2 files changed, 4 insertions, 4 deletions

diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java
index d380e988e..e71850c05 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java
@@ -74,8 +74,8 @@ public class CrosscuttingMembers {
 		this.shouldConcretizeIfNeeded = shouldConcretizeIfNeeded;
 	}
 
-	private final Hashtable<String, Object> cflowFields = new Hashtable<>();
-	private final Hashtable<String, Object> cflowBelowFields = new Hashtable<>();
+	private final Map<String, Object> cflowFields = new Hashtable<>();
+	private final Map<String, Object> cflowBelowFields = new Hashtable<>();
 
 	// public void addConcreteShadowMungers(Collection c) {
 	// shadowMungers.addAll(c);
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java
index 293a7766c..9a322d98f 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java
@@ -1425,13 +1425,13 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl
 	 * ??? This method is O(N*M) where N = number of methods and M is number of inter-type declarations in my super
 	 */
 	public List<ConcreteTypeMunger> getInterTypeMungersIncludingSupers() {
-		ArrayList<ConcreteTypeMunger> ret = new ArrayList<>();
+		List<ConcreteTypeMunger> ret = new ArrayList<>();
 		collectInterTypeMungers(ret);
 		return ret;
 	}
 
 	public List<ConcreteTypeMunger> getInterTypeParentMungersIncludingSupers() {
-		ArrayList<ConcreteTypeMunger> ret = new ArrayList<>();
+		List<ConcreteTypeMunger> ret = new ArrayList<>();
 		collectInterTypeParentMungers(ret);
 		return ret;
 	}