spring cleaning in advance of 1.2 enhancements:

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

diff --git a/testing-drivers/src/org/aspectj/testing/drivers/Harness.java b/testing-drivers/src/org/aspectj/testing/drivers/Harness.java
index 94921da3243f655098ccbdb00b8581b23c341d11..20421fe8035662412351f6c0ed32ec74f341fa23 100644 (file)
--- a/testing-drivers/src/org/aspectj/testing/drivers/Harness.java
+++ b/testing-drivers/src/org/aspectj/testing/drivers/Harness.java
@@ -144,7 +144,7 @@ public class Harness {
      */ 
     private static String[] readArgs(File argFile) {
         ArrayList args = new ArrayList();
-        int lineNum = 0;
+//        int lineNum = 0;
 
         try {
             BufferedReader stream =
@@ -447,7 +447,7 @@ public class Harness {
      * Subclasses override this to implement new options.
      */
     protected boolean acceptOption(String option) {
-        boolean result = false;
+//        boolean result = false;
         if (LangUtil.isEmpty(option)) {
             return true; // skip bad input
         } else if ("-verboseHarness".equals(option)) {
@@ -712,11 +712,11 @@ class FeatureHarness extends Harness {
             = RunUtils.VERBOSE_PRINTER;
         final RunUtils.IRunStatusPrinter terse 
             = RunUtils.TERSE_PRINTER;
-        final boolean LOGPASS = true;
-        final boolean LOGFAIL = true;
-        final boolean SKIPPASS = false;
-        final boolean SKIPFAIL = false;
-        final boolean LOGSTREAMS = true;
+//        final boolean LOGPASS = true;
+//        final boolean LOGFAIL = true;
+//        final boolean SKIPPASS = false;
+//        final boolean SKIPFAIL = false;
+//        final boolean LOGSTREAMS = true;
         final boolean SKIPSTREAMS = false;
         
                Feature feature = null;

diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/AjctestsAdapter.java b/testing-drivers/testsrc/org/aspectj/testing/drivers/AjctestsAdapter.java
index da0c42fb8a7228d27012224b501ca7e8de223e70..fb221a246dd1ba6ea8044e12f89409e5021fdda8 100644 (file)
--- a/testing-drivers/testsrc/org/aspectj/testing/drivers/AjctestsAdapter.java
+++ b/testing-drivers/testsrc/org/aspectj/testing/drivers/AjctestsAdapter.java
@@ -20,8 +20,8 @@ import junit.framework.*;
 import org.aspectj.bridge.*;
 import org.aspectj.testing.harness.bridge.*;
 import org.aspectj.testing.run.*;
-import org.aspectj.testing.util.RunUtils;
-import org.aspectj.testing.xml.AjcSpecXmlReader;
+//import org.aspectj.testing.util.RunUtils;
+//import org.aspectj.testing.xml.AjcSpecXmlReader;
 
 /*
  * Adapt Harness tests to JUnit driver.

diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessJUnitUtil.java b/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessJUnitUtil.java
index 77c38c35dc5c7170636d2fb9346a9248937934d0..287ea53d91e55dc014247f71a30b5ed270304cad 100644 (file)
--- a/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessJUnitUtil.java
+++ b/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessJUnitUtil.java
@@ -18,7 +18,7 @@ import java.util.*;
 import junit.framework.*;
 
 import org.aspectj.bridge.*;
-import org.aspectj.bridge.MessageHandler;
+//import org.aspectj.bridge.MessageHandler;
 import org.aspectj.testing.harness.bridge.*;
 import org.aspectj.testing.run.IRunStatus;
 import org.aspectj.testing.util.RunUtils;

diff --git a/testing-util/src/org/aspectj/testing/util/TestUtil.java b/testing-util/src/org/aspectj/testing/util/TestUtil.java
index 553684eb310b30e35bbab0f26057acdb898a5bce..055442754eeab58998b7e390f0bf5971b7b88982 100644 (file)
--- a/testing-util/src/org/aspectj/testing/util/TestUtil.java
+++ b/testing-util/src/org/aspectj/testing/util/TestUtil.java
@@ -430,7 +430,7 @@ public final class TestUtil {
             }
             // capture file as FileLine[]
             InputStream in = null;
-            String path = FileUtil.normalizedPath(file, basedir);
+            /*String path = */FileUtil.normalizedPath(file, basedir);
             LineStream capture = new LineStream();
             try { 
                 lineate(capture, handler, basedir, file);

diff --git a/util/src/org/aspectj/util/FileUtil.java b/util/src/org/aspectj/util/FileUtil.java
index b8b16c07c934a5975245e957e9e6a0e9031a126a..c7663ae6316f8381118b26ef309f2e83e0e9d478 100644 (file)
--- a/util/src/org/aspectj/util/FileUtil.java
+++ b/util/src/org/aspectj/util/FileUtil.java
@@ -411,7 +411,7 @@ public class FileUtil {
                         file.delete();
                     }
                 } else {
-                    boolean ret = file.delete();
+                    /*boolean ret = */file.delete();
                     result++;
                 }
             }
@@ -704,7 +704,7 @@ public class FileUtil {
             }
             copyValidFiles(fromFile, toFile); // file-file                
         } else { // target file is a non-existent path -- could be file or dir
-            File toFileParent = ensureParentWritable(toFile);
+            /*File toFileParent = */ensureParentWritable(toFile);
             if (fromFile.isFile()) {
                 copyValidFiles(fromFile, toFile);
             } else if (fromFile.isDirectory()) {
@@ -1212,18 +1212,18 @@ public class FileUtil {
         return LangUtil.sleepUntil(++delayUntil);
     }
 
-    /** map name to result, removing any fromSuffix and adding any toSuffix */
-    private static String map(String name, String fromSuffix, String toSuffix) {
-        if (null != name) {
-            if (null != fromSuffix) {
-                name = name.substring(0, name.length()-fromSuffix.length());
-            }
-            if (null != toSuffix) {
-                name = name + toSuffix;
-            }
-        }
-        return name;
-    }
+//    /** map name to result, removing any fromSuffix and adding any toSuffix */
+//    private static String map(String name, String fromSuffix, String toSuffix) {
+//        if (null != name) {
+//            if (null != fromSuffix) {
+//                name = name.substring(0, name.length()-fromSuffix.length());
+//            }
+//            if (null != toSuffix) {
+//                name = name + toSuffix;
+//            }
+//        }
+//        return name;
+//    }
 
     private static void listFiles(final File baseDir, ArrayList result, FileFilter filter)  {
         File[] files = baseDir.listFiles();

diff --git a/util/src/org/aspectj/util/LangUtil.java b/util/src/org/aspectj/util/LangUtil.java
index 28fb3602154cdd416417328bd064628787d9b46d..0893ca74734fb91f83b15764da0483cd32dfacfc 100644 (file)
--- a/util/src/org/aspectj/util/LangUtil.java
+++ b/util/src/org/aspectj/util/LangUtil.java
@@ -14,7 +14,7 @@
 package org.aspectj.util;
 
 
-import java.awt.event.InvocationEvent;
+//import java.awt.event.InvocationEvent;
 import java.io.*;
 import java.io.File;
 import java.io.IOException;
@@ -1052,11 +1052,11 @@ public class LangUtil {
         } else if (time < 0) {
             throw new IllegalArgumentException("negative: " + time);
         }
-        final Thread thread = Thread.currentThread();
+//        final Thread thread = Thread.currentThread();
         long curTime = System.currentTimeMillis();
         for (int i = 0; (i < 100) && (curTime < time); i++) {
             try {
-                thread.sleep(time-curTime);            
+                Thread.sleep(time-curTime);            
             } catch (InterruptedException e) {
                 // ignore
             }

diff --git a/util/src/org/aspectj/util/Reflection.java b/util/src/org/aspectj/util/Reflection.java
index 6804afaa690f7d3a4774254a0d9e8816af2fc547..10bcc1583d201baf0b406e675b8702eaf79296c8 100644 (file)
--- a/util/src/org/aspectj/util/Reflection.java
+++ b/util/src/org/aspectj/util/Reflection.java
@@ -18,7 +18,7 @@ import java.lang.reflect.*;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.StringTokenizer;
+//import java.util.StringTokenizer;
 
 public class Reflection {
     public static final Class[] MAIN_PARM_TYPES = new Class[] {String[].class};    

diff --git a/util/testsrc/org/aspectj/util/FileUtilTest.java b/util/testsrc/org/aspectj/util/FileUtilTest.java
index cb8fc79bebc5a7e830440853d9d98fdce3af748d..b39c092de149c09b13b9410a82471eeb377e563a 100644 (file)
--- a/util/testsrc/org/aspectj/util/FileUtilTest.java
+++ b/util/testsrc/org/aspectj/util/FileUtilTest.java
@@ -13,7 +13,7 @@
 
 package org.aspectj.util;
 
-import java.io.ByteArrayInputStream;
+//import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FilenameFilter;