spring cleaning in advance of 1.2 enhancements:

removed unused imports, local variables, and private methods
(still there, just commented out).

9 files changed, 18 insertions, 18 deletions

diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java b/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java
index eaca921ed..f48000d18 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java
+++ b/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java
@@ -193,7 +193,7 @@ public class AjcSpecTest extends TestCase {
 //    }
 
 	public static void sameIAjcRun(IAjcRun lhs, IAjcRun rhs, Assert reporter) {
-        Assert a = reporter;
+//        Assert a = reporter;
         assertTrue(lhs != null);
         assertTrue(rhs != null);
         Class c = lhs.getClass();
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java b/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java
index d418755ae..8bc83ca98 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java
+++ b/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java
@@ -240,7 +240,7 @@ public class CompilerRunSpecTest extends TestCase {
             assertTrue(spec != null);
             AbstractRunSpec.RT parentRuntime = new AbstractRunSpec.RT();
             String result;
-            String expResult;
+//            String expResult;
 
             if (null != arg) {
                 parentRuntime.setOptions(new String[] { arg });
@@ -342,7 +342,7 @@ public class CompilerRunSpecTest extends TestCase {
         String resultContains =
             !expectPass ? null : "[-" + name + ", 1." + i;
         String messagesContain = expectedErr;
-        MessageHandler handler =
+        /*MessageHandler handler =*/
             runTest(
                 specOptions,
                 globalOptions,
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunTest.java b/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunTest.java
index 002bd5e4f..af0a22b0a 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunTest.java
+++ b/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunTest.java
@@ -35,9 +35,9 @@ public class CompilerRunTest extends TestCase {
         dummyReports.add("run: " + Arrays.asList(args));
     }
     
-    private static void dummyRepeating(String[] args) {
-        dummyReports.add("repeat: " + Arrays.asList(args));
-    }
+//    private static void dummyRepeating(String[] args) {
+//        dummyReports.add("repeat: " + Arrays.asList(args));
+//    }
 
     private File testBaseDir;
         
@@ -67,7 +67,7 @@ public class CompilerRunTest extends TestCase {
     }
     
     public void testExtDirs() {
-        String[] globals = null;
+//        String[] globals = null;
         CompilerRun.Spec spec = new CompilerRun.Spec();
         spec.setExtdirs("one,two"); 
         spec.setFiles("Foo.java");
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java b/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java
index ee7720a68..bb5a58c58 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java
+++ b/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java
@@ -112,7 +112,7 @@ public class ParseTestCase extends TestCase {
 		
 		System.out.println(test);
 		
-		List ret = new ArrayList();
+//		List ret = new ArrayList();
 		
 		NodeList children = node.getChildNodes();
 		for (int i=0; i < children.getLength(); i++) {
@@ -127,7 +127,7 @@ public class ParseTestCase extends TestCase {
 		String kind = node.getNodeName();
 		if (kind.equals("compile")) {
 			List args = parseChildrenStrings(node, "arg");
-			List files = parseChildrenStrings(node, "file");
+			/*List files = */parseChildrenStrings(node, "file");
 			List expectedMessages = parseChildrenMessages(node);
             CompilerRun.Spec spec = new CompilerRun.Spec();
             spec.addOptions((String[]) args.toArray(new String[0]));
@@ -139,7 +139,7 @@ public class ParseTestCase extends TestCase {
             JavaRun.Spec spec = new JavaRun.Spec();
             spec.className = getAttributeString(node, "class");
             spec.addOptions(new String[0]);  //??? could add support here
-            JavaRun run = new JavaRun(spec);
+            /*JavaRun run = */new JavaRun(spec);
 			return spec;
 		}
 		
diff --git a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java b/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
index 9f5d93bd2..c8ec8e1b4 100644
--- a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
+++ b/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
@@ -231,7 +231,7 @@ class MessageAdder implements Runnable {
         final long waitBetweenAdds = interval * 1000l;
         long curTime = System.currentTimeMillis();
         final long timeout = curTime + MAX_MILLIS;
-        final Thread thread = Thread.currentThread();
+//        final Thread thread = Thread.currentThread();
         int numAdded = 0;
         while (!stop && (timeout > curTime) 
             && (numAdded < numToAdd)) {
diff --git a/testing/testsrc/org/aspectj/testing/util/LangUtilTest.java b/testing/testsrc/org/aspectj/testing/util/LangUtilTest.java
index ebdb21cc5..21e4b263d 100644
--- a/testing/testsrc/org/aspectj/testing/util/LangUtilTest.java
+++ b/testing/testsrc/org/aspectj/testing/util/LangUtilTest.java
@@ -70,7 +70,7 @@ public class LangUtilTest extends TestCase {
     
 
 	public void skiptestUnflatten() {
-        LangUtil.FlattenSpec COMMA = LangUtil.FlattenSpec.COMMA;
+//        LangUtil.FlattenSpec COMMA = LangUtil.FlattenSpec.COMMA;
         LangUtil.FlattenSpec LIST = LangUtil.FlattenSpec.LIST;
             
         FTest[] tests = new FTest[]
diff --git a/testing/testsrc/org/aspectj/testing/util/options/OptionChecker.java b/testing/testsrc/org/aspectj/testing/util/options/OptionChecker.java
index 6792d556c..a7d65dd53 100644
--- a/testing/testsrc/org/aspectj/testing/util/options/OptionChecker.java
+++ b/testing/testsrc/org/aspectj/testing/util/options/OptionChecker.java
@@ -129,9 +129,9 @@ public class OptionChecker {
             options);
     }
 
-    private Values getValues(String[] input, Options options) {
-        return getValuesNegative(input, null, options);
-    }
+//    private Values getValues(String[] input, Options options) {
+//        return getValuesNegative(input, null, options);
+//    }
 
     private Values getValues(String[] input) {
         return getValuesNegative(input, null);
diff --git a/testing/testsrc/org/aspectj/testing/util/options/OptionsTest.java b/testing/testsrc/org/aspectj/testing/util/options/OptionsTest.java
index 29048aa07..40b197996 100644
--- a/testing/testsrc/org/aspectj/testing/util/options/OptionsTest.java
+++ b/testing/testsrc/org/aspectj/testing/util/options/OptionsTest.java
@@ -105,7 +105,7 @@ public class OptionsTest extends TestCase {
         return OPTIONS;
     }
 
-    private boolean verbose;
+//    private boolean verbose;
     private OptionChecker localOptionChecker;
 
     public void testDebugCase() {
diff --git a/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java b/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java
index a945652b9..c00ceb9ea 100644
--- a/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java
+++ b/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import junit.framework.*;
+//import junit.framework.*;
 import junit.framework.TestCase;
 
 import org.aspectj.testing.harness.bridge.AjcSpecTest;
@@ -62,7 +62,7 @@ public class AjcSpecXmlReaderTest extends TestCase {
     
     /** test that all AjcSpecXmlReader.me.expectedProperties() are bean-writable */
     public void testBeanInfo() throws IntrospectionException {
-        AjcSpecXmlReader me = AjcSpecXmlReader.getReader();
+//        AjcSpecXmlReader me = AjcSpecXmlReader.getReader();
         AjcSpecXmlReader.BProps[] expected
             = AjcSpecXmlReader.expectedProperties();
         PropertyDescriptor[] des;