From 548f8b6a118d06874d511ffcc13602b4ec756d9a Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@vmware.com>
Date: Fri, 2 Mar 2012 08:15:27 -0800
Subject: generics

---
 .../aspectj/testing/harness/bridge/AbstractRunSpec.java    | 14 +++++++-------
 .../testing/taskdefs/AjcTaskCompileCommandTest.java        |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'testing')

diff --git a/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java b/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java
index f3d260028..d45037aac 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java
@@ -89,7 +89,7 @@ abstract public class AbstractRunSpec implements IRunSpec {
 	protected final ArrayList<String> paths;
 	// XXXXXunused protected final ArrayList /*ISourceLocation*/ sourceLocations; // XXX remove?
 	protected final ArrayList<IRunSpec> children;
-	protected final ArrayList /* DirChanges.Spec */dirChanges;
+	protected final ArrayList<DirChanges.Spec> dirChanges;
 	protected XMLNames xmlNames;
 	protected String comment;
 
@@ -775,10 +775,10 @@ abstract public class AbstractRunSpec implements IRunSpec {
 		private boolean verbose;
 
 		/** null unless parent set options for children to consider */
-		final private ArrayList /* String */parentOptions;
+		final private ArrayList<String> parentOptions;
 
 		public RT() {
-			parentOptions = new ArrayList();
+			parentOptions = new ArrayList<String>();
 		}
 
 		public boolean isVerbose() {
@@ -878,15 +878,15 @@ abstract public class AbstractRunSpec implements IRunSpec {
 			if (LangUtil.isEmpty(validOptions) || LangUtil.isEmpty(parentOptions)) {
 				return new String[0];
 			}
-			ArrayList result = new ArrayList();
+			ArrayList<String> result = new ArrayList<String>();
 			// boolean haveOption = false;
 			for (int i = 0; i < validOptions.length; i++) {
 				String option = validOptions[i];
 				if (LangUtil.isEmpty(option)) {
 					continue;
 				}
-				for (ListIterator iter = parentOptions.listIterator(); iter.hasNext();) {
-					String parentOption = (String) iter.next();
+				for (ListIterator<String> iter = parentOptions.listIterator(); iter.hasNext();) {
+					String parentOption = iter.next();
 					if (parentOption.startsWith(option)) {
 						result.add(parentOption);
 						if (absorb) {
@@ -899,7 +899,7 @@ abstract public class AbstractRunSpec implements IRunSpec {
 		}
 
 		/** Get ListIterator that permits removals */
-		ListIterator getListIterator() {
+		ListIterator<String> getListIterator() {
 			return parentOptions.listIterator();
 		}
 
diff --git a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java b/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
index f6e59abdc..6ab5a386b 100644
--- a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
+++ b/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
@@ -32,7 +32,7 @@ import junit.framework.TestCase;
 public class AjcTaskCompileCommandTest extends TestCase {
     static boolean loggedWarning = false;
     static boolean runAllTests = true;
-    static ArrayList tempFiles = new ArrayList();
+    static ArrayList<File> tempFiles = new ArrayList<File>();
     
     private static File getClassesDir() {
         File tempDir = FileUtil.getTempDir("AjcTaskCompileCommandTest-classes");
@@ -40,7 +40,7 @@ public class AjcTaskCompileCommandTest extends TestCase {
         return tempDir;
     }
 
-    private static void addCommonArgs(ArrayList list) {
+    private static void addCommonArgs(ArrayList<String> list) {
         list.add("-d");
         list.add(getClassesDir().getAbsolutePath());
         list.add("-classpath");
@@ -109,7 +109,7 @@ public class AjcTaskCompileCommandTest extends TestCase {
     void runSimpleTest(String path, int expectedErrors) {
         File file = new File(path);
         assertTrue(path, file.canRead());
-        ArrayList list = new ArrayList();
+        ArrayList<String> list = new ArrayList<String>();
         addCommonArgs(list);
         if (path.endsWith(".lst")) {
             list.add("-argfile");
@@ -123,7 +123,7 @@ public class AjcTaskCompileCommandTest extends TestCase {
         runTest(list, expectedErrors);
     }
     
-    void runTest(ArrayList args, int expectedErrors) {
+    void runTest(ArrayList<String> args, int expectedErrors) {
         AjcTaskCompileCommand command =
             new AjcTaskCompileCommand();
         MessageHandler handler = new MessageHandler();
-- 
cgit v1.2.3