generics

2 files changed, 3 insertions, 6 deletions

diff --git a/weaver/testsrc/org/aspectj/weaver/WeaverMessagesTestCase.java b/weaver/testsrc/org/aspectj/weaver/WeaverMessagesTestCase.java
index ea5dd9d67..7326971d3 100644
--- a/weaver/testsrc/org/aspectj/weaver/WeaverMessagesTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/WeaverMessagesTestCase.java
@@ -18,16 +18,15 @@ import java.util.MissingResourceException;
 import junit.framework.TestCase;
 
 /**
- * @author colyer
- *
+ * @author Adrian Colyer
  */
 public class WeaverMessagesTestCase extends TestCase {
 	
 	public void testAllMessagesDefined() {
 		
-		Class wmClass = WeaverMessages.class;
+		Class<?> wmClass = WeaverMessages.class;
 		Field[] fields = wmClass.getDeclaredFields();
-		List fieldList = new ArrayList();
+		List<String> fieldList = new ArrayList<String>();
 		for (int i = 0; i < fields.length; i++) {
 			Field f = fields[i];
 			if (f.getType() == String.class) {
diff --git a/weaver/testsrc/org/aspectj/weaver/tools/cache/WeavedClassCacheTest.java b/weaver/testsrc/org/aspectj/weaver/tools/cache/WeavedClassCacheTest.java
index 84406b558..6c3d75a29 100644
--- a/weaver/testsrc/org/aspectj/weaver/tools/cache/WeavedClassCacheTest.java
+++ b/weaver/testsrc/org/aspectj/weaver/tools/cache/WeavedClassCacheTest.java
@@ -18,8 +18,6 @@ import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.weaver.tools.GeneratedClassHandler;
 
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;