Ran "Organize imports" to remove redundant imports etc -

clears up a huge set of warnings in Eclipse so that you
can see the wood for the trees!

14 files changed, 56 insertions, 65 deletions

diff --git a/testing/testsrc/TestingModuleTests.java b/testing/testsrc/TestingModuleTests.java
index a07fd8617..37396e200 100644
--- a/testing/testsrc/TestingModuleTests.java
+++ b/testing/testsrc/TestingModuleTests.java
@@ -14,8 +14,9 @@
 
 // default package
 
-import junit.framework.*;
 import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 public class TestingModuleTests extends TestCase {
 
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java b/testing/testsrc/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java
index 0e5b8651f..0ed0010c2 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java
+++ b/testing/testsrc/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java
@@ -13,14 +13,14 @@
 
 package org.aspectj.testing.harness.bridge;
 
-import org.aspectj.testing.run.IRunIterator;
-import org.aspectj.testing.xml.XMLWriter;
-
 import java.io.PrintWriter;
 import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.aspectj.testing.run.IRunIterator;
+import org.aspectj.testing.xml.XMLWriter;
+
 /**
  * 
  */
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java b/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java
index f3d231014..6424da62e 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java
+++ b/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java
@@ -13,14 +13,6 @@
 
 package org.aspectj.testing.harness.bridge;
 
-import org.aspectj.bridge.IMessage;
-import org.aspectj.bridge.IMessageHolder;
-import org.aspectj.bridge.ISourceLocation;
-import org.aspectj.bridge.MessageHandler;
-import org.aspectj.bridge.MessageUtil;
-import org.aspectj.testing.harness.bridge.AjcTest.Suite.Spec;
-import org.aspectj.testing.xml.AjcSpecXmlReaderTest;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -30,6 +22,10 @@ import junit.framework.Assert;
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.ISourceLocation;
+import org.aspectj.bridge.MessageUtil;
+
 /**
  * Primarily used by others to test AjcTest
  */
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java b/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java
index 9be6a3b3b..a876db105 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java
+++ b/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java
@@ -13,11 +13,11 @@
 
 package org.aspectj.testing.harness.bridge;
 
+import junit.framework.TestCase;
+
 import org.aspectj.bridge.MessageHandler;
 import org.aspectj.bridge.MessageUtil;
 
-import junit.framework.TestCase;
-
 /**
  * 
  */
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/DirChangesTest.java b/testing/testsrc/org/aspectj/testing/harness/bridge/DirChangesTest.java
index a8c5ccd9c..5b35d559a 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/DirChangesTest.java
+++ b/testing/testsrc/org/aspectj/testing/harness/bridge/DirChangesTest.java
@@ -13,17 +13,19 @@
 
 package org.aspectj.testing.harness.bridge;
 
-import org.aspectj.bridge.*;
-import org.aspectj.testing.run.IRunIterator;
-import org.aspectj.testing.xml.XMLWriter;
-import org.aspectj.util.LangUtil;
-
-import java.io.*;
-import java.util.List;
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.MessageHandler;
+import org.aspectj.bridge.MessageUtil;
+import org.aspectj.testing.xml.XMLWriter;
+import org.aspectj.util.LangUtil;
+
 /**
  *
  */
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java b/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java
index 08724edf6..ee7720a68 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java
+++ b/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java
@@ -12,39 +12,34 @@
 
 package org.aspectj.testing.harness.bridge;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import junit.framework.TestCase;
+
 import org.aspectj.bridge.IMessage;
-import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.IMessageHolder;
 import org.aspectj.bridge.ISourceLocation;
 import org.aspectj.bridge.Message;
 import org.aspectj.bridge.MessageHandler;
 import org.aspectj.bridge.MessageUtil;
 import org.aspectj.bridge.SourceLocation;
-import org.aspectj.testing.run.IRun;
 import org.aspectj.testing.run.IRunIterator;
 import org.aspectj.testing.run.IRunListener;
-import org.aspectj.testing.run.IRunStatus;
-import org.aspectj.testing.run.IRunValidator;
 import org.aspectj.testing.run.RunStatus;
-import org.aspectj.testing.run.RunValidator;
 import org.aspectj.testing.run.Runner;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import junit.framework.TestCase;
-
 public class ParseTestCase extends TestCase {
 
 	public ParseTestCase(String name) {
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/TestingBridgeTests.java b/testing/testsrc/org/aspectj/testing/harness/bridge/TestingBridgeTests.java
index 82900a275..f9c5cd3ab 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/TestingBridgeTests.java
+++ b/testing/testsrc/org/aspectj/testing/harness/bridge/TestingBridgeTests.java
@@ -14,7 +14,9 @@
 
 package org.aspectj.testing.harness.bridge;
 
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 public class TestingBridgeTests extends TestCase {
 
diff --git a/testing/testsrc/org/aspectj/testing/util/BridgeUtilTest.java b/testing/testsrc/org/aspectj/testing/util/BridgeUtilTest.java
index ae0a7cdac..1b5fe348f 100644
--- a/testing/testsrc/org/aspectj/testing/util/BridgeUtilTest.java
+++ b/testing/testsrc/org/aspectj/testing/util/BridgeUtilTest.java
@@ -13,15 +13,14 @@
 
 package org.aspectj.testing.util;
 
+import junit.framework.TestCase;
+
 import org.aspectj.bridge.MessageHandler;
-import org.aspectj.bridge.MessageUtil;
 import org.aspectj.testing.run.IRun;
 import org.aspectj.testing.run.IRunStatus;
 import org.aspectj.testing.run.RunStatus;
 import org.aspectj.testing.run.Runner;
 
-import junit.framework.TestCase;
-
 /**
  * 
  */
diff --git a/testing/testsrc/org/aspectj/testing/util/FileUtilTest.java b/testing/testsrc/org/aspectj/testing/util/FileUtilTest.java
index 1ff4d6cf6..ca90c45a9 100644
--- a/testing/testsrc/org/aspectj/testing/util/FileUtilTest.java
+++ b/testing/testsrc/org/aspectj/testing/util/FileUtilTest.java
@@ -13,8 +13,6 @@
 
 package org.aspectj.testing.util;
 
-import java.io.File;
-
 import junit.framework.TestCase;
 
 /**
diff --git a/testing/testsrc/org/aspectj/testing/util/MessageUtilTest.java b/testing/testsrc/org/aspectj/testing/util/MessageUtilTest.java
index 26d8523dd..215cfee5d 100644
--- a/testing/testsrc/org/aspectj/testing/util/MessageUtilTest.java
+++ b/testing/testsrc/org/aspectj/testing/util/MessageUtilTest.java
@@ -14,13 +14,6 @@
 
 package org.aspectj.testing.util;
 
-import org.aspectj.bridge.IMessage;
-import org.aspectj.bridge.ISourceLocation;
-import org.aspectj.bridge.Message;
-import org.aspectj.bridge.MessageHandler;
-import org.aspectj.bridge.MessageUtil;
-import org.aspectj.bridge.SourceLocation;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -31,6 +24,13 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.ISourceLocation;
+import org.aspectj.bridge.Message;
+import org.aspectj.bridge.MessageHandler;
+import org.aspectj.bridge.MessageUtil;
+import org.aspectj.bridge.SourceLocation;
+
 /**
  * 
  */
diff --git a/testing/testsrc/org/aspectj/testing/util/TestDiffsTest.java b/testing/testsrc/org/aspectj/testing/util/TestDiffsTest.java
index 4ce7792c6..e321d9835 100644
--- a/testing/testsrc/org/aspectj/testing/util/TestDiffsTest.java
+++ b/testing/testsrc/org/aspectj/testing/util/TestDiffsTest.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.ListIterator;
 
 import junit.framework.TestCase;
+
 import org.aspectj.util.FileUtil;
 
 /**
diff --git a/testing/testsrc/org/aspectj/testing/util/UtilTests.java b/testing/testsrc/org/aspectj/testing/util/UtilTests.java
index 3ec14d7df..a684eb7ad 100644
--- a/testing/testsrc/org/aspectj/testing/util/UtilTests.java
+++ b/testing/testsrc/org/aspectj/testing/util/UtilTests.java
@@ -14,7 +14,9 @@
 
 package org.aspectj.testing.util;
 
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 public class UtilTests extends TestCase {
 
diff --git a/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java b/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java
index 157cf2dba..38ff3f9f6 100644
--- a/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java
+++ b/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java
@@ -13,17 +13,6 @@
 
 package org.aspectj.testing.xml;
 
-import org.aspectj.bridge.MessageHandler;
-import org.aspectj.bridge.MessageUtil;
-import org.aspectj.testing.harness.bridge.AjcSpecTest;
-import org.aspectj.testing.harness.bridge.CompilerRun;
-import org.aspectj.testing.harness.bridge.FlatSuiteReader;
-import org.aspectj.testing.harness.bridge.AjcTest;
-import org.aspectj.testing.run.IRunStatus;
-import org.aspectj.testing.run.IRunValidator;
-import org.aspectj.testing.run.RunValidator;
-import org.aspectj.util.LangUtil;
-
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
@@ -32,10 +21,14 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.aspectj.testing.harness.bridge.AjcSpecTest;
+import org.aspectj.testing.harness.bridge.AjcTest;
+import org.aspectj.testing.harness.bridge.FlatSuiteReader;
+import org.aspectj.util.LangUtil;
+
 /**
  * 
  */
diff --git a/testing/testsrc/org/aspectj/testing/xml/TestingXmlTests.java b/testing/testsrc/org/aspectj/testing/xml/TestingXmlTests.java
index fbefdba5d..0ea576af4 100644
--- a/testing/testsrc/org/aspectj/testing/xml/TestingXmlTests.java
+++ b/testing/testsrc/org/aspectj/testing/xml/TestingXmlTests.java
@@ -14,7 +14,9 @@
 
 package org.aspectj.testing.xml;
 
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 public class TestingXmlTests extends TestCase {