resolving unused-imports warnings

diff --git a/runtime/src/org/aspectj/lang/reflect/FieldSignature.java b/runtime/src/org/aspectj/lang/reflect/FieldSignature.java
index 0983509c5ddca5ba19fca5823085143f1ebe6813..d2973543a80f379e223aaee68ecf4bffb4ce0c77 100644 (file)
--- 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 d3b18c710bcb637f9eedaa838e16b12ea6f7288c..d6a4541a43a7697b88cf25cb9da69347891af02a 100644 (file)
--- 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 5a4b5b76511332e54358e763926134f2c692350d..4b6caaf9bdbdeaf8028be40722efba487fdb4f43 100644 (file)
--- 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 7ea1ceff176787bf619001e1906f1bbe85984366..647fb652887946c63d1eb8f1a6cb5c04050346f3 100644 (file)
--- 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 638b7fea9533e0a3bc8813070ea6ef6b682bcaf3..a0ca7dbdb0ab85cacb79206632844ef14b689cf1 100644 (file)
--- 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 1045152d42f93e5e8e1a04020d597c58516ec0c1..ac97bb83a68fd85d527acaf68d759bee8683507a 100644 (file)
--- 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 49b0827f91a89935bd5eaba8f93c2070ca248d71..a81d25831543e54a5ff3d44754e4204c8a17db17 100644 (file)
--- 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 5ab058edd997677a8acd1aac997be5ca907dbcc6..4fbc7d2c8c5ef7885f1ea98f106f80a17c76d643 100644 (file)
--- 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 f7065d673d10764fb9614a49b0294831a0156b0d..f2e7d5b0130d8e4a2ff68d687266ca9e5a10db8d 100644 (file)
--- 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 3097a1abfe105bc9eafd17d000b23f17e2d95a63..66c535a5c13dad2de3aa4ca4c23f402cf7ba3bfa 100644 (file)
--- 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 4318dc9ca652be71c537318ddb49f4b0620c4d63..b2652cc7978acd197ce188dc41b72bb1317d9d3c 100644 (file)
--- 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 ec46bbbaba86205fba85ae0406b046adbbd74b95..d5426eeaaaa3d239b77d63e4bc437d529233124a 100644 (file)
--- 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 6a04283b3b77160161290730e5b5c567005bb178..d69bec6129d431625ced07f5c39335daedf5b1f8 100644 (file)
--- 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 bc46f992c80be6c6d05a3c6ba3bca38ca9fba2fc..a63ae9d6b7305f8a59dc17bac18fad7ea99156f2 100644 (file)
--- 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 d65a4fd44466d9e0ae999cf83e5f887bc12c6ad4..39bec81d4d68e68a95085c7169ad8d68408ef14f 100644 (file)
--- 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 64b7d04db52f9548e113b65522946f0be64b8484..15198d957c35311661a8087e3df2d49e4b207817 100644 (file)
--- 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 e4d6f145be85eb7704e7309bd8ef37c695ed8794..1582b1324fab5817905f26da7dfbfcd8182acbec 100644 (file)
--- 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 98883686967d59a549112b1c3aecba8464794bef..c7f4c06a0e4a2f1ed1cce0eaeb8f3ce252eb9559 100644 (file)
--- 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 1785b76a69f8abd47b4a1142d43bb6228457c78c..d17522884d3dc3c85a4c1799d108ba4ea9e93b82 100644 (file)
--- 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 7f7acfe797de5ba8fe9ce80afb0b16a5ddc677df..012e4a5716ec9fc15e6b0c49be3c56e425d3a4a6 100644 (file)
--- 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 b58362e4cae2d7ec04137f05f60de704408c73dd..d49818dedcbaae47bac0656d0d936bd9af7f2ef4 100644 (file)
--- 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;