From 1d1f2da180d0e6d8c4e1d6c0b73e66babe8cb27c Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Fri, 18 Apr 2003 23:40:30 +0000 Subject: [PATCH] Import cleanup git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274483 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/taskdefs/Classloader.java | 16 ---------------- .../org/apache/tools/ant/taskdefs/Concat.java | 4 ---- .../org/apache/tools/ant/taskdefs/Delete.java | 2 -- .../apache/tools/ant/taskdefs/ImportTask.java | 1 - src/main/org/apache/tools/ant/taskdefs/Jar.java | 1 - .../org/apache/tools/ant/taskdefs/Property.java | 1 - src/main/org/apache/tools/ant/taskdefs/Rmic.java | 1 - .../apache/tools/ant/taskdefs/XSLTProcess.java | 1 - .../apache/tools/ant/taskdefs/XmlProperty.java | 3 --- .../tools/ant/taskdefs/optional/ANTLR.java | 1 - .../apache/tools/ant/taskdefs/optional/Cab.java | 1 - .../taskdefs/optional/ccm/CCMReconfigure.java | 1 - .../optional/depend/JarFileIterator.java | 1 - .../ant/taskdefs/optional/dotnet/CSharp.java | 7 ------- .../taskdefs/optional/dotnet/DotnetCompile.java | 3 --- .../ant/taskdefs/optional/dotnet/Ilasm.java | 2 -- .../optional/ejb/GenericDeploymentTool.java | 1 - .../optional/ejb/WebsphereDeploymentTool.java | 1 - .../taskdefs/optional/jdepend/JDependTask.java | 1 - .../tools/ant/taskdefs/optional/jsp/JspC.java | 1 - .../taskdefs/optional/jsp/compilers/JasperC.java | 1 - .../ant/taskdefs/optional/junit/JUnitTask.java | 1 - .../taskdefs/optional/junit/JUnitTestRunner.java | 1 - .../optional/perforce/P4HandlerAdapter.java | 1 - .../ant/taskdefs/optional/sitraka/CovMerge.java | 1 - .../ant/taskdefs/optional/sitraka/Coverage.java | 1 - .../ant/taskdefs/optional/sos/SOSCheckin.java | 1 - .../ant/taskdefs/optional/sos/SOSCheckout.java | 1 - .../tools/ant/taskdefs/optional/sos/SOSGet.java | 1 - .../tools/ant/taskdefs/optional/ssh/SSHBase.java | 6 ------ .../tools/ant/taskdefs/optional/ssh/SSHExec.java | 2 -- .../ant/taskdefs/optional/ssh/SSHUserInfo.java | 1 - .../tools/ant/taskdefs/optional/ssh/Scp.java | 1 - .../optional/starteam/StarTeamCheckin.java | 5 ----- .../optional/starteam/StarTeamCheckout.java | 2 -- .../optional/starteam/StarTeamLabel.java | 1 - .../taskdefs/optional/starteam/StarTeamList.java | 1 - .../optional/starteam/TreeBasedTask.java | 3 --- .../optional/unix/AbstractAccessTask.java | 2 -- .../ant/taskdefs/optional/unix/Symlink.java | 3 --- .../org/apache/tools/ant/types/Description.java | 2 -- .../org/apache/tools/ant/types/XMLCatalog.java | 1 - .../org/apache/tools/ant/types/ZipScanner.java | 1 - .../tools/ant/types/optional/image/Draw.java | 2 -- .../ant/types/optional/image/ImageOperation.java | 2 -- .../tools/ant/types/optional/image/Rotate.java | 2 -- .../tools/ant/types/optional/image/Scale.java | 1 - .../types/optional/image/TransformOperation.java | 1 - .../tools/ant/types/resolver/ApacheCatalog.java | 1 - .../types/resolver/ApacheCatalogResolver.java | 1 - .../types/selectors/ContainsRegexpSelector.java | 1 - .../ant/types/selectors/DependSelector.java | 5 ----- .../apache/tools/ant/util/SourceFileScanner.java | 2 -- .../apache/tools/ant/util/WeakishReference.java | 1 - 54 files changed, 109 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Classloader.java b/src/main/org/apache/tools/ant/taskdefs/Classloader.java index 1f8735634..7000ed6df 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Classloader.java +++ b/src/main/org/apache/tools/ant/taskdefs/Classloader.java @@ -59,22 +59,6 @@ import org.apache.tools.ant.types.*; import java.io.*; import java.util.*; -import org.xml.sax.Locator; -import org.xml.sax.InputSource; -//import org.xml.sax.HandlerBase; -import org.xml.sax.SAXParseException; -import org.xml.sax.XMLReader; -import org.xml.sax.SAXException; -import org.xml.sax.DocumentHandler; -import org.xml.sax.Attributes; -import org.xml.sax.AttributeList; -import org.xml.sax.helpers.XMLReaderAdapter; -import org.xml.sax.helpers.DefaultHandler; -import org.xml.sax.helpers.AttributeListImpl; - -import javax.xml.parsers.SAXParserFactory; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.ParserConfigurationException; /** * EXPERIMENTAL diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java index 8854dadb2..23dc7685f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Concat.java +++ b/src/main/org/apache/tools/ant/taskdefs/Concat.java @@ -60,9 +60,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.FileReader; -import java.io.FileWriter; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -75,7 +73,6 @@ import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; -import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.Task; import org.apache.tools.ant.filters.util.ChainReaderHelper; import org.apache.tools.ant.types.FileList; @@ -83,7 +80,6 @@ import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FilterChain; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.util.StringUtils; // 1.1 /** * This class contains the 'concat' task, used to concatenate a series diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java index b51a3b326..9200043d4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Delete.java +++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java @@ -68,7 +68,6 @@ import org.apache.tools.ant.types.selectors.DateSelector; import org.apache.tools.ant.types.selectors.DependSelector; import org.apache.tools.ant.types.selectors.DepthSelector; import org.apache.tools.ant.types.selectors.ExtendSelector; -import org.apache.tools.ant.types.selectors.FileSelector; import org.apache.tools.ant.types.selectors.FilenameSelector; import org.apache.tools.ant.types.selectors.MajoritySelector; import org.apache.tools.ant.types.selectors.NoneSelector; @@ -76,7 +75,6 @@ import org.apache.tools.ant.types.selectors.NotSelector; import org.apache.tools.ant.types.selectors.OrSelector; import org.apache.tools.ant.types.selectors.PresentSelector; import org.apache.tools.ant.types.selectors.SelectSelector; -import org.apache.tools.ant.types.selectors.SelectorContainer; import org.apache.tools.ant.types.selectors.SizeSelector; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java index bb22bdb93..be1f7eb3b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.taskdefs; import org.apache.tools.ant.*; -import org.apache.tools.ant.helper.ProjectHelper2; import java.io.File; import java.io.IOException; diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java index b740409b3..1cd9aeb91 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Jar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java @@ -74,7 +74,6 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ZipFileSet; import org.apache.tools.zip.ZipOutputStream; diff --git a/src/main/org/apache/tools/ant/taskdefs/Property.java b/src/main/org/apache/tools/ant/taskdefs/Property.java index 9d9dade2d..d60532a02 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Property.java +++ b/src/main/org/apache/tools/ant/taskdefs/Property.java @@ -61,7 +61,6 @@ import java.io.InputStream; import java.util.Enumeration; import java.util.Properties; import java.util.Vector; -import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectHelper; diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java index 1a142961e..12fe9b2a8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java @@ -58,7 +58,6 @@ import java.io.File; import java.io.IOException; import java.rmi.Remote; import java.util.Vector; -import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java index 23e3d106a..43ec83ce9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java +++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java @@ -67,7 +67,6 @@ import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.XMLCatalog; import org.apache.tools.ant.util.FileUtils; -import javax.xml.transform.URIResolver; /** * Processes a set of XML documents via XSLT. This is diff --git a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java index b1c498dcb..e34fbd389 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java +++ b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java @@ -59,14 +59,11 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.Hashtable; -import java.util.Enumeration; -import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.util.FileUtils; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java index a25e47107..220ed293e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -59,7 +59,6 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.net.URL; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java index dd564a408..15e076989 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -70,7 +70,6 @@ import org.apache.tools.ant.taskdefs.LogOutputStream; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.taskdefs.StreamPumper; import org.apache.tools.ant.taskdefs.condition.Os; -import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.util.FileUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java index 49dd66521..df29fc0a1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java @@ -56,7 +56,6 @@ package org.apache.tools.ant.taskdefs.optional.ccm; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Commandline; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java index 3043f691a..e9836894e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java @@ -53,7 +53,6 @@ */ package org.apache.tools.ant.taskdefs.optional.depend; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.zip.ZipEntry; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java index a3ee25fe1..2c50b6578 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java @@ -69,13 +69,6 @@ package org.apache.tools.ant.taskdefs.optional.dotnet; // ==================================================================== import java.io.File; -import java.util.Vector; -import java.util.Enumeration; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Path; // ==================================================================== diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java index a805dad46..ee4001830 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java @@ -71,10 +71,7 @@ import java.util.Enumeration; import java.util.Hashtable; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.EnumeratedAttribute; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java index 79dbf0109..b0c92ab9f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java @@ -64,11 +64,9 @@ import java.io.File; import java.util.Vector; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.taskdefs.MatchingTask; /** * Assembles .NET Intermediate Language files. The task will only work diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java index 37866d287..ea5c5c674 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java @@ -67,7 +67,6 @@ import java.util.jar.JarOutputStream; import java.util.jar.Manifest; import java.util.zip.ZipEntry; import javax.xml.parsers.SAXParser; -import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Location; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java index 734c515ff..7f567aa11 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java @@ -63,7 +63,6 @@ import java.util.Iterator; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.JarOutputStream; -import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Java; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index 0c2612ce0..85fd0ae1a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java @@ -62,7 +62,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.Vector; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.PathTokenizer; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.Execute; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index 784c88f1b..0aac86e37 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -58,7 +58,6 @@ import java.io.File; import java.util.Date; import java.util.Enumeration; import java.util.Vector; -import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java index 4cfb10748..822206e14 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java @@ -60,7 +60,6 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.optional.jsp.JspC; import org.apache.tools.ant.taskdefs.optional.jsp.JspMangler; -import org.apache.tools.ant.taskdefs.optional.jsp.JspNameMangler; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index 91859e86a..3bbee5c18 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -58,7 +58,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.net.URL; import java.util.Enumeration; import java.util.Hashtable; import java.util.Properties; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index d82b726d5..3fe11dfc4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java @@ -59,7 +59,6 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.io.OutputStream; import java.io.PrintStream; import java.io.PrintWriter; import java.io.StringReader; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java index 267774012..44ae44e4e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java @@ -59,7 +59,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; -import java.io.SequenceInputStream; import org.apache.tools.ant.BuildException; public abstract class P4HandlerAdapter implements P4Handler { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java index 57e94b539..7d6d50a44 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java @@ -58,7 +58,6 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import java.util.Random; import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java index d89ad312d..93ce61781 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java @@ -60,7 +60,6 @@ import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; import java.io.StringWriter; -import java.util.Random; import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.java b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.java index 234e50fc4..618991cd4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.java @@ -53,7 +53,6 @@ */ package org.apache.tools.ant.taskdefs.optional.sos; -import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Commandline; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.java index 285188111..f90882689 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.java @@ -53,7 +53,6 @@ */ package org.apache.tools.ant.taskdefs.optional.sos; -import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Commandline; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.java b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.java index 662a22dcc..f20582952 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.java @@ -53,7 +53,6 @@ */ package org.apache.tools.ant.taskdefs.optional.sos; -import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Commandline; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java index 62a26697a..5e8f43fd1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java @@ -57,16 +57,10 @@ package org.apache.tools.ant.taskdefs.optional.ssh; import com.jcraft.jsch.*; import java.io.*; -import java.util.List; -import java.util.LinkedList; -import java.util.Iterator; -import java.util.ArrayList; import org.apache.tools.ant.Task; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.FileSet; /** * Base class for Ant tasks using jsch. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java index fd2e8f246..bd03b9db3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java @@ -62,10 +62,8 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.io.OutputStream; import java.io.StringReader; -import com.jcraft.jsch.Channel; import com.jcraft.jsch.ChannelExec; import com.jcraft.jsch.Session; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java index e3833f2bd..0bb517518 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.taskdefs.optional.ssh; import com.jcraft.jsch.UserInfo; -import org.apache.tools.ant.Project; /** * @author rhanderson diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java index 463e519c0..cea8dc691 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java @@ -62,7 +62,6 @@ import java.util.LinkedList; import java.util.Iterator; import java.util.ArrayList; -import org.apache.tools.ant.Task; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java index c0fc430bd..5db02a785 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java @@ -53,19 +53,14 @@ */ package org.apache.tools.ant.taskdefs.optional.starteam; -import com.starbase.starteam.File; import com.starbase.starteam.Folder; import com.starbase.starteam.Item; import com.starbase.starteam.Status; -import com.starbase.starteam.TypeNames; import com.starbase.starteam.View; import com.starbase.starteam.ViewConfiguration; -import java.io.FileInputStream; import java.io.IOException; import java.util.Enumeration; -import java.util.Hashtable; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; /** * Checks files into a StarTeam project. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java index d14a41cf0..74793fd29 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java @@ -53,11 +53,9 @@ */ package org.apache.tools.ant.taskdefs.optional.starteam; -import com.starbase.starteam.File; import com.starbase.starteam.Folder; import com.starbase.starteam.Item; import com.starbase.starteam.Status; -import com.starbase.starteam.TypeNames; import com.starbase.starteam.View; import com.starbase.starteam.ViewConfiguration; import java.io.IOException; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java index c2643dc67..0875a732f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.taskdefs.optional.starteam; import com.starbase.starteam.Label; import com.starbase.starteam.View; -import com.starbase.starteam.ViewConfiguration; import com.starbase.util.OLEDate; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java index ea5bac60a..d5ad7aadd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java @@ -62,7 +62,6 @@ import com.starbase.starteam.ViewConfiguration; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Enumeration; -import java.util.Hashtable; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java index 4535ce423..bd003dbe7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java @@ -54,17 +54,14 @@ package org.apache.tools.ant.taskdefs.optional.starteam; import com.starbase.starteam.Folder; -import com.starbase.starteam.Item; import com.starbase.starteam.Label; import com.starbase.starteam.StarTeamFinder; import com.starbase.starteam.View; -import java.util.Enumeration; import java.util.Hashtable; import java.util.StringTokenizer; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; -import org.apache.tools.ant.ProjectComponent; /** * FileBasedTask.java diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java index 0f79b25db..f62deaacc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java @@ -68,8 +68,6 @@ package org.apache.tools.ant.taskdefs.optional.unix; import java.io.File; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.Execute; -import org.apache.tools.ant.taskdefs.ExecuteOn; import org.apache.tools.ant.taskdefs.condition.Os; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.FileSet; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java index ff258c3dd..6891631cd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java @@ -66,9 +66,7 @@ package org.apache.tools.ant.taskdefs.optional.unix; import java.io.File; -import java.io.FileWriter; import java.io.IOException; -import java.io.StringWriter; import java.io.OutputStream; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -91,7 +89,6 @@ import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.taskdefs.Delete; import org.apache.tools.ant.taskdefs.Execute; /** diff --git a/src/main/org/apache/tools/ant/types/Description.java b/src/main/org/apache/tools/ant/types/Description.java index 2d4273832..cbf5efc0b 100644 --- a/src/main/org/apache/tools/ant/types/Description.java +++ b/src/main/org/apache/tools/ant/types/Description.java @@ -57,8 +57,6 @@ package org.apache.tools.ant.types; import org.apache.tools.ant.*; import org.apache.tools.ant.helper.ProjectHelperImpl; -import java.util.Hashtable; -import java.util.Enumeration; import java.util.Vector; diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java index 9d264acf2..4181eaf8c 100644 --- a/src/main/org/apache/tools/ant/types/XMLCatalog.java +++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java @@ -74,7 +74,6 @@ import javax.xml.transform.URIResolver; import javax.xml.transform.sax.SAXSource; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.JAXPUtils; diff --git a/src/main/org/apache/tools/ant/types/ZipScanner.java b/src/main/org/apache/tools/ant/types/ZipScanner.java index f1487070d..3944dd058 100644 --- a/src/main/org/apache/tools/ant/types/ZipScanner.java +++ b/src/main/org/apache/tools/ant/types/ZipScanner.java @@ -66,7 +66,6 @@ import java.util.zip.ZipException; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; /** * ZipScanner accesses the pattern matching algorithm in DirectoryScanner, diff --git a/src/main/org/apache/tools/ant/types/optional/image/Draw.java b/src/main/org/apache/tools/ant/types/optional/image/Draw.java index e89eda442..1a46ff028 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Draw.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Draw.java @@ -53,9 +53,7 @@ */ package org.apache.tools.ant.types.optional.image; -import javax.media.jai.RenderedOp; import javax.media.jai.PlanarImage; -import javax.media.jai.JAI; import java.awt.*; import java.awt.image.BufferedImage; diff --git a/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java b/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java index ef0e1647f..6b02544cb 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java +++ b/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java @@ -54,8 +54,6 @@ package org.apache.tools.ant.types.optional.image; import org.apache.tools.ant.types.DataType; -import javax.media.jai.RenderedOp; -import javax.media.jai.PlanarImage; import java.util.Vector; /** diff --git a/src/main/org/apache/tools/ant/types/optional/image/Rotate.java b/src/main/org/apache/tools/ant/types/optional/image/Rotate.java index df1478e4f..4a018f068 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Rotate.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Rotate.java @@ -53,8 +53,6 @@ */ package org.apache.tools.ant.types.optional.image; -import org.apache.tools.ant.types.DataType; - import javax.media.jai.PlanarImage; import javax.media.jai.InterpolationNearest; import javax.media.jai.JAI; diff --git a/src/main/org/apache/tools/ant/types/optional/image/Scale.java b/src/main/org/apache/tools/ant/types/optional/image/Scale.java index 777a45012..26219163c 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Scale.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Scale.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.types.optional.image; import javax.media.jai.JAI; import javax.media.jai.PlanarImage; -import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.awt.image.renderable.ParameterBlock; diff --git a/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java b/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java index fd3c67f38..b18edcc86 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java +++ b/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java @@ -52,7 +52,6 @@ * . */ package org.apache.tools.ant.types.optional.image; -import javax.media.jai.RenderedOp; import javax.media.jai.PlanarImage; /** diff --git a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java index c3bc47ae0..56bb09811 100644 --- a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java +++ b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java @@ -57,7 +57,6 @@ package org.apache.tools.ant.types.resolver; import org.apache.xml.resolver.Catalog; import org.apache.xml.resolver.CatalogEntry; -import org.apache.xml.resolver.helpers.Debug; import org.apache.xml.resolver.helpers.PublicId; /** diff --git a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java index 48cdfb088..5a66f3f6c 100644 --- a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java +++ b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java @@ -64,7 +64,6 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.XMLCatalog; import org.apache.tools.ant.types.ResourceLocation; -import org.apache.xml.resolver.Catalog; import org.apache.xml.resolver.CatalogManager; import org.apache.xml.resolver.tools.CatalogResolver; diff --git a/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java b/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java index 54c1db847..9e5a804cf 100644 --- a/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java @@ -61,7 +61,6 @@ import java.io.IOException; import java.io.InputStreamReader; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Parameter; import org.apache.tools.ant.types.RegularExpression; import org.apache.tools.ant.util.regexp.Regexp; diff --git a/src/main/org/apache/tools/ant/types/selectors/DependSelector.java b/src/main/org/apache/tools/ant/types/selectors/DependSelector.java index 264d18aad..fbb5d1d4b 100644 --- a/src/main/org/apache/tools/ant/types/selectors/DependSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/DependSelector.java @@ -55,11 +55,6 @@ package org.apache.tools.ant.types.selectors; import java.io.File; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.condition.Os; -import org.apache.tools.ant.types.Mapper; -import org.apache.tools.ant.util.FileNameMapper; -import org.apache.tools.ant.util.IdentityMapper; /** * Selector that filters files based on whether they are newer than diff --git a/src/main/org/apache/tools/ant/util/SourceFileScanner.java b/src/main/org/apache/tools/ant/util/SourceFileScanner.java index 2032968ff..db6b25226 100644 --- a/src/main/org/apache/tools/ant/util/SourceFileScanner.java +++ b/src/main/org/apache/tools/ant/util/SourceFileScanner.java @@ -56,11 +56,9 @@ package org.apache.tools.ant.util; import java.io.File; import java.util.Vector; -import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.ResourceFactory; import org.apache.tools.ant.types.Resource; -import org.apache.tools.ant.taskdefs.condition.Os; /** * Utility class that collects the functionality of the various diff --git a/src/main/org/apache/tools/ant/util/WeakishReference.java b/src/main/org/apache/tools/ant/util/WeakishReference.java index 6849a6fa8..9863aa8e6 100644 --- a/src/main/org/apache/tools/ant/util/WeakishReference.java +++ b/src/main/org/apache/tools/ant/util/WeakishReference.java @@ -57,7 +57,6 @@ package org.apache.tools.ant.util; import org.apache.tools.ant.BuildException; import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; /**