resolving unused-imports warnings

21 files changed, 49 insertions, 84 deletions

diff --git a/runtime/src/org/aspectj/lang/reflect/FieldSignature.java b/runtime/src/org/aspectj/lang/reflect/FieldSignature.java
index 0983509c5..d2973543a 100644
--- a/runtime/src/org/aspectj/lang/reflect/FieldSignature.java
+++ b/runtime/src/org/aspectj/lang/reflect/FieldSignature.java
@@ -14,8 +14,6 @@
 
 package org.aspectj.lang.reflect;
 
-import org.aspectj.lang.Signature;
-
 public interface FieldSignature extends MemberSignature {
     public Class getFieldType();
 }
diff --git a/runtime/src/org/aspectj/runtime/internal/CFlowStack.java b/runtime/src/org/aspectj/runtime/internal/CFlowStack.java
index d3b18c710..d6a4541a4 100644
--- a/runtime/src/org/aspectj/runtime/internal/CFlowStack.java
+++ b/runtime/src/org/aspectj/runtime/internal/CFlowStack.java
@@ -19,7 +19,6 @@ import org.aspectj.runtime.CFlow;
 
 import java.util.Stack;
 import java.util.Hashtable;
-import java.util.Vector;
 import java.util.Enumeration;
 
 public class CFlowStack {
diff --git a/runtime/src/org/aspectj/runtime/internal/PerObjectMap.java b/runtime/src/org/aspectj/runtime/internal/PerObjectMap.java
index 5a4b5b765..4b6caaf9b 100644
--- a/runtime/src/org/aspectj/runtime/internal/PerObjectMap.java
+++ b/runtime/src/org/aspectj/runtime/internal/PerObjectMap.java
@@ -14,11 +14,7 @@
 
 package org.aspectj.runtime.internal;
 
-import org.aspectj.runtime.CFlow;
-
-
-// REQUIRES JAVA 2!!!!!!!!!!!!!!!!
-import java.util.WeakHashMap;
+import java.util.WeakHashMap;  // XXX REQUIRES JAVA 2!!!!!!!!!!!!!!!!
 
 public class PerObjectMap {
     private WeakHashMap map = new WeakHashMap();
diff --git a/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
index 7ea1ceff1..647fb6528 100644
--- a/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
@@ -14,10 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
-
-import java.lang.reflect.Modifier;
+import org.aspectj.lang.reflect.AdviceSignature;
 
 class AdviceSignatureImpl extends CodeSignatureImpl implements AdviceSignature {
     Class returnType;
diff --git a/runtime/src/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java
index 638b7fea9..a0ca7dbdb 100644
--- a/runtime/src/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java
@@ -14,8 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
+import org.aspectj.lang.reflect.CatchClauseSignature;
 
 class CatchClauseSignatureImpl extends SignatureImpl implements CatchClauseSignature {
     Class parameterType;
diff --git a/runtime/src/org/aspectj/runtime/reflect/CodeSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/CodeSignatureImpl.java
index 1045152d4..ac97bb83a 100644
--- a/runtime/src/org/aspectj/runtime/reflect/CodeSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/CodeSignatureImpl.java
@@ -14,8 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
+import org.aspectj.lang.reflect.CodeSignature;
 
 abstract class CodeSignatureImpl extends MemberSignatureImpl implements CodeSignature {
     Class[] parameterTypes;
diff --git a/runtime/src/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java
index 49b0827f9..a81d25831 100644
--- a/runtime/src/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java
@@ -14,8 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.reflect.*;
-import org.aspectj.lang.*;
+import org.aspectj.lang.reflect.ConstructorSignature;
 
 class ConstructorSignatureImpl extends CodeSignatureImpl implements ConstructorSignature {
     ConstructorSignatureImpl(int modifiers, Class declaringType, 
diff --git a/runtime/src/org/aspectj/runtime/reflect/FieldSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/FieldSignatureImpl.java
index 5ab058edd..4fbc7d2c8 100644
--- a/runtime/src/org/aspectj/runtime/reflect/FieldSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/FieldSignatureImpl.java
@@ -14,10 +14,7 @@
 
 package org.aspectj.runtime.reflect;
  
-import org.aspectj.lang.reflect.*;
-import org.aspectj.lang.*;
-
-import java.lang.reflect.Modifier;
+import org.aspectj.lang.reflect.FieldSignature;
 
 public class FieldSignatureImpl extends MemberSignatureImpl implements FieldSignature {
     Class fieldType;
diff --git a/runtime/src/org/aspectj/runtime/reflect/InitializerSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/InitializerSignatureImpl.java
index f7065d673..f2e7d5b01 100644
--- a/runtime/src/org/aspectj/runtime/reflect/InitializerSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/InitializerSignatureImpl.java
@@ -14,8 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.reflect.*;
-import org.aspectj.lang.*;
+import org.aspectj.lang.reflect.InitializerSignature;
 
 import java.lang.reflect.Modifier;
 
diff --git a/runtime/src/org/aspectj/runtime/reflect/MemberSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/MemberSignatureImpl.java
index 3097a1abf..66c535a5c 100644
--- a/runtime/src/org/aspectj/runtime/reflect/MemberSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/MemberSignatureImpl.java
@@ -14,8 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
+import org.aspectj.lang.reflect.MemberSignature;
 
 abstract class MemberSignatureImpl extends SignatureImpl implements MemberSignature {
     MemberSignatureImpl(int modifiers, String name, Class declaringType) {   
diff --git a/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java
index 4318dc9ca..b2652cc79 100644
--- a/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java
@@ -14,9 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
-import java.lang.reflect.Modifier;
+import org.aspectj.lang.reflect.MethodSignature;
 
 class MethodSignatureImpl extends CodeSignatureImpl implements MethodSignature {
     Class returnType;
diff --git a/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java
index ec46bbbab..d5426eeaa 100644
--- a/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java
@@ -14,10 +14,10 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
+import org.aspectj.lang.Signature;
 
-import java.util.*;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
 
 abstract class SignatureImpl implements Signature {
     int modifiers = -1;
diff --git a/runtime/src/org/aspectj/runtime/reflect/SourceLocationImpl.java b/runtime/src/org/aspectj/runtime/reflect/SourceLocationImpl.java
index 6a04283b3..d69bec612 100644
--- a/runtime/src/org/aspectj/runtime/reflect/SourceLocationImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/SourceLocationImpl.java
@@ -14,8 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
+import org.aspectj.lang.reflect.SourceLocation;
 
 class SourceLocationImpl implements SourceLocation {
     Class withinType;
diff --git a/runtime/src/org/aspectj/runtime/reflect/StringMaker.java b/runtime/src/org/aspectj/runtime/reflect/StringMaker.java
index bc46f992c..a63ae9d6b 100644
--- a/runtime/src/org/aspectj/runtime/reflect/StringMaker.java
+++ b/runtime/src/org/aspectj/runtime/reflect/StringMaker.java
@@ -14,9 +14,6 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
-
 import java.lang.reflect.Modifier;
 
 class StringMaker {
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc10.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc10.java
index d65a4fd44..39bec81d4 100644
--- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc10.java
+++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc10.java
@@ -12,31 +12,30 @@
 
 package org.aspectj.tools.ant.taskdefs;
 
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.types.*;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Location;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.MatchingTask;
+import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Reference;
 import org.aspectj.bridge.AbortException;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.IMessageHolder;
 import org.aspectj.bridge.MessageHandler;
-import org.aspectj.bridge.MessageUtil;
 import org.aspectj.tools.ajc.Main;
 import org.aspectj.tools.ajc.Main.MessagePrinter;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.taskdefs.compilers.*;
-import java.io.*;
+
+import java.io.File;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.Vector;
-import java.util.Iterator;
-import java.util.ArrayList;
 import java.util.StringTokenizer;
-import java.lang.reflect.*;
-import java.net.*;
+import java.util.Vector;
 
 /**
  * Main taskdef class for the AspectJ 1.0 compiler, <code>ajc</code>.
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java
index 64b7d04db..15198d957 100644
--- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java
+++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java
@@ -14,13 +14,11 @@
 
 package org.aspectj.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter;
 
 import java.io.File;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc2.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc2.java
index e4d6f145b..1582b1324 100644
--- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc2.java
+++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc2.java
@@ -16,13 +16,11 @@ import org.apache.tools.ant.*;
 import org.apache.tools.ant.types.*;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.taskdefs.compilers.*;
 import java.io.*;
 import java.util.List;
 import java.util.Iterator;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
-import java.lang.reflect.*;
 
 /**
  * Ant task for the AspectJ compiler -- AJC.
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
index 988836869..c7f4c06a0 100644
--- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
+++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
@@ -14,22 +14,13 @@
 
 package org.aspectj.tools.ant.taskdefs;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-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.Location;
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.MatchingTask;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
-import org.aspectj.bridge.CountingMessageHandler;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.IMessageHolder;
@@ -38,6 +29,15 @@ import org.aspectj.tools.ajc.Main;
 import org.aspectj.tools.ajc.Main.MessagePrinter;
 import org.aspectj.util.LangUtil;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
 
 /**
  * This runs the AspectJ 1.1 compiler.
@@ -243,15 +243,14 @@ public class AjcTask extends MatchingTask {
     }
 
 	/** 
-	 * -Xlint:file={lint.properties} - enable or disable specific forms 
+	 * -Xlintfile {lint.properties} - enable or disable specific forms 
 	 * of -Xlint messages based on a lint properties file
 	 *  (default is 
 	 * <code>org/aspectj/weaver/XLintDefault.properties</code>)
 	 * @param xlintFile the File with lint properties
 	 */
     public void setXlintfile(File xlintFile) { 
-        String flag = "-Xlintfile:" + xlintFile.getAbsolutePath();
-        addFlag(flag, true);
+        addFlagged("-Xlintfile", xlintFile.getAbsolutePath());
     }
 
     public void setPreserveAllLocals(boolean preserveAllLocals) {  
@@ -549,7 +548,7 @@ public class AjcTask extends MatchingTask {
         try {
         	if (0 < ignored.size()) {
 				for (Iterator iter = ignored.iterator(); iter.hasNext();) {
-					log("ignored: " + iter.next(), project.MSG_INFO);					
+					log("ignored: " + iter.next(), Project.MSG_INFO);					
 				}
         	}
             Main main = new Main();
@@ -557,7 +556,7 @@ public class AjcTask extends MatchingTask {
             addListArgs();
             String[] args = cmd.getArguments();
 	        if (verbose) {
-	        	log("ajc " + Arrays.asList(args), project.MSG_VERBOSE);
+	        	log("ajc " + Arrays.asList(args), Project.MSG_VERBOSE);
 	        }
             main.runMain(args, false);
             
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java
index 1785b76a6..d17522884 100644
--- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java
+++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java
@@ -12,19 +12,19 @@
 
 package org.aspectj.tools.ant.taskdefs.compilers;
 
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.taskdefs.compilers.*;
-import java.io.*;
-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.taskdefs.Javac;
+import org.apache.tools.ant.taskdefs.LogOutputStream;
+import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter;
+import org.apache.tools.ant.types.Commandline;
+
+import java.io.File;
+import java.io.PrintStream;
 import java.util.ArrayList;
-import java.lang.reflect.*;
-
-//XXX
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Ajc uses this as the CompilerAdapter.
diff --git a/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java b/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
index 7f7acfe79..012e4a571 100644
--- a/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
+++ b/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
@@ -13,14 +13,10 @@
 
 package org.aspectj.tools.ant.taskdefs;
 
-import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.Ant;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.selectors.FilenameSelector;
 import org.aspectj.bridge.IMessage;
-import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.IMessageHolder;
 import org.aspectj.bridge.MessageHandler;
 import org.aspectj.bridge.MessageUtil;
diff --git a/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjdocTest.java b/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjdocTest.java
index b58362e4c..d49818ded 100644
--- a/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjdocTest.java
+++ b/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjdocTest.java
@@ -14,7 +14,6 @@
 package org.aspectj.tools.ant.taskdefs;
 
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Path;
 
 import java.io.File;