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!

42 files changed, 240 insertions, 201 deletions

diff --git a/testing/src/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java b/testing/src/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java
index f9c2076e7..709bbc5c2 100644
--- a/testing/src/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java
+++ b/testing/src/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java
@@ -14,23 +14,70 @@
 
 package org.aspectj.internal.tools.ant.taskdefs;
 
-import java.beans.*;
-import java.io.*;
-import java.util.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.LayoutManager;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.DateFormat;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
-import java.text.*;
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.types.*;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
+import javax.swing.border.BevelBorder;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableModel;
+import javax.swing.text.StyleContext;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Location;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Target;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Delete;
+import org.apache.tools.ant.taskdefs.ExecTask;
+import org.apache.tools.ant.taskdefs.Java;
+import org.apache.tools.ant.taskdefs.LogOutputStream;
+import org.apache.tools.ant.taskdefs.Mkdir;
+import org.apache.tools.ant.taskdefs.StreamPumper;
+import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Reference;
 import org.aspectj.util.LangUtil;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
-import javax.swing.text.*;
-
 public class Ajctest extends Task implements PropertyChangeListener {
     private static Ajctest CURRENT_AJCTEST;
 
diff --git a/testing/src/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java b/testing/src/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java
index e066e1ac5..da93ac665 100644
--- a/testing/src/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java
+++ b/testing/src/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java
@@ -15,12 +15,13 @@
 
 package org.aspectj.internal.tools.ant.taskdefs;
 
-import org.aspectj.testing.util.LangUtil; // todo config management here
-
+import java.io.File;
+import java.io.PrintStream;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.lang.reflect.InvocationTargetException;
-import java.io.*;
+
+import org.aspectj.testing.util.LangUtil;
 
 /** 
  * Wrapper to invoke class identified by setting VM argument.
diff --git a/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java b/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java
index 2501db2ab..3b6356bca 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java
@@ -13,6 +13,14 @@
 
 package org.aspectj.testing.harness.bridge;
 
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.ISourceLocation;
@@ -25,14 +33,6 @@ import org.aspectj.testing.xml.SoftMessage;
 import org.aspectj.testing.xml.XMLWriter;
 import org.aspectj.util.LangUtil;
 
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.BitSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
 /**
  * Base class for initialization of components expecting messages,
  * options, files/paths, and source locations (resolved files),
diff --git a/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java b/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java
index 943110df3..565bcdee8 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java
@@ -13,6 +13,12 @@
 
 package org.aspectj.testing.harness.bridge;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.IMessageHolder;
@@ -22,12 +28,6 @@ import org.aspectj.testing.util.BridgeUtil;
 import org.aspectj.testing.util.Diffs;
 import org.aspectj.util.LangUtil;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
 
 /**
  * Adapter to pass messages through to handler,
diff --git a/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java b/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java
index 6592f3381..8f9afefe6 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java
@@ -13,6 +13,12 @@
 
 package org.aspectj.testing.harness.bridge;
 
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.ISourceLocation;
 import org.aspectj.testing.run.IRunIterator;
@@ -21,12 +27,6 @@ import org.aspectj.testing.run.Runner;
 import org.aspectj.testing.xml.XMLWriter;
 import org.aspectj.util.LangUtil;
 
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * An AjcTest has child subruns (compile, [inc-compile|run]*).
  */
diff --git a/testing/src/org/aspectj/testing/harness/bridge/DirChanges.java b/testing/src/org/aspectj/testing/harness/bridge/DirChanges.java
index 4e577b1a4..873302d12 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/DirChanges.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/DirChanges.java
@@ -13,6 +13,11 @@
 
 package org.aspectj.testing.harness.bridge;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.MessageUtil;
 import org.aspectj.testing.util.TestUtil;
@@ -21,11 +26,6 @@ import org.aspectj.testing.xml.XMLWriter;
 import org.aspectj.util.FileUtil;
 import org.aspectj.util.LangUtil;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * Calculate changes in a directory tree.
  * This implements two different specification styles:
diff --git a/testing/src/org/aspectj/testing/harness/bridge/FlatSuiteReader.java b/testing/src/org/aspectj/testing/harness/bridge/FlatSuiteReader.java
index dbf5dd259..96e15bdc9 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/FlatSuiteReader.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/FlatSuiteReader.java
@@ -13,6 +13,13 @@
 
 package org.aspectj.testing.harness.bridge;
 
+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 org.aspectj.bridge.AbortException;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.ISourceLocation;
@@ -27,13 +34,6 @@ import org.aspectj.util.FileUtil;
 import org.aspectj.util.LangUtil;
 import org.aspectj.util.LineReader;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
 /** 
  * SFileReader.Maker implementation to read tests 
  * XXX supports iterative but not yet incremental compiles
diff --git a/testing/src/org/aspectj/testing/harness/bridge/Globals.java b/testing/src/org/aspectj/testing/harness/bridge/Globals.java
index 7c4f524a5..8f5871a65 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/Globals.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/Globals.java
@@ -14,11 +14,11 @@
  
  package org.aspectj.testing.harness.bridge;
 
+import java.io.File;
+
 import org.aspectj.util.FileUtil;
 import org.aspectj.util.LangUtil;
 
-import java.io.File;
-
 /**
  */
 public class Globals {
diff --git a/testing/src/org/aspectj/testing/harness/bridge/IncCompilerRun.java b/testing/src/org/aspectj/testing/harness/bridge/IncCompilerRun.java
index 4ee4cc183..6e8d626e7 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/IncCompilerRun.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/IncCompilerRun.java
@@ -13,6 +13,14 @@
 
 package org.aspectj.testing.harness.bridge;
 
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import org.aspectj.bridge.ICommand;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.MessageUtil;
@@ -24,14 +32,6 @@ import org.aspectj.testing.xml.XMLWriter;
 import org.aspectj.util.FileUtil;
 import org.aspectj.util.LangUtil;
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 /**
  * An incremental compiler run takes an existing compiler commmand
  * from the sandbox, updates the staging directory, and recompiles.
diff --git a/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java b/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java
index 030f5497f..aa891e32a 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java
@@ -12,6 +12,13 @@
 
 package org.aspectj.testing.harness.bridge;
 
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
+
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.MessageUtil;
 import org.aspectj.testing.Tester;
@@ -24,13 +31,6 @@ import org.aspectj.testing.xml.XMLWriter;
 import org.aspectj.util.FileUtil;
 import org.aspectj.util.LangUtil;
 
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * Run a class in this VM using reflection.
  */
diff --git a/testing/src/org/aspectj/testing/harness/bridge/RunSpecIterator.java b/testing/src/org/aspectj/testing/harness/bridge/RunSpecIterator.java
index ebc4c14c6..3e1f536f5 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/RunSpecIterator.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/RunSpecIterator.java
@@ -13,6 +13,8 @@
 
 package org.aspectj.testing.harness.bridge;
 
+import java.util.ArrayList;
+
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.Message;
@@ -22,8 +24,6 @@ import org.aspectj.testing.run.Runner;
 import org.aspectj.testing.run.WrappedRunIterator;
 import org.aspectj.util.LangUtil;
 
-import java.util.ArrayList;
-
 
 /** 
  * This wraps an AbstractRunSpec, which has children that
diff --git a/testing/src/org/aspectj/testing/harness/bridge/Sandbox.java b/testing/src/org/aspectj/testing/harness/bridge/Sandbox.java
index 198e6c775..2bfb8e63b 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/Sandbox.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/Sandbox.java
@@ -12,6 +12,9 @@
 
 package org.aspectj.testing.harness.bridge;
 
+import java.io.File;
+import java.util.ArrayList;
+
 import org.aspectj.bridge.ICommand;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHandler;
@@ -19,9 +22,6 @@ import org.aspectj.testing.util.Diffs;
 import org.aspectj.util.FileUtil;
 import org.aspectj.util.LangUtil;
 
-import java.io.File;
-import java.util.ArrayList;
-
 /**
  * A sandbox holds state shared by AjcTest sub-runs,
  * mostly directories relevant to testing.
diff --git a/testing/src/org/aspectj/testing/harness/bridge/Validator.java b/testing/src/org/aspectj/testing/harness/bridge/Validator.java
index 55c3962e8..a7a43db08 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/Validator.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/Validator.java
@@ -12,13 +12,6 @@
 
 package org.aspectj.testing.harness.bridge;
 
-import org.aspectj.bridge.AbortException;
-import org.aspectj.bridge.IMessage;
-import org.aspectj.bridge.IMessageHandler;
-import org.aspectj.bridge.MessageUtil;
-import org.aspectj.util.FileUtil;
-import org.aspectj.util.LangUtil;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,6 +20,13 @@ import java.util.Iterator;
 import java.util.ListIterator;
 import java.util.Stack;
 
+import org.aspectj.bridge.AbortException;
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.IMessageHandler;
+import org.aspectj.bridge.MessageUtil;
+import org.aspectj.util.FileUtil;
+import org.aspectj.util.LangUtil;
+
 /** 
  * Check input and implement defaults.
  * This handles failure messaging and collecting temp directories
diff --git a/testing/src/org/aspectj/testing/run/RunIterator.java b/testing/src/org/aspectj/testing/run/RunIterator.java
index 37e3187ed..eb444ba47 100644
--- a/testing/src/org/aspectj/testing/run/RunIterator.java
+++ b/testing/src/org/aspectj/testing/run/RunIterator.java
@@ -14,14 +14,14 @@
  
 package org.aspectj.testing.run;
 
-import org.aspectj.bridge.IMessageHandler;
-import org.aspectj.bridge.MessageUtil;
-import org.aspectj.util.LangUtil;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.ListIterator;
 
+import org.aspectj.bridge.IMessageHandler;
+import org.aspectj.bridge.MessageUtil;
+import org.aspectj.util.LangUtil;
+
 /**
  * Adapt IRun or Run[] or List or ListIterator to RunIteratorI.
  */
diff --git a/testing/src/org/aspectj/testing/run/RunListener.java b/testing/src/org/aspectj/testing/run/RunListener.java
index 523862991..bbfbf6c9f 100644
--- a/testing/src/org/aspectj/testing/run/RunListener.java
+++ b/testing/src/org/aspectj/testing/run/RunListener.java
@@ -14,12 +14,12 @@
  
 package org.aspectj.testing.run;
 
-import org.aspectj.bridge.AbortException;
-import org.aspectj.bridge.MessageUtil;
-
 import java.io.PrintWriter;
 import java.util.List;
 
+import org.aspectj.bridge.AbortException;
+import org.aspectj.bridge.MessageUtil;
+
 /**
  * A generic RunListener for easier partial implementations.
  * It can take a RunI selector (called on completion) 
diff --git a/testing/src/org/aspectj/testing/run/RunStatus.java b/testing/src/org/aspectj/testing/run/RunStatus.java
index 0a53080e1..be971f6b9 100644
--- a/testing/src/org/aspectj/testing/run/RunStatus.java
+++ b/testing/src/org/aspectj/testing/run/RunStatus.java
@@ -14,15 +14,15 @@
 
 package org.aspectj.testing.run;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHolder;
 import org.aspectj.bridge.MessageHandler;
 import org.aspectj.testing.util.BridgeUtil;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * Default implementation of {@link IRunStatus}.
  * @author isberg
diff --git a/testing/src/org/aspectj/testing/run/Runner.java b/testing/src/org/aspectj/testing/run/Runner.java
index 6cb9e75fa..2ea278e72 100644
--- a/testing/src/org/aspectj/testing/run/Runner.java
+++ b/testing/src/org/aspectj/testing/run/Runner.java
@@ -14,6 +14,9 @@
 
 package org.aspectj.testing.run;
 
+import java.util.Enumeration;
+import java.util.Hashtable;
+
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.IMessageHolder;
@@ -22,9 +25,6 @@ import org.aspectj.bridge.MessageHandler;
 import org.aspectj.bridge.MessageUtil;
 import org.aspectj.util.LangUtil;
 
-import java.util.Enumeration;
-import java.util.Hashtable;
-
 /**
  * Run IRun, setting status and invoking listeners
  * for simple and nested runs.
diff --git a/testing/src/org/aspectj/testing/util/BridgeUtil.java b/testing/src/org/aspectj/testing/util/BridgeUtil.java
index 8e4b60fca..963a7f551 100644
--- a/testing/src/org/aspectj/testing/util/BridgeUtil.java
+++ b/testing/src/org/aspectj/testing/util/BridgeUtil.java
@@ -13,6 +13,9 @@
 
 package org.aspectj.testing.util;
 
+import java.io.File;
+import java.util.Comparator;
+
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.ISourceLocation;
 import org.aspectj.bridge.Message;
@@ -23,9 +26,6 @@ import org.aspectj.testing.run.RunValidator;
 import org.aspectj.util.FileUtil;
 import org.aspectj.util.LineReader;
 
-import java.io.File;
-import java.util.Comparator;
-
 /**
  * 
  */
diff --git a/testing/src/org/aspectj/testing/util/Diffs.java b/testing/src/org/aspectj/testing/util/Diffs.java
index 1adf40924..7f77afc64 100644
--- a/testing/src/org/aspectj/testing/util/Diffs.java
+++ b/testing/src/org/aspectj/testing/util/Diffs.java
@@ -13,16 +13,16 @@
 
 package org.aspectj.testing.util;
 
-import org.aspectj.bridge.IMessage;
-import org.aspectj.bridge.IMessageHandler;
-import org.aspectj.bridge.MessageUtil;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.IMessageHandler;
+import org.aspectj.bridge.MessageUtil;
+
 /** result struct for expected/actual diffs for Collection */
 public class Diffs {
 
diff --git a/testing/src/org/aspectj/testing/util/LangUtil.java b/testing/src/org/aspectj/testing/util/LangUtil.java
index 2cbd87038..6059dcca8 100644
--- a/testing/src/org/aspectj/testing/util/LangUtil.java
+++ b/testing/src/org/aspectj/testing/util/LangUtil.java
@@ -13,9 +13,6 @@
 
 package org.aspectj.testing.util;
 
-import org.aspectj.bridge.AbortException;
-import org.aspectj.bridge.IMessage;
-
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
@@ -36,6 +33,9 @@ import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
+import org.aspectj.bridge.AbortException;
+import org.aspectj.bridge.IMessage;
+
 
 /** 
  * misc lang utilities
diff --git a/testing/src/org/aspectj/testing/util/RunUtils.java b/testing/src/org/aspectj/testing/util/RunUtils.java
index febfac442..cedc72c84 100644
--- a/testing/src/org/aspectj/testing/util/RunUtils.java
+++ b/testing/src/org/aspectj/testing/util/RunUtils.java
@@ -13,6 +13,9 @@
 
 package org.aspectj.testing.util;
 
+import java.io.PrintStream;
+import java.util.Iterator;
+
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.IMessageHolder;
@@ -24,9 +27,6 @@ import org.aspectj.testing.run.IRunStatus;
 import org.aspectj.testing.run.RunValidator;
 import org.aspectj.util.LangUtil;
 
-import java.io.PrintStream;
-import java.util.Iterator;
-
 /**
  * 
  */
diff --git a/testing/src/org/aspectj/testing/util/SFileReader.java b/testing/src/org/aspectj/testing/util/SFileReader.java
index f2b57e13d..2d2a9deef 100644
--- a/testing/src/org/aspectj/testing/util/SFileReader.java
+++ b/testing/src/org/aspectj/testing/util/SFileReader.java
@@ -13,16 +13,16 @@
 
 package org.aspectj.testing.util;
 
-import org.aspectj.bridge.AbortException;
-import org.aspectj.bridge.IMessage;
-import org.aspectj.util.LangUtil;
-import org.aspectj.util.LineReader;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.ArrayList;
 
+import org.aspectj.bridge.AbortException;
+import org.aspectj.bridge.IMessage;
+import org.aspectj.util.LangUtil;
+import org.aspectj.util.LineReader;
+
 
 /**
  * This reads a structured (config) file, which may have
diff --git a/testing/src/org/aspectj/testing/util/TestDiffs.java b/testing/src/org/aspectj/testing/util/TestDiffs.java
index 2a847f039..f07ed9664 100644
--- a/testing/src/org/aspectj/testing/util/TestDiffs.java
+++ b/testing/src/org/aspectj/testing/util/TestDiffs.java
@@ -13,8 +13,6 @@
 
 package org.aspectj.testing.util;
 
-import org.aspectj.util.LangUtil;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -27,6 +25,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 
+import org.aspectj.util.LangUtil;
+
 /**
  * Calculated differences between two test runs 
  * based on their output files
diff --git a/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java b/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java
index 42d0a0e66..bf2ae782d 100644
--- a/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java
+++ b/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java
@@ -13,6 +13,13 @@
 
 package org.aspectj.testing.xml;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+
 import org.apache.commons.digester.Digester;
 import org.aspectj.bridge.AbortException;
 import org.aspectj.bridge.IMessage;
@@ -29,13 +36,6 @@ import org.aspectj.testing.util.RunUtils;
 import org.aspectj.util.LangUtil;
 import org.xml.sax.SAXException;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-
 /** 
  * Read an ajc test specification in xml form. 
  * Input files should comply with DOCTYPE
diff --git a/testing/src/org/aspectj/testing/xml/MessageListXmlReader.java b/testing/src/org/aspectj/testing/xml/MessageListXmlReader.java
index 62c32db3b..bd909ed3f 100644
--- a/testing/src/org/aspectj/testing/xml/MessageListXmlReader.java
+++ b/testing/src/org/aspectj/testing/xml/MessageListXmlReader.java
@@ -12,14 +12,6 @@
 
 package org.aspectj.testing.xml;
 
-import org.apache.commons.digester.Digester;
-import org.aspectj.bridge.AbortException;
-import org.aspectj.bridge.IMessage;
-import org.aspectj.bridge.ISourceLocation;
-import org.aspectj.bridge.MessageUtil;
-import org.aspectj.util.LangUtil;
-import org.xml.sax.SAXException;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -28,6 +20,14 @@ import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.digester.Digester;
+import org.aspectj.bridge.AbortException;
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.ISourceLocation;
+import org.aspectj.bridge.MessageUtil;
+import org.aspectj.util.LangUtil;
+import org.xml.sax.SAXException;
+
 /** 
  * Read a list of messages in xml form. 
  * Input files should comply with DOCTYPE
diff --git a/testing/src/org/aspectj/testing/xml/SoftMessage.java b/testing/src/org/aspectj/testing/xml/SoftMessage.java
index 30266023f..8d8d1722c 100644
--- a/testing/src/org/aspectj/testing/xml/SoftMessage.java
+++ b/testing/src/org/aspectj/testing/xml/SoftMessage.java
@@ -14,16 +14,16 @@
 
 package org.aspectj.testing.xml;
 
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.ISourceLocation;
 import org.aspectj.bridge.MessageUtil;
 import org.aspectj.bridge.SourceLocation;
 import org.aspectj.util.LangUtil;
 
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
 
 /**
  * Implement messages.
diff --git a/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java b/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java
index c301c0dca..b380381a0 100644
--- a/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java
+++ b/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java
@@ -14,10 +14,10 @@
 package org.aspectj.testing.xml;
 
 
-import org.aspectj.bridge.ISourceLocation;
-
 import java.io.File;
 
+import org.aspectj.bridge.ISourceLocation;
+
 /**
  * Immutable source location.
  * This guarantees that the source file is not null
diff --git a/testing/src/org/aspectj/testing/xml/XMLWriter.java b/testing/src/org/aspectj/testing/xml/XMLWriter.java
index 7d15339c2..fd7bbf19f 100644
--- a/testing/src/org/aspectj/testing/xml/XMLWriter.java
+++ b/testing/src/org/aspectj/testing/xml/XMLWriter.java
@@ -13,12 +13,12 @@
 
 package org.aspectj.testing.xml;
 
-import org.aspectj.util.LangUtil;
-
 import java.io.PrintWriter;
 import java.util.List;
 import java.util.Stack;
 
+import org.aspectj.util.LangUtil;
+
 /** 
  * Manage print stream to an XML document.
  * This tracks start/end elements and signals on error,
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 {