From: Andy Clement <andrew.clement@gmail.com>
Date: Tue, 31 Jul 2012 17:28:24 +0000 (-0700)
Subject: generics
X-Git-Tag: V1_7_1~12
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5378e48a474c14a59a2e0b76cf7404655f8875a7;p=aspectj.git

generics
---

diff --git a/weaver/testsrc/org/aspectj/weaver/tools/PointcutParserTest.java b/weaver/testsrc/org/aspectj/weaver/tools/PointcutParserTest.java
index 4db765cd4..4654b049d 100644
--- a/weaver/testsrc/org/aspectj/weaver/tools/PointcutParserTest.java
+++ b/weaver/testsrc/org/aspectj/weaver/tools/PointcutParserTest.java
@@ -56,7 +56,7 @@ public class PointcutParserTest extends TestCase {
 			return;
 		}
 
-		Set s = PointcutParser.getAllSupportedPointcutPrimitives();
+		Set<PointcutPrimitive> s = PointcutParser.getAllSupportedPointcutPrimitives();
 		assertEquals("Should be 21 elements in the set", 21, s.size());
 		assertFalse("Should not contain if pcd", s.contains(PointcutPrimitive.IF));
 		assertFalse("Should not contain cflow pcd", s.contains(PointcutPrimitive.CFLOW));
@@ -70,7 +70,7 @@ public class PointcutParserTest extends TestCase {
 
 		PointcutParser parser = PointcutParser
 				.getPointcutParserSupportingAllPrimitivesAndUsingSpecifiedClassloaderForResolution(this.getClass().getClassLoader());
-		Set s = parser.getSupportedPrimitives();
+		Set<PointcutPrimitive> s = parser.getSupportedPrimitives();
 		assertEquals("Should be 21 elements in the set", 21, s.size());
 		assertFalse("Should not contain if pcd", s.contains(PointcutPrimitive.IF));
 		assertFalse("Should not contain cflow pcd", s.contains(PointcutPrimitive.CFLOW));
@@ -82,12 +82,12 @@ public class PointcutParserTest extends TestCase {
 			return;
 		}
 
-		Set p = PointcutParser.getAllSupportedPointcutPrimitives();
+		Set<PointcutPrimitive> p = PointcutParser.getAllSupportedPointcutPrimitives();
 		PointcutParser parser = PointcutParser
 				.getPointcutParserSupportingSpecifiedPrimitivesAndUsingSpecifiedClassLoaderForResolution(p, this.getClass()
 						.getClassLoader());
 		assertEquals("Should use the set we pass in", p, parser.getSupportedPrimitives());
-		Set q = new HashSet();
+		Set<PointcutPrimitive> q = new HashSet<PointcutPrimitive>();
 		q.add(PointcutPrimitive.ARGS);
 		parser = PointcutParser.getPointcutParserSupportingSpecifiedPrimitivesAndUsingSpecifiedClassLoaderForResolution(q, this
 				.getClass().getClassLoader());