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!

12 files changed, 136 insertions, 48 deletions

diff --git a/build/src/$installer$/org/aspectj/Main.java b/build/src/$installer$/org/aspectj/Main.java
index f6f5e733e..ec2b12280 100644
--- a/build/src/$installer$/org/aspectj/Main.java
+++ b/build/src/$installer$/org/aspectj/Main.java
@@ -15,15 +15,52 @@
 
 package $installer$.org.aspectj;
 
-import javax.swing.*;
-import javax.swing.border.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.net.URL;
-import java.util.zip.*;
-import java.util.*;
+import java.awt.BorderLayout;
+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.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintStream;
 import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+import java.util.Map;
+import java.util.Properties;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JEditorPane;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.border.Border;
+import javax.swing.border.CompoundBorder;
+import javax.swing.border.EmptyBorder;
 
 /**
  * Invoke the Installer gui.
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java
index 614e60f44..bdeb456c6 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java
@@ -14,13 +14,30 @@
 //XXX INCLUDES CODE FROM ANT -- UNDER APACHE LICENSE
 package org.aspectj.internal.tools.ant.taskdefs;
 
-import org.apache.tools.ant.types.*;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringBufferInputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.zip.CRC32;
+import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-import java.util.*;
-import java.util.zip.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Copy;
+import org.apache.tools.ant.taskdefs.Delete;
+import org.apache.tools.ant.taskdefs.Expand;
+import org.apache.tools.ant.taskdefs.MatchingTask;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.PatternSet;
 
 public class AJInstaller extends MatchingTask {
     static final String INCLUDE_CLASSES = "$installer$/org/aspectj/*.class";
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/AJPush.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/AJPush.java
index fe6e12b45..48f0d6083 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/AJPush.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/AJPush.java
@@ -13,8 +13,6 @@
 
 package org.aspectj.internal.tools.ant.taskdefs;
 
-import org.apache.tools.ant.taskdefs.Mkdir;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -22,6 +20,8 @@ import java.io.IOException;
 import java.text.DecimalFormat;
 import java.util.Properties;
 
+import org.apache.tools.ant.taskdefs.Mkdir;
+
 public class AJPush extends ConditionalTask {
     private File src;
 
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java
index 613e71341..0cfd097b7 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java
@@ -11,6 +11,14 @@
  * ******************************************************************/
 package org.aspectj.internal.tools.ant.taskdefs;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Target;
@@ -29,14 +37,6 @@ import org.aspectj.internal.tools.build.Modules;
 import org.aspectj.internal.tools.build.ProductModule;
 import org.aspectj.internal.tools.build.Util;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * Implement Builder in Ant.
  */
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java
index 9e29b8138..81aa5f63c 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java
@@ -14,6 +14,8 @@
  
 package org.aspectj.internal.tools.ant.taskdefs;
 
+import java.io.File;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Location;
 import org.apache.tools.ant.Task;
@@ -21,8 +23,6 @@ import org.apache.tools.ant.types.Path;
 import org.aspectj.internal.tools.build.BuildSpec;
 import org.aspectj.internal.tools.build.Builder;
 
-import java.io.File;
-
 /**
  * Ant interface to build a product or module, including any required modules.
  * @see Builder
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java
index d79c9774f..01b818e97 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java
@@ -12,11 +12,24 @@
 
 package org.aspectj.internal.tools.ant.taskdefs;
 
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.taskdefs.*;
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.List;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.MatchingTask;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Reference;
 
 /** 
  * Check that included .java files contain license and copyright strings
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/ConditionalTask.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/ConditionalTask.java
index 8b5184121..4d3d8ad31 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/ConditionalTask.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/ConditionalTask.java
@@ -13,8 +13,13 @@
 
 package org.aspectj.internal.tools.ant.taskdefs;
 
-import org.apache.tools.ant.*;
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
 
 public abstract class ConditionalTask extends Task {
 
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java
index bafe5da2b..624ed44c1 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java
@@ -13,9 +13,16 @@
 
 package org.aspectj.internal.tools.ant.taskdefs;
 
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.taskdefs.*;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintStream;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Mkdir;
 
 public class CopyAndInlineStylesheet extends Task {
 
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java
index 0a019707c..70b18c086 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java
@@ -13,9 +13,18 @@
 
 package org.aspectj.internal.tools.ant.taskdefs;
 
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.taskdefs.*;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.taskdefs.MatchingTask;
 
 /**
  * Task to convert html source files into files with only body content.
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java
index 374f71d79..04e1bb54a 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java
@@ -14,14 +14,14 @@
  
 package org.aspectj.internal.tools.ant.taskdefs;
 
+import java.io.File;
+import java.util.Arrays;
+
 import org.apache.tools.ant.Project;
-import org.aspectj.internal.tools.build.*;
 import org.aspectj.internal.tools.build.BuildSpec;
+import org.aspectj.internal.tools.build.Builder;
 import org.aspectj.internal.tools.build.Util;
 
-import java.io.File;
-import java.util.Arrays;
-
 public class TestBuildModule {
     private static boolean REBUILD = false;
     private static final String SYNTAX = "java {classname} <[product|module]dir>";
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/VersionUptodate.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/VersionUptodate.java
index 61042c54b..ff1d9f4d1 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/VersionUptodate.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/VersionUptodate.java
@@ -12,15 +12,15 @@
 
 package org.aspectj.internal.tools.ant.taskdefs;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
 /** 
  * Check if version source file has the specified build version,
  * and ensure a tag file reflects whether it does or not.
diff --git a/build/src/org/aspectj/internal/tools/build/Builder.java b/build/src/org/aspectj/internal/tools/build/Builder.java
index 7eddfcfdf..14aa22d0f 100644
--- a/build/src/org/aspectj/internal/tools/build/Builder.java
+++ b/build/src/org/aspectj/internal/tools/build/Builder.java
@@ -13,8 +13,6 @@
 
 package org.aspectj.internal.tools.build;
 
-import org.apache.tools.ant.BuildException;
-
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
@@ -23,6 +21,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 
+import org.apache.tools.ant.BuildException;
+
 /**
  * Template class to build (eclipse) modules (and, weakly, products),
  * including any required modules.