From a3082d86e2762ac2266026a6f7814712eda2a13f Mon Sep 17 00:00:00 2001 From: wisberg Date: Thu, 13 Feb 2003 06:03:19 +0000 Subject: resolving unused-imports warnings --- .../src/org/aspectj/tools/ant/taskdefs/Ajc10.java | 21 ++++++++-------- .../tools/ant/taskdefs/Ajc11CompilerAdapter.java | 2 -- .../src/org/aspectj/tools/ant/taskdefs/Ajc2.java | 2 -- .../org/aspectj/tools/ant/taskdefs/AjcTask.java | 29 +++++++++++----------- .../aspectj/tools/ant/taskdefs/compilers/Ajc.java | 24 +++++++++--------- 5 files changed, 36 insertions(+), 42 deletions(-) (limited to 'taskdefs/src/org/aspectj') 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, ajc. 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 * org/aspectj/weaver/XLintDefault.properties) * @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. -- cgit v1.2.3