eliminates many warnings in the aspectj5rt package - 10 generic related warnings remain that I'm not sure how to eradicate!

2 files changed, 7 insertions, 7 deletions

diff --git a/aspectj5rt/java5-testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java b/aspectj5rt/java5-testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java
index 211da98c3..f634d6c73 100644
--- a/aspectj5rt/java5-testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java
+++ b/aspectj5rt/java5-testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java
@@ -60,7 +60,7 @@ public class AjTypeTests extends TestCase {
 	}
 	
 	public void testGetSupertype() {
-		Class stringSuper = String.class.getSuperclass();
+		Class<?> stringSuper = String.class.getSuperclass();
 		AjType ajSuper = stringType.getSupertype();
 		assertEquals(AjTypeSystem.getAjType(stringSuper),ajSuper);
 	}
diff --git a/aspectj5rt/java5-testsrc/org/aspectj/internal/lang/reflect/AjTypeTestsWithAspects.java b/aspectj5rt/java5-testsrc/org/aspectj/internal/lang/reflect/AjTypeTestsWithAspects.java
index 7b15d3e64..046733b82 100644
--- a/aspectj5rt/java5-testsrc/org/aspectj/internal/lang/reflect/AjTypeTestsWithAspects.java
+++ b/aspectj5rt/java5-testsrc/org/aspectj/internal/lang/reflect/AjTypeTestsWithAspects.java
@@ -42,7 +42,7 @@ import org.aspectj.lang.reflect.TypePatternBasedPerClause;
 
 public class AjTypeTestsWithAspects extends TestCase {
 
-	private AjType sa;
+	private AjType<SimpleAspect> sa;
 	
 	protected void setUp() throws Exception {
 		super.setUp();
@@ -50,11 +50,11 @@ public class AjTypeTestsWithAspects extends TestCase {
 	}
 
 	public void testGetPerClause() {
-		AjType perThisA = AjTypeSystem.getAjType(PerThisAspect.class);
-		AjType perTargetA = AjTypeSystem.getAjType(PerTargetAspect.class);
-		AjType perCflowA = AjTypeSystem.getAjType(PerCflowAspect.class);
-		AjType perCflowbelowA = AjTypeSystem.getAjType(PerCflowbelowAspect.class);
-		AjType perTypeWithinA = AjTypeSystem.getAjType(PerTypeWithin.class);
+		AjType<PerThisAspect> perThisA = AjTypeSystem.getAjType(PerThisAspect.class);
+		AjType<PerTargetAspect> perTargetA = AjTypeSystem.getAjType(PerTargetAspect.class);
+		AjType<PerCflowAspect> perCflowA = AjTypeSystem.getAjType(PerCflowAspect.class);
+		AjType<PerCflowbelowAspect> perCflowbelowA = AjTypeSystem.getAjType(PerCflowbelowAspect.class);
+		AjType<PerTypeWithin> perTypeWithinA = AjTypeSystem.getAjType(PerTypeWithin.class);
 		
 		PerClause pc = perThisA.getPerClause();
 		assertEquals(PerClauseKind.PERTHIS,pc.getKind());