ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/util/regexp JakartaOroMatcher.java JakartaOroRegexp.java JakartaRegexpMatcher.java JakartaRegexpRegexp.java Jdk14RegexpMatcher.java Jdk14RegexpRegexp.java RegexpMatcher.java
Date Thu, 25 Jul 2002 15:21:26 GMT
donaldp     2002/07/25 08:21:26

  Modified:    src/main/org/apache/tools/ant AntClassLoader.java
                        BuildException.java DefaultLogger.java
                        DemuxOutputStream.java Diagnostics.java
                        DirectoryScanner.java IntrospectionHelper.java
                        Main.java PathTokenizer.java Project.java
                        ProjectHelper.java Target.java XmlLogger.java
               src/main/org/apache/tools/ant/filters BaseFilterReader.java
                        BaseParamFilterReader.java ExpandProperties.java
                        HeadFilter.java LineContains.java
                        LineContainsRegExp.java PrefixLines.java
                        ReplaceTokens.java StripLineBreaks.java
                        StripLineComments.java TabsToSpaces.java
                        TailFilter.java
               src/main/org/apache/tools/ant/filters/util
                        ChainReaderHelper.java JavaClassHelper.java
               src/main/org/apache/tools/ant/helper ProjectHelperImpl.java
               src/main/org/apache/tools/ant/input DefaultInputHandler.java
                        PropertyFileInputHandler.java
               src/main/org/apache/tools/ant/listener AnsiColorLogger.java
                        MailLogger.java
               src/main/org/apache/tools/ant/taskdefs Ant.java
                        AntStructure.java Available.java BuildNumber.java
                        CVSPass.java CallTarget.java Checksum.java
                        Chmod.java Concat.java Copy.java Copydir.java
                        Copyfile.java Definer.java Delete.java Deltree.java
                        DependSet.java Dirname.java Ear.java Echo.java
                        Exec.java ExecTask.java Execute.java
                        ExecuteJava.java ExecuteOn.java
                        ExecuteStreamHandler.java Exit.java Expand.java
                        Filter.java FixCRLF.java GUnzip.java GZip.java
                        GenerateKey.java Get.java Input.java JDBCTask.java
                        Jar.java Java.java Javac.java Javadoc.java
                        Jikes.java JikesOutputParser.java KeySubst.java
                        LoadFile.java LoadProperties.java
                        LogOutputStream.java LogStreamHandler.java
                        Manifest.java ManifestTask.java MatchingTask.java
                        Mkdir.java Move.java Parallel.java Patch.java
                        PathConvert.java Property.java
                        PumpStreamHandler.java Recorder.java
                        RecorderEntry.java Rename.java Replace.java
                        Rmic.java SQLExec.java Sequential.java SignJar.java
                        Sleep.java Tar.java TaskOutputStream.java
                        TempFile.java Touch.java Tstamp.java Untar.java
                        UpToDate.java WaitFor.java War.java
                        XSLTProcess.java XmlProperty.java Zip.java
               src/main/org/apache/tools/ant/taskdefs/compilers
                        CompilerAdapterFactory.java
                        DefaultCompilerAdapter.java Javac12.java
                        Javac13.java Jikes.java Jvc.java Kjc.java
               src/main/org/apache/tools/ant/taskdefs/condition And.java
                        ConditionBase.java FilesMatch.java Http.java
                        Or.java Os.java Socket.java
               src/main/org/apache/tools/ant/taskdefs/cvslib CVSEntry.java
                        ChangeLogTask.java CvsTagDiff.java
                        RedirectingStreamHandler.java
               src/main/org/apache/tools/ant/taskdefs/email Message.java
                        PlainMailer.java
               src/main/org/apache/tools/ant/taskdefs/optional ANTLR.java
                        Cab.java EchoProperties.java IContract.java
                        Javah.java Native2Ascii.java NetRexxC.java
                        PropertyFile.java RenameExtensions.java
                        ReplaceRegExp.java Rpm.java Script.java
                        StyleBook.java Test.java TraXLiaison.java
                        XMLValidateTask.java XalanLiaison.java
                        XslpLiaison.java
               src/main/org/apache/tools/ant/taskdefs/optional/ccm
                        CCMCheck.java CCMCreateTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/clearcase
                        ClearCase.java
               src/main/org/apache/tools/ant/taskdefs/optional/depend
                        AntAnalyzer.java ClassFile.java Depend.java
               src/main/org/apache/tools/ant/taskdefs/optional/dotnet
                        Ilasm.java NetCommand.java WsdlToDotnet.java
               src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        BorlandDeploymentTool.java
                        BorlandGenerateClient.java DDCreator.java
                        DDCreatorHelper.java DescriptorHandler.java
                        EJBDeploymentTool.java EjbJar.java Ejbc.java
                        EjbcHelper.java GenericDeploymentTool.java
                        IPlanetDeploymentTool.java IPlanetEjbc.java
                        IPlanetEjbcTask.java InnerClassFilenameFilter.java
                        JonasDeploymentTool.java WLRun.java WLStop.java
                        WeblogicDeploymentTool.java
                        WeblogicTOPLinkDeploymentTool.java
                        WebsphereDeploymentTool.java
               src/main/org/apache/tools/ant/taskdefs/optional/extension
                        ExtensionSet.java JarLibManifestTask.java
                        JarLibResolveTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/i18n
                        Translate.java
               src/main/org/apache/tools/ant/taskdefs/optional/ide
                        VAJAntTool.java VAJAntToolGUI.java
                        VAJBuildInfo.java VAJExport.java VAJImport.java
                        VAJLocalUtil.java VAJRemoteUtil.java
                        VAJToolsServlet.java VAJUtil.java
               src/main/org/apache/tools/ant/taskdefs/optional/j2ee
                        GenericHotDeploymentTool.java
                        JonasHotDeploymentTool.java ServerDeploy.java
               src/main/org/apache/tools/ant/taskdefs/optional/javacc
                        JJTree.java JavaCC.java
               src/main/org/apache/tools/ant/taskdefs/optional/jdepend
                        JDependTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/jlink
                        ClassNameReader.java JlinkTask.java jlink.java
               src/main/org/apache/tools/ant/taskdefs/optional/jsp
                        JspC.java WLJspc.java
               src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers
                        DefaultJspCompilerAdapter.java JasperC.java
               src/main/org/apache/tools/ant/taskdefs/optional/junit
                        AggregateTransformer.java BatchTest.java
                        BriefJUnitResultFormatter.java DOMUtil.java
                        FormatterElement.java JUnitResultFormatter.java
                        JUnitTask.java JUnitTest.java JUnitTestRunner.java
                        JUnitVersionHelper.java
                        PlainJUnitResultFormatter.java
                        SummaryJUnitResultFormatter.java
                        XMLJUnitResultFormatter.java
                        XMLResultAggregator.java Xalan1Executor.java
                        Xalan2Executor.java XalanExecutor.java
               src/main/org/apache/tools/ant/taskdefs/optional/metamata
                        AbstractMetamataTask.java MAudit.java
                        MAuditParser.java MAuditStreamHandler.java
                        MMetrics.java MMetricsStreamHandler.java
                        MParse.java
               src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
                        SetProxy.java TelnetTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/perforce
                        P4Add.java P4Base.java P4HandlerAdapter.java
                        P4Label.java
               src/main/org/apache/tools/ant/taskdefs/optional/pvcs
                        Pvcs.java
               src/main/org/apache/tools/ant/taskdefs/optional/scm
                        AntStarTeamCheckOut.java
               src/main/org/apache/tools/ant/taskdefs/optional/sitraka
                        CovMerge.java CovReport.java Coverage.java
                        ReportFilters.java Triggers.java XMLReport.java
               src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode
                        ClassFile.java MethodInfo.java Utils.java
               src/main/org/apache/tools/ant/taskdefs/optional/sos SOS.java
               src/main/org/apache/tools/ant/taskdefs/optional/sound
                        AntSoundPlayer.java SoundTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/splash
                        SplashScreen.java SplashTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/starteam
                        StarTeamCheckin.java StarTeamCheckout.java
                        StarTeamLabel.java StarTeamList.java
                        StarTeamTask.java TreeBasedTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/vss
                        MSVSS.java MSVSSCHECKIN.java MSVSSCHECKOUT.java
                        MSVSSGET.java MSVSSHISTORY.java
               src/main/org/apache/tools/ant/taskdefs/rmic
                        DefaultRmicAdapter.java KaffeRmic.java SunRmic.java
                        WLRmic.java
               src/main/org/apache/tools/ant/types AbstractFileSet.java
                        AntFilterReader.java Commandline.java
                        CommandlineJava.java Environment.java FileList.java
                        FilterChain.java FilterSet.java
                        FilterSetCollection.java Mapper.java Path.java
                        PatternSet.java Reference.java XMLCatalog.java
                        ZipFileSet.java ZipScanner.java
               src/main/org/apache/tools/ant/types/optional/depend
                        ClassfileSet.java DependScanner.java
               src/main/org/apache/tools/ant/types/selectors
                        BaseSelector.java BaseSelectorContainer.java
                        ContainsSelector.java DateSelector.java
                        DependSelector.java DepthSelector.java
                        ExtendFileSelector.java ExtendSelector.java
                        FileSelector.java FilenameSelector.java
                        NotSelector.java PresentSelector.java
                        SelectSelector.java SelectorContainer.java
                        SelectorUtils.java SizeSelector.java
               src/main/org/apache/tools/ant/util DOMElementWriter.java
                        FileUtils.java JAXPUtils.java JavaEnvUtils.java
                        LoaderUtils.java RegexpPatternMapper.java
                        SourceFileScanner.java StringUtils.java
                        TaskLogger.java
               src/main/org/apache/tools/ant/util/depend
                        DependencyAnalyzer.java
               src/main/org/apache/tools/ant/util/optional
                        NoExitSecurityManager.java
               src/main/org/apache/tools/ant/util/regexp
                        JakartaOroMatcher.java JakartaOroRegexp.java
                        JakartaRegexpMatcher.java JakartaRegexpRegexp.java
                        Jdk14RegexpMatcher.java Jdk14RegexpRegexp.java
                        RegexpMatcher.java
  Log:
  Remove unused imports, remove glob imports, sort imports.
  
  Revision  Changes    Path
  1.56      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/AntClassLoader.java
  
  Index: AntClassLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/AntClassLoader.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- AntClassLoader.java	9 Jul 2002 18:49:49 -0000	1.55
  +++ AntClassLoader.java	25 Jul 2002 15:21:01 -0000	1.56
  @@ -69,7 +69,6 @@
   import java.util.Vector;
   import java.util.zip.ZipEntry;
   import java.util.zip.ZipFile;
  -
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.util.JavaEnvUtils;
   import org.apache.tools.ant.util.LoaderUtils;
  
  
  
  1.17      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/BuildException.java
  
  Index: BuildException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/BuildException.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- BuildException.java	11 Jul 2002 02:00:26 -0000	1.16
  +++ BuildException.java	25 Jul 2002 15:21:01 -0000	1.17
  @@ -53,8 +53,8 @@
    */
   package org.apache.tools.ant;
   
  -import java.io.PrintWriter;
   import java.io.PrintStream;
  +import java.io.PrintWriter;
   
   /**
    * Signals an error condition during a build
  
  
  
  1.41      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/DefaultLogger.java
  
  Index: DefaultLogger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/DefaultLogger.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- DefaultLogger.java	16 Jul 2002 13:06:45 -0000	1.40
  +++ DefaultLogger.java	25 Jul 2002 15:21:01 -0000	1.41
  @@ -58,9 +58,8 @@
   import java.io.IOException;
   import java.io.PrintStream;
   import java.io.StringReader;
  -
  -import org.apache.tools.ant.util.StringUtils;
   import org.apache.tools.ant.util.DateUtils;
  +import org.apache.tools.ant.util.StringUtils;
   
   /**
    * Writes build events to a PrintStream. Currently, it
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/DemuxOutputStream.java
  
  Index: DemuxOutputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/DemuxOutputStream.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DemuxOutputStream.java	9 Apr 2002 15:27:07 -0000	1.9
  +++ DemuxOutputStream.java	25 Jul 2002 15:21:01 -0000	1.10
  @@ -54,9 +54,9 @@
   
   package org.apache.tools.ant;
   
  -import java.io.OutputStream;
   import java.io.ByteArrayOutputStream;
   import java.io.IOException;
  +import java.io.OutputStream;
   import java.util.Hashtable;
   
   /**
  
  
  
  1.4       +4 -4      jakarta-ant/src/main/org/apache/tools/ant/Diagnostics.java
  
  Index: Diagnostics.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Diagnostics.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Diagnostics.java	16 Jul 2002 12:48:22 -0000	1.3
  +++ Diagnostics.java	25 Jul 2002 15:21:01 -0000	1.4
  @@ -55,13 +55,13 @@
   
   import java.io.File;
   import java.io.FilenameFilter;
  -import java.io.PrintStream;
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.PrintStream;
  +import java.lang.reflect.InvocationTargetException;
  +import java.lang.reflect.Method;
   import java.util.Enumeration;
   import java.util.Properties;
  -import java.lang.reflect.Method;
  -import java.lang.reflect.InvocationTargetException;
   
   /**
    * A little diagnostic helper that output some information that may help
  
  
  
  1.28      +1 -3      jakarta-ant/src/main/org/apache/tools/ant/DirectoryScanner.java
  
  Index: DirectoryScanner.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- DirectoryScanner.java	9 Jul 2002 21:05:57 -0000	1.27
  +++ DirectoryScanner.java	25 Jul 2002 15:21:01 -0000	1.28
  @@ -57,10 +57,8 @@
   import java.io.File;
   import java.io.IOException;
   import java.util.Vector;
  -import java.util.StringTokenizer;
  -
  -import org.apache.tools.ant.types.selectors.SelectorScanner;
   import org.apache.tools.ant.types.selectors.FileSelector;
  +import org.apache.tools.ant.types.selectors.SelectorScanner;
   import org.apache.tools.ant.types.selectors.SelectorUtils;
   import org.apache.tools.ant.util.FileUtils;
   
  
  
  
  1.44      +2 -4      jakarta-ant/src/main/org/apache/tools/ant/IntrospectionHelper.java
  
  Index: IntrospectionHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- IntrospectionHelper.java	9 Jul 2002 18:49:49 -0000	1.43
  +++ IntrospectionHelper.java	25 Jul 2002 15:21:01 -0000	1.44
  @@ -54,10 +54,6 @@
   
   package org.apache.tools.ant;
   
  -import org.apache.tools.ant.DynamicConfigurator;
  -import org.apache.tools.ant.types.EnumeratedAttribute;
  -import org.apache.tools.ant.types.Path;
  -
   import java.io.File;
   import java.lang.reflect.Constructor;
   import java.lang.reflect.InvocationTargetException;
  @@ -65,6 +61,8 @@
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Locale;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.types.Path;
   
   /**
    * Helper class that collects the methods a task or nested element
  
  
  
  1.73      +6 -7      jakarta-ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- Main.java	23 Jul 2002 15:13:37 -0000	1.72
  +++ Main.java	25 Jul 2002 15:21:01 -0000	1.73
  @@ -54,19 +54,18 @@
   
   package org.apache.tools.ant;
   
  -import org.apache.tools.ant.input.DefaultInputHandler;
  -import org.apache.tools.ant.input.InputHandler;
  -import org.apache.tools.ant.util.JavaEnvUtils;
  -
   import java.io.File;
   import java.io.FileInputStream;
  -import java.io.PrintStream;
   import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.InputStream;
  -import java.util.Vector;
  -import java.util.Properties;
  +import java.io.PrintStream;
   import java.util.Enumeration;
  +import java.util.Properties;
  +import java.util.Vector;
  +import org.apache.tools.ant.input.DefaultInputHandler;
  +import org.apache.tools.ant.input.InputHandler;
  +import org.apache.tools.ant.util.JavaEnvUtils;
   
   /**
    * Command line entry point into Ant. This class is entered via the
  
  
  
  1.14      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/PathTokenizer.java
  
  Index: PathTokenizer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/PathTokenizer.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- PathTokenizer.java	1 Jun 2002 12:26:37 -0000	1.13
  +++ PathTokenizer.java	25 Jul 2002 15:21:01 -0000	1.14
  @@ -53,11 +53,10 @@
    */
   package org.apache.tools.ant;
   
  -import org.apache.tools.ant.taskdefs.condition.Os;
  -
  +import java.io.File;
   import java.util.NoSuchElementException;
   import java.util.StringTokenizer;
  -import java.io.File;
  +import org.apache.tools.ant.taskdefs.condition.Os;
   
   /**
    * A Path tokenizer takes a path and returns the components that make up
  
  
  
  1.114     +7 -8      jakarta-ant/src/main/org/apache/tools/ant/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Project.java,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- Project.java	23 Jul 2002 06:54:31 -0000	1.113
  +++ Project.java	25 Jul 2002 15:21:01 -0000	1.114
  @@ -55,21 +55,20 @@
   package org.apache.tools.ant;
   
   import java.io.File;
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
  +import java.lang.reflect.Modifier;
  +import java.util.Enumeration;
   import java.util.Hashtable;
  -import java.util.Vector;
   import java.util.Properties;
  -import java.util.Enumeration;
   import java.util.Stack;
  -import java.lang.reflect.Modifier;
  -
  +import java.util.Vector;
  +import org.apache.tools.ant.input.DefaultInputHandler;
  +import org.apache.tools.ant.input.InputHandler;
   import org.apache.tools.ant.types.FilterSet;
   import org.apache.tools.ant.types.FilterSetCollection;
   import org.apache.tools.ant.util.FileUtils;
   import org.apache.tools.ant.util.JavaEnvUtils;
  -import org.apache.tools.ant.input.DefaultInputHandler;
  -import org.apache.tools.ant.input.InputHandler;
   
   /**
    * Central representation of an Ant project. This class defines an
  
  
  
  1.89      +4 -5      jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java
  
  Index: ProjectHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- ProjectHelper.java	1 Jun 2002 12:26:37 -0000	1.88
  +++ ProjectHelper.java	25 Jul 2002 15:21:01 -0000	1.89
  @@ -54,18 +54,17 @@
   
   package org.apache.tools.ant;
   
  +import java.io.BufferedReader;
   import java.io.File;
   import java.io.InputStream;
  -import java.io.BufferedReader;
   import java.io.InputStreamReader;
  -import java.util.Hashtable;
  -import java.util.Vector;
   import java.util.Enumeration;
  +import java.util.Hashtable;
   import java.util.Locale;
  -
  -import org.xml.sax.AttributeList;
  +import java.util.Vector;
   import org.apache.tools.ant.helper.ProjectHelperImpl;
   import org.apache.tools.ant.util.LoaderUtils;
  +import org.xml.sax.AttributeList;
   
   /**
    * Configures a Project (complete with Targets and Tasks) based on
  
  
  
  1.35      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/Target.java
  
  Index: Target.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Target.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Target.java	22 Jul 2002 11:12:16 -0000	1.34
  +++ Target.java	25 Jul 2002 15:21:01 -0000	1.35
  @@ -55,8 +55,8 @@
   package org.apache.tools.ant;
   
   import java.util.Enumeration;
  -import java.util.Vector;
   import java.util.StringTokenizer;
  +import java.util.Vector;
   
   /**
    * Class to implement a target object with required parameters.
  
  
  
  1.31      +7 -8      jakarta-ant/src/main/org/apache/tools/ant/XmlLogger.java
  
  Index: XmlLogger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/XmlLogger.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- XmlLogger.java	17 Apr 2002 05:50:09 -0000	1.30
  +++ XmlLogger.java	25 Jul 2002 15:21:01 -0000	1.31
  @@ -54,14 +54,6 @@
   
   package org.apache.tools.ant;
   
  -import org.apache.tools.ant.util.DOMElementWriter;
  -import org.apache.tools.ant.util.StringUtils;
  -import org.w3c.dom.Document;
  -import org.w3c.dom.Element;
  -import org.w3c.dom.Text;
  -
  -import javax.xml.parsers.DocumentBuilder;
  -import javax.xml.parsers.DocumentBuilderFactory;
   import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.OutputStream;
  @@ -70,6 +62,13 @@
   import java.io.Writer;
   import java.util.Hashtable;
   import java.util.Stack;
  +import javax.xml.parsers.DocumentBuilder;
  +import javax.xml.parsers.DocumentBuilderFactory;
  +import org.apache.tools.ant.util.DOMElementWriter;
  +import org.apache.tools.ant.util.StringUtils;
  +import org.w3c.dom.Document;
  +import org.w3c.dom.Element;
  +import org.w3c.dom.Text;
   
   /**
    * Generates a file in the current directory with
  
  
  
  1.9       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/filters/BaseFilterReader.java
  
  Index: BaseFilterReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/BaseFilterReader.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BaseFilterReader.java	30 Apr 2002 10:32:01 -0000	1.8
  +++ BaseFilterReader.java	25 Jul 2002 15:21:02 -0000	1.9
  @@ -57,7 +57,6 @@
   import java.io.IOException;
   import java.io.Reader;
   import java.io.StringReader;
  -
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.util.FileUtils;
   
  
  
  
  1.6       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java
  
  Index: BaseParamFilterReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BaseParamFilterReader.java	30 Apr 2002 10:32:01 -0000	1.5
  +++ BaseParamFilterReader.java	25 Jul 2002 15:21:02 -0000	1.6
  @@ -54,7 +54,6 @@
   package org.apache.tools.ant.filters;
   
   import java.io.Reader;
  -
   import org.apache.tools.ant.types.Parameter;
   import org.apache.tools.ant.types.Parameterizable;
   
  
  
  
  1.5       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/filters/ExpandProperties.java
  
  Index: ExpandProperties.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/ExpandProperties.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExpandProperties.java	30 Apr 2002 10:32:01 -0000	1.4
  +++ ExpandProperties.java	25 Jul 2002 15:21:02 -0000	1.5
  @@ -55,7 +55,6 @@
   
   import java.io.IOException;
   import java.io.Reader;
  -
   import org.apache.tools.ant.Project;
   
   /**
  
  
  
  1.5       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/filters/HeadFilter.java
  
  Index: HeadFilter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/HeadFilter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HeadFilter.java	30 Apr 2002 10:32:01 -0000	1.4
  +++ HeadFilter.java	25 Jul 2002 15:21:02 -0000	1.5
  @@ -55,7 +55,6 @@
   
   import java.io.IOException;
   import java.io.Reader;
  -
   import org.apache.tools.ant.types.Parameter;
   
   /**
  
  
  
  1.7       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/filters/LineContains.java
  
  Index: LineContains.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/LineContains.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LineContains.java	22 Jun 2002 23:38:31 -0000	1.6
  +++ LineContains.java	25 Jul 2002 15:21:02 -0000	1.7
  @@ -56,7 +56,6 @@
   import java.io.IOException;
   import java.io.Reader;
   import java.util.Vector;
  -
   import org.apache.tools.ant.types.Parameter;
   
   /**
  
  
  
  1.5       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java
  
  Index: LineContainsRegExp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LineContainsRegExp.java	30 Apr 2002 10:32:01 -0000	1.4
  +++ LineContainsRegExp.java	25 Jul 2002 15:21:02 -0000	1.5
  @@ -56,7 +56,6 @@
   import java.io.IOException;
   import java.io.Reader;
   import java.util.Vector;
  -
   import org.apache.tools.ant.types.Parameter;
   import org.apache.tools.ant.types.RegularExpression;
   import org.apache.tools.ant.util.regexp.Regexp;
  
  
  
  1.5       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/filters/PrefixLines.java
  
  Index: PrefixLines.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/PrefixLines.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PrefixLines.java	30 Apr 2002 10:32:01 -0000	1.4
  +++ PrefixLines.java	25 Jul 2002 15:21:02 -0000	1.5
  @@ -55,7 +55,6 @@
   
   import java.io.IOException;
   import java.io.Reader;
  -
   import org.apache.tools.ant.types.Parameter;
   
   /**
  
  
  
  1.6       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/filters/ReplaceTokens.java
  
  Index: ReplaceTokens.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/ReplaceTokens.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ReplaceTokens.java	1 Jun 2002 12:26:37 -0000	1.5
  +++ ReplaceTokens.java	25 Jul 2002 15:21:02 -0000	1.6
  @@ -56,7 +56,6 @@
   import java.io.IOException;
   import java.io.Reader;
   import java.util.Hashtable;
  -
   import org.apache.tools.ant.types.Parameter;
   
   /**
  
  
  
  1.5       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/filters/StripLineBreaks.java
  
  Index: StripLineBreaks.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/StripLineBreaks.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StripLineBreaks.java	30 Apr 2002 10:32:01 -0000	1.4
  +++ StripLineBreaks.java	25 Jul 2002 15:21:02 -0000	1.5
  @@ -55,7 +55,6 @@
   
   import java.io.IOException;
   import java.io.Reader;
  -
   import org.apache.tools.ant.types.Parameter;
   
   /**
  
  
  
  1.5       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/filters/StripLineComments.java
  
  Index: StripLineComments.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/StripLineComments.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StripLineComments.java	30 Apr 2002 10:32:01 -0000	1.4
  +++ StripLineComments.java	25 Jul 2002 15:21:02 -0000	1.5
  @@ -56,7 +56,6 @@
   import java.io.IOException;
   import java.io.Reader;
   import java.util.Vector;
  -
   import org.apache.tools.ant.types.Parameter;
   
   /**
  
  
  
  1.5       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/filters/TabsToSpaces.java
  
  Index: TabsToSpaces.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/TabsToSpaces.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TabsToSpaces.java	30 Apr 2002 10:32:01 -0000	1.4
  +++ TabsToSpaces.java	25 Jul 2002 15:21:02 -0000	1.5
  @@ -55,7 +55,6 @@
   
   import java.io.IOException;
   import java.io.Reader;
  -
   import org.apache.tools.ant.types.Parameter;
   
   /**
  
  
  
  1.5       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/filters/TailFilter.java
  
  Index: TailFilter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/TailFilter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TailFilter.java	30 Apr 2002 10:32:01 -0000	1.4
  +++ TailFilter.java	25 Jul 2002 15:21:02 -0000	1.5
  @@ -55,7 +55,6 @@
   
   import java.io.IOException;
   import java.io.Reader;
  -
   import org.apache.tools.ant.types.Parameter;
   
   /**
  
  
  
  1.6       +7 -8      jakarta-ant/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
  
  Index: ChainReaderHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ChainReaderHelper.java	17 Jul 2002 07:36:51 -0000	1.5
  +++ ChainReaderHelper.java	25 Jul 2002 15:21:03 -0000	1.6
  @@ -53,6 +53,12 @@
    */
   package org.apache.tools.ant.filters.util;
   
  +import java.io.FilterReader;
  +import java.io.IOException;
  +import java.io.Reader;
  +import java.lang.reflect.Constructor;
  +import java.lang.reflect.InvocationTargetException;
  +import java.util.Vector;
   import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  @@ -60,17 +66,10 @@
   import org.apache.tools.ant.filters.ChainableReader;
   import org.apache.tools.ant.types.AntFilterReader;
   import org.apache.tools.ant.types.FilterChain;
  -import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Parameter;
   import org.apache.tools.ant.types.Parameterizable;
  +import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.util.FileUtils;
  -
  -import java.lang.reflect.Constructor;
  -import java.lang.reflect.InvocationTargetException;
  -import java.io.FilterReader;
  -import java.io.Reader;
  -import java.io.IOException;
  -import java.util.Vector;
   
   /**
    * Process a FilterReader chain.
  
  
  
  1.3       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java
  
  Index: JavaClassHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavaClassHelper.java	12 Apr 2002 13:26:50 -0000	1.2
  +++ JavaClassHelper.java	25 Jul 2002 15:21:03 -0000	1.3
  @@ -55,7 +55,6 @@
   
   import java.io.ByteArrayInputStream;
   import java.io.IOException;
  -
   import org.apache.bcel.classfile.ClassParser;
   import org.apache.bcel.classfile.ConstantValue;
   import org.apache.bcel.classfile.Field;
  
  
  
  1.14      +15 -15    jakarta-ant/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
  
  Index: ProjectHelperImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ProjectHelperImpl.java	24 Jul 2002 15:43:28 -0000	1.13
  +++ ProjectHelperImpl.java	25 Jul 2002 15:21:03 -0000	1.14
  @@ -60,26 +60,26 @@
   import java.io.IOException;
   import java.io.UnsupportedEncodingException;
   import java.util.Locale;
  -import org.xml.sax.Locator;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.HandlerBase;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.SAXParseException;
  -import org.xml.sax.DocumentHandler;
  -import org.xml.sax.AttributeList;
  -import org.xml.sax.helpers.XMLReaderAdapter;
  -import org.apache.tools.ant.ProjectHelper;
  -import org.apache.tools.ant.UnknownElement;
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Target;
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.RuntimeConfigurable;
   import org.apache.tools.ant.IntrospectionHelper;
  -import org.apache.tools.ant.TaskContainer;
   import org.apache.tools.ant.Location;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.ProjectHelper;
  +import org.apache.tools.ant.RuntimeConfigurable;
  +import org.apache.tools.ant.Target;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.TaskAdapter;
  +import org.apache.tools.ant.TaskContainer;
  +import org.apache.tools.ant.UnknownElement;
   import org.apache.tools.ant.util.JAXPUtils;
  +import org.xml.sax.AttributeList;
  +import org.xml.sax.DocumentHandler;
  +import org.xml.sax.HandlerBase;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.Locator;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.SAXParseException;
  +import org.xml.sax.helpers.XMLReaderAdapter;
   
   /**
    * Original helper.
  
  
  
  1.2       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/input/DefaultInputHandler.java
  
  Index: DefaultInputHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/input/DefaultInputHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultInputHandler.java	22 Apr 2002 11:55:21 -0000	1.1
  +++ DefaultInputHandler.java	25 Jul 2002 15:21:03 -0000	1.2
  @@ -59,7 +59,6 @@
   import java.io.InputStream;
   import java.io.InputStreamReader;
   import java.util.Enumeration;
  -
   import org.apache.tools.ant.BuildException;
   
   /**
  
  
  
  1.3       +2 -3      jakarta-ant/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java
  
  Index: PropertyFileInputHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PropertyFileInputHandler.java	23 Apr 2002 10:29:42 -0000	1.2
  +++ PropertyFileInputHandler.java	25 Jul 2002 15:21:03 -0000	1.3
  @@ -54,11 +54,10 @@
   
   package org.apache.tools.ant.input;
   
  -import org.apache.tools.ant.BuildException;
  -
   import java.io.FileInputStream;
   import java.io.IOException;
   import java.util.Properties;
  +import org.apache.tools.ant.BuildException;
   
   /**
    * Reads input from a property file, the file name is read from the
  
  
  
  1.4       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java
  
  Index: AnsiColorLogger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AnsiColorLogger.java	9 Apr 2002 14:19:32 -0000	1.3
  +++ AnsiColorLogger.java	25 Jul 2002 15:21:03 -0000	1.4
  @@ -54,11 +54,10 @@
   package org.apache.tools.ant.listener;
   
   import java.io.FileInputStream;
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   import java.io.PrintStream;
   import java.util.Properties;
  -
   import org.apache.tools.ant.DefaultLogger;
   import org.apache.tools.ant.Project;
   
  
  
  
  1.11      +5 -6      jakarta-ant/src/main/org/apache/tools/ant/listener/MailLogger.java
  
  Index: MailLogger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/listener/MailLogger.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MailLogger.java	21 Apr 2002 18:15:13 -0000	1.10
  +++ MailLogger.java	25 Jul 2002 15:21:03 -0000	1.11
  @@ -53,12 +53,6 @@
    */
   package org.apache.tools.ant.listener;
   
  -import org.apache.tools.ant.BuildEvent;
  -import org.apache.tools.ant.DefaultLogger;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.util.StringUtils;
  -import org.apache.tools.mail.MailMessage;
  -
   import java.io.FileInputStream;
   import java.io.IOException;
   import java.io.InputStream;
  @@ -67,6 +61,11 @@
   import java.util.Hashtable;
   import java.util.Properties;
   import java.util.StringTokenizer;
  +import org.apache.tools.ant.BuildEvent;
  +import org.apache.tools.ant.DefaultLogger;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.util.StringUtils;
  +import org.apache.tools.mail.MailMessage;
   
   /**
    *  Buffers log messages from DefaultLogger, and sends an e-mail with the
  
  
  
  1.65      +11 -11    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
  
  Index: Ant.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- Ant.java	23 Jul 2002 08:39:52 -0000	1.64
  +++ Ant.java	25 Jul 2002 15:21:04 -0000	1.65
  @@ -54,22 +54,22 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.ProjectComponent;
  -import org.apache.tools.ant.BuildListener;
  -import org.apache.tools.ant.DefaultLogger;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.ProjectHelper;
  -import org.apache.tools.ant.util.FileUtils;
   import java.io.File;
  -import java.io.PrintStream;
   import java.io.FileOutputStream;
   import java.io.IOException;
  +import java.io.PrintStream;
   import java.lang.reflect.Method;
  -import java.util.Vector;
  -import java.util.Hashtable;
   import java.util.Enumeration;
  +import java.util.Hashtable;
  +import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.BuildListener;
  +import org.apache.tools.ant.DefaultLogger;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.ProjectComponent;
  +import org.apache.tools.ant.ProjectHelper;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.util.FileUtils;
   
   /**
    * Build a sub-project.
  
  
  
  1.29      +11 -13    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
  
  Index: AntStructure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AntStructure.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- AntStructure.java	23 Jul 2002 08:39:52 -0000	1.28
  +++ AntStructure.java	25 Jul 2002 15:21:04 -0000	1.29
  @@ -54,23 +54,21 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.File;
  +import java.io.FileOutputStream;
  +import java.io.FileWriter;
  +import java.io.IOException;
  +import java.io.OutputStreamWriter;
  +import java.io.PrintWriter;
  +import java.io.UnsupportedEncodingException;
  +import java.util.Enumeration;
  +import java.util.Hashtable;
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.IntrospectionHelper;
  -
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.TaskContainer;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  -
  -import java.util.Enumeration;
  -import java.util.Hashtable;
  -import java.util.Vector;
  -import java.io.File;
  -import java.io.PrintWriter;
  -import java.io.OutputStreamWriter;
  -import java.io.FileOutputStream;
  -import java.io.UnsupportedEncodingException;
  -import java.io.FileWriter;
  -import java.io.IOException;
   
   /**
    * Creates a partial DTD for Ant from the currently known tasks.
  
  
  
  1.49      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java
  
  Index: Available.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- Available.java	23 Jul 2002 08:39:52 -0000	1.48
  +++ Available.java	25 Jul 2002 15:21:04 -0000	1.49
  @@ -55,11 +55,10 @@
   package org.apache.tools.ant.taskdefs;
   
   import java.io.File;
  -
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.condition.Condition;
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.Path;
  
  
  
  1.9       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java
  
  Index: BuildNumber.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BuildNumber.java	9 Jul 2002 21:05:58 -0000	1.8
  +++ BuildNumber.java	25 Jul 2002 15:21:04 -0000	1.9
  @@ -58,8 +58,8 @@
   import java.io.FileOutputStream;
   import java.io.IOException;
   import java.util.Properties;
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.util.FileUtils;
   
   /**
  
  
  
  1.17      +7 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
  
  Index: CVSPass.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CVSPass.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- CVSPass.java	9 Jul 2002 21:05:58 -0000	1.16
  +++ CVSPass.java	25 Jul 2002 15:21:04 -0000	1.17
  @@ -54,17 +54,16 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.util.StringUtils;
  -
  -import java.io.File;
   import java.io.BufferedReader;
  +import java.io.File;
   import java.io.FileReader;
  -import java.io.PrintWriter;
   import java.io.FileWriter;
   import java.io.IOException;
  +import java.io.PrintWriter;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.util.StringUtils;
   
   /**
    * Adds an new entry to a CVS password file.
  
  
  
  1.25      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CallTarget.java
  
  Index: CallTarget.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CallTarget.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- CallTarget.java	23 Jul 2002 08:39:52 -0000	1.24
  +++ CallTarget.java	25 Jul 2002 15:21:04 -0000	1.25
  @@ -54,8 +54,8 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Task;
   
   /**
    * Call another target in the same project.
  
  
  
  1.26      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java
  
  Index: Checksum.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- Checksum.java	23 Jul 2002 08:39:52 -0000	1.25
  +++ Checksum.java	25 Jul 2002 15:21:04 -0000	1.26
  @@ -57,8 +57,8 @@
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.FileOutputStream;
  -import java.io.InputStreamReader;
   import java.io.IOException;
  +import java.io.InputStreamReader;
   import java.security.DigestInputStream;
   import java.security.MessageDigest;
   import java.security.NoSuchAlgorithmException;
  
  
  
  1.32      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Chmod.java
  
  Index: Chmod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Chmod.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Chmod.java	23 Jul 2002 08:39:52 -0000	1.31
  +++ Chmod.java	25 Jul 2002 15:21:04 -0000	1.32
  @@ -56,7 +56,6 @@
   
   import java.io.File;
   import java.io.IOException;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.condition.Os;
  
  
  
  1.9       +10 -14    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Concat.java
  
  Index: Concat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Concat.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Concat.java	23 Jul 2002 15:13:36 -0000	1.8
  +++ Concat.java	25 Jul 2002 15:21:04 -0000	1.9
  @@ -53,17 +53,6 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.ProjectHelper;
  -import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.BuildException;
  -
  -import org.apache.tools.ant.types.FileSet;
  -import org.apache.tools.ant.types.FileList;
  -
  -import org.apache.tools.ant.util.StringUtils;
  -
   import java.io.BufferedReader;
   import java.io.File;
   import java.io.FileInputStream;
  @@ -76,9 +65,16 @@
   import java.io.OutputStreamWriter;
   import java.io.PrintWriter;
   import java.io.StringReader;
  -
  -import java.util.Vector; // 1.1
  -import java.util.Enumeration; // 1.1
  +import java.util.Enumeration;
  +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.types.FileList;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.util.StringUtils; // 1.1
   
   /**
    * This class contains the 'concat' task, used to concatenate a series
  
  
  
  1.47      +10 -11    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copy.java
  
  Index: Copy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- Copy.java	23 Jul 2002 08:39:52 -0000	1.46
  +++ Copy.java	25 Jul 2002 15:21:04 -0000	1.47
  @@ -54,26 +54,25 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.Enumeration;
  +import java.util.Hashtable;
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.FileSet;
  -import org.apache.tools.ant.types.Mapper;
   import org.apache.tools.ant.types.FilterChain;
   import org.apache.tools.ant.types.FilterSet;
   import org.apache.tools.ant.types.FilterSetCollection;
  -import org.apache.tools.ant.util.FileUtils;
  +import org.apache.tools.ant.types.Mapper;
   import org.apache.tools.ant.util.FileNameMapper;
  +import org.apache.tools.ant.util.FileUtils;
   import org.apache.tools.ant.util.FlatFileNameMapper;
   import org.apache.tools.ant.util.IdentityMapper;
   import org.apache.tools.ant.util.SourceFileScanner;
  -
  -import java.io.File;
  -import java.io.IOException;
  -import java.util.Vector;
  -import java.util.Hashtable;
  -import java.util.Enumeration;
   
   /**
    * Copies a file or directory to a new file
  
  
  
  1.25      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copydir.java
  
  Index: Copydir.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copydir.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Copydir.java	23 Jul 2002 08:39:52 -0000	1.24
  +++ Copydir.java	25 Jul 2002 15:21:04 -0000	1.25
  @@ -56,8 +56,8 @@
   
   import java.io.File;
   import java.io.IOException;
  -import java.util.Hashtable;
   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;
  
  
  
  1.16      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copyfile.java
  
  Index: Copyfile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copyfile.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Copyfile.java	23 Jul 2002 08:39:52 -0000	1.15
  +++ Copyfile.java	25 Jul 2002 15:21:04 -0000	1.16
  @@ -56,10 +56,9 @@
   
   import java.io.File;
   import java.io.IOException;
  -
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   
   /**
    * Copies a file.
  
  
  
  1.21      +8 -9      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Definer.java
  
  Index: Definer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Definer.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Definer.java	23 Jul 2002 15:13:36 -0000	1.20
  +++ Definer.java	25 Jul 2002 15:21:04 -0000	1.21
  @@ -54,19 +54,18 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.util.Enumeration;
  +import java.util.Properties;
  +import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.AntClassLoader;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
  -
  -import java.util.Properties;
  -import java.util.Enumeration;
  -import java.io.File;
  -import java.io.InputStream;
  -import java.io.FileInputStream;
  -import java.io.IOException;
   
   /**
    * Base class for Taskdef and Typedef - does all the classpath
  
  
  
  1.35      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java
  
  Index: Delete.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Delete.java	23 Jul 2002 08:39:52 -0000	1.34
  +++ Delete.java	25 Jul 2002 15:21:04 -0000	1.35
  @@ -54,13 +54,13 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Project;
  +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.FileSet;
   import org.apache.tools.ant.types.PatternSet;
  -import java.io.File;
  -import java.util.Vector;
   
   /**
    * Deletes a file or directory, or set of files defined by a fileset.
  
  
  
  1.16      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Deltree.java
  
  Index: Deltree.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Deltree.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Deltree.java	23 Jul 2002 08:39:52 -0000	1.15
  +++ Deltree.java	25 Jul 2002 15:21:04 -0000	1.16
  @@ -54,10 +54,10 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.BuildException;
   import java.io.File;
   import java.io.IOException;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Task;
   
   /**
    *
  
  
  
  1.20      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/DependSet.java
  
  Index: DependSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/DependSet.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- DependSet.java	23 Jul 2002 07:54:47 -0000	1.19
  +++ DependSet.java	25 Jul 2002 15:21:04 -0000	1.20
  @@ -55,15 +55,15 @@
   package org.apache.tools.ant.taskdefs;
   
   import java.io.File;
  +import java.util.Date;
   import java.util.Enumeration;
   import java.util.Vector;
  -import java.util.Date;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.condition.Os;
  -import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.FileList;
  +import org.apache.tools.ant.types.FileSet;
   
   /**
    * Examines and removes out of date target files.  If any of the target files
  
  
  
  1.6       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Dirname.java
  
  Index: Dirname.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Dirname.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Dirname.java	23 Jul 2002 08:39:52 -0000	1.5
  +++ Dirname.java	25 Jul 2002 15:21:04 -0000	1.6
  @@ -55,7 +55,6 @@
   package org.apache.tools.ant.taskdefs;
   
   import java.io.File;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Task;
   
  
  
  
  1.18      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ear.java
  
  Index: Ear.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ear.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Ear.java	23 Jul 2002 08:39:52 -0000	1.17
  +++ Ear.java	25 Jul 2002 15:21:04 -0000	1.18
  @@ -53,13 +53,12 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.File;
  +import java.io.IOException;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.ZipFileSet;
   import org.apache.tools.zip.ZipOutputStream;
  -
  -import java.io.File;
  -import java.io.IOException;
   
   /**
    * Creates a EAR archive. Based on WAR task
  
  
  
  1.25      +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java
  
  Index: Echo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Echo.java	23 Jul 2002 08:39:52 -0000	1.24
  +++ Echo.java	25 Jul 2002 15:21:04 -0000	1.25
  @@ -54,14 +54,13 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.BuildException;
  -
  -import org.apache.tools.ant.types.EnumeratedAttribute;
   import java.io.File;
   import java.io.FileWriter;
   import java.io.IOException;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
   /**
    * Writes a message to the Ant logging facilities.
    *
  
  
  
  1.32      +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java
  
  Index: Exec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Exec.java	23 Jul 2002 08:39:52 -0000	1.31
  +++ Exec.java	25 Jul 2002 15:21:04 -0000	1.32
  @@ -54,16 +54,16 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
  +import java.io.BufferedReader;
   import java.io.File;
  -import java.io.PrintWriter;
   import java.io.FileWriter;
  -import java.io.InputStream;
   import java.io.IOException;
  -import java.io.BufferedReader;
  +import java.io.InputStream;
   import java.io.InputStreamReader;
  +import java.io.PrintWriter;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   
   /**
    * Executes a given command if the os platform is appropriate.
  
  
  
  1.42      +8 -9      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
  
  Index: ExecTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- ExecTask.java	23 Jul 2002 08:39:52 -0000	1.41
  +++ ExecTask.java	25 Jul 2002 15:21:04 -0000	1.42
  @@ -54,20 +54,19 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  +import java.io.BufferedReader;
  +import java.io.ByteArrayOutputStream;
  +import java.io.File;
  +import java.io.FileNotFoundException;
  +import java.io.FileOutputStream;
  +import java.io.IOException;
  +import java.io.StringReader;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Environment;
   import org.apache.tools.ant.util.StringUtils;
  -
  -import java.io.File;
  -import java.io.FileOutputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.IOException;
  -import java.io.BufferedReader;
  -import java.io.StringReader;
  -import java.io.FileNotFoundException;
   
   /**
    * Executes a given command if the os platform is appropriate.
  
  
  
  1.47      +8 -10     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
  
  Index: Execute.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- Execute.java	23 Jul 2002 19:33:43 -0000	1.46
  +++ Execute.java	25 Jul 2002 15:21:04 -0000	1.47
  @@ -54,21 +54,19 @@
   
   package org.apache.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.types.Commandline;
  -import org.apache.tools.ant.taskdefs.condition.Os;
  -
  +import java.io.BufferedReader;
  +import java.io.ByteArrayOutputStream;
   import java.io.File;
   import java.io.IOException;
  -
  -import java.io.BufferedReader;
   import java.io.StringReader;
  -import java.io.ByteArrayOutputStream;
   import java.lang.reflect.InvocationTargetException;
   import java.lang.reflect.Method;
   import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.taskdefs.condition.Os;
  +import org.apache.tools.ant.types.Commandline;
   
   /**
    * Runs an external program.
  
  
  
  1.27      +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
  
  Index: ExecuteJava.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ExecuteJava.java	18 Apr 2002 06:54:54 -0000	1.26
  +++ ExecuteJava.java	25 Jul 2002 15:21:04 -0000	1.27
  @@ -55,19 +55,18 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.PrintStream;
  +import java.lang.reflect.InvocationTargetException;
  +import java.lang.reflect.Method;
   import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.util.TimeoutObserver;
   import org.apache.tools.ant.util.Watchdog;
  -
  -import java.lang.reflect.InvocationTargetException;
  -import java.lang.reflect.Method;
  -import java.io.PrintStream;
   
   /**
    *
  
  
  
  1.35      +6 -7      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
  
  Index: ExecuteOn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- ExecuteOn.java	23 Jul 2002 08:39:52 -0000	1.34
  +++ ExecuteOn.java	25 Jul 2002 15:21:04 -0000	1.35
  @@ -54,20 +54,19 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.Hashtable;
  +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.FileSet;
   import org.apache.tools.ant.types.Commandline;
  -import org.apache.tools.ant.types.Mapper;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.types.Mapper;
   import org.apache.tools.ant.util.FileNameMapper;
   import org.apache.tools.ant.util.SourceFileScanner;
  -
  -import java.util.Hashtable;
  -import java.util.Vector;
  -import java.io.File;
  -import java.io.IOException;
   
   /**
    * Executes a given command, supplying a set of files as arguments. 
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java
  
  Index: ExecuteStreamHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExecuteStreamHandler.java	11 Apr 2002 15:59:37 -0000	1.4
  +++ ExecuteStreamHandler.java	25 Jul 2002 15:21:04 -0000	1.5
  @@ -54,8 +54,8 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   import java.io.OutputStream;
   
   /**
  
  
  
  1.20      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exit.java
  
  Index: Exit.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exit.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Exit.java	23 Jul 2002 07:54:47 -0000	1.19
  +++ Exit.java	25 Jul 2002 15:21:04 -0000	1.20
  @@ -54,8 +54,8 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Task;
   
   
   /**
  
  
  
  1.34      +10 -10    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java
  
  Index: Expand.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Expand.java	23 Jul 2002 08:39:52 -0000	1.33
  +++ Expand.java	25 Jul 2002 15:21:04 -0000	1.34
  @@ -54,23 +54,23 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -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.types.FileSet;
  -import org.apache.tools.ant.types.PatternSet;
  -import org.apache.tools.ant.util.FileUtils;
   import java.io.File;
   import java.io.FileInputStream;
  -import java.io.FileOutputStream;
   import java.io.FileNotFoundException;
  -import java.io.InputStream;
  +import java.io.FileOutputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   import java.util.Date;
   import java.util.Vector;
  -import java.util.zip.ZipInputStream;
   import java.util.zip.ZipEntry;
  +import java.util.zip.ZipInputStream;
  +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.types.FileSet;
  +import org.apache.tools.ant.types.PatternSet;
  +import org.apache.tools.ant.util.FileUtils;
   
   /**
    * Unzip a file.
  
  
  
  1.21      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Filter.java
  
  Index: Filter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Filter.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Filter.java	23 Jul 2002 08:39:52 -0000	1.20
  +++ Filter.java	25 Jul 2002 15:21:04 -0000	1.21
  @@ -55,10 +55,9 @@
   package org.apache.tools.ant.taskdefs;
   
   import java.io.File;
  -
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   
   /**
    * Sets a token filter that is used by the file copy tasks
  
  
  
  1.41      +7 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
  
  Index: FixCRLF.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- FixCRLF.java	23 Jul 2002 08:39:52 -0000	1.40
  +++ FixCRLF.java	25 Jul 2002 15:21:04 -0000	1.41
  @@ -54,13 +54,6 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.taskdefs.condition.Os;
  -import org.apache.tools.ant.types.EnumeratedAttribute;
  -import org.apache.tools.ant.util.FileUtils;
  -
   import java.io.BufferedReader;
   import java.io.BufferedWriter;
   import java.io.File;
  @@ -75,6 +68,12 @@
   import java.io.Writer;
   import java.util.Enumeration;
   import java.util.NoSuchElementException;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.taskdefs.condition.Os;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.util.FileUtils;
   
   /**
    * Converts text source files to local OS formatting conventions, as
  
  
  
  1.16      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
  
  Index: GUnzip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GUnzip.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- GUnzip.java	23 Jul 2002 08:39:52 -0000	1.15
  +++ GUnzip.java	25 Jul 2002 15:21:04 -0000	1.16
  @@ -54,12 +54,11 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.BuildException;
  -
   import java.io.FileInputStream;
   import java.io.FileOutputStream;
   import java.io.IOException;
   import java.util.zip.GZIPInputStream;
  +import org.apache.tools.ant.BuildException;
   
   /**
    * Expands a file that has been compressed with the GZIP
  
  
  
  1.22      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GZip.java
  
  Index: GZip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GZip.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- GZip.java	23 Jul 2002 08:39:52 -0000	1.21
  +++ GZip.java	25 Jul 2002 15:21:04 -0000	1.22
  @@ -54,11 +54,10 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.BuildException;
  -
  -import java.io.IOException;
   import java.io.FileOutputStream;
  +import java.io.IOException;
   import java.util.zip.GZIPOutputStream;
  +import org.apache.tools.ant.BuildException;
   
   /**
    * Compresses a file with the GZIP algorithm. Normally used to compress
  
  
  
  1.19      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
  
  Index: GenerateKey.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- GenerateKey.java	23 Jul 2002 07:54:47 -0000	1.18
  +++ GenerateKey.java	25 Jul 2002 15:21:04 -0000	1.19
  @@ -55,11 +55,10 @@
   
   import java.util.Enumeration;
   import java.util.Vector;
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.util.JavaEnvUtils;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.util.JavaEnvUtils;
   
   /**
    * Generates a key in a keystore.
  
  
  
  1.30      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Get.java
  
  Index: Get.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Get.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Get.java	23 Jul 2002 08:39:52 -0000	1.29
  +++ Get.java	25 Jul 2002 15:21:04 -0000	1.30
  @@ -56,15 +56,15 @@
   
   import java.io.File;
   import java.io.FileOutputStream;
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
  +import java.net.HttpURLConnection;
   import java.net.URL;
   import java.net.URLConnection;
  -import java.net.HttpURLConnection;
   import java.util.Date;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.util.FileUtils;
   import org.apache.tools.ant.util.JavaEnvUtils;
   
  
  
  
  1.15      +1 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Input.java
  
  Index: Input.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Input.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Input.java	23 Jul 2002 07:54:47 -0000	1.14
  +++ Input.java	25 Jul 2002 15:21:04 -0000	1.15
  @@ -54,10 +54,8 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import  java.util.Vector;
  -
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.input.InputRequest;
   import org.apache.tools.ant.input.MultipleChoiceInputRequest;
  
  
  
  1.7       +6 -7      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
  
  Index: JDBCTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JDBCTask.java	23 Jul 2002 08:39:52 -0000	1.6
  +++ JDBCTask.java	25 Jul 2002 15:21:04 -0000	1.7
  @@ -54,19 +54,18 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.AntClassLoader;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.types.Path;
  -import org.apache.tools.ant.types.Reference;
  -
   import java.sql.Connection;
   import java.sql.DatabaseMetaData;
   import java.sql.Driver;
   import java.sql.SQLException;
   import java.util.Hashtable;
   import java.util.Properties;
  +import org.apache.tools.ant.AntClassLoader;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Reference;
   
   /**
    * Handles JDBC configuration needed by SQL type tasks.
  
  
  
  1.55      +12 -13    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
  
  Index: Jar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- Jar.java	9 Jul 2002 21:05:58 -0000	1.54
  +++ Jar.java	25 Jul 2002 15:21:05 -0000	1.55
  @@ -54,24 +54,23 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.ByteArrayInputStream;
  +import java.io.ByteArrayOutputStream;
  +import java.io.File;
  +import java.io.FileReader;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.InputStreamReader;
  +import java.io.OutputStreamWriter;
  +import java.io.PrintWriter;
  +import java.io.Reader;
  +import java.util.Enumeration;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.FileScanner;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.ZipFileSet;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.types.ZipFileSet;
   import org.apache.tools.zip.ZipOutputStream;
  -
  -import java.io.IOException;
  -import java.io.File;
  -import java.io.InputStream;
  -import java.io.Reader;
  -import java.io.FileReader;
  -import java.io.ByteArrayOutputStream;
  -import java.io.PrintWriter;
  -import java.io.ByteArrayInputStream;
  -import java.io.OutputStreamWriter;
  -import java.io.InputStreamReader;
  -import java.util.Enumeration;
   
   
   /**
  
  
  
  1.50      +7 -9      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- Java.java	23 Jul 2002 08:39:52 -0000	1.49
  +++ Java.java	25 Jul 2002 15:21:05 -0000	1.50
  @@ -54,22 +54,20 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.File;
  +import java.io.FileOutputStream;
  +import java.io.IOException;
  +import java.io.PrintStream;
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.ExitException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.Commandline;
  -import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.CommandlineJava;
  -import org.apache.tools.ant.types.Reference;
   import org.apache.tools.ant.types.Environment;
  -
  -import java.io.File;
  -import java.io.PrintStream;
  -import java.io.FileOutputStream;
  -import java.io.IOException;
  -
  -import java.util.Vector;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Reference;
   
   /**
    * Launcher for Java applications. Allows use of
  
  
  
  1.107     +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- Javac.java	23 Jul 2002 08:39:53 -0000	1.106
  +++ Javac.java	25 Jul 2002 15:21:05 -0000	1.107
  @@ -54,19 +54,18 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.File;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter;
  +import org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
   import org.apache.tools.ant.util.GlobPatternMapper;
   import org.apache.tools.ant.util.JavaEnvUtils;
   import org.apache.tools.ant.util.SourceFileScanner;
   import org.apache.tools.ant.util.facade.FacadeTaskHelper;
  -import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter;
  -import org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory;
  -
  -import java.io.File;
   
   /**
    * Compiles Java source files. This task can take the following
  
  
  
  1.102     +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- Javadoc.java	23 Jul 2002 08:39:53 -0000	1.101
  +++ Javadoc.java	25 Jul 2002 15:21:05 -0000	1.102
  @@ -54,16 +54,16 @@
   package org.apache.tools.ant.taskdefs;
   
   import java.io.File;
  -import java.io.PrintWriter;
   import java.io.FileWriter;
  -import java.io.IOException;
   import java.io.FilenameFilter;
  -import java.net.URL;
  +import java.io.IOException;
  +import java.io.PrintWriter;
   import java.net.MalformedURLException;
  -import java.util.Locale;
  -import java.util.Vector;
  +import java.net.URL;
   import java.util.Enumeration;
  +import java.util.Locale;
   import java.util.StringTokenizer;
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  
  
  
  1.13      +3 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jikes.java
  
  Index: Jikes.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jikes.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Jikes.java	15 Apr 2002 15:33:09 -0000	1.12
  +++ Jikes.java	25 Jul 2002 15:21:05 -0000	1.13
  @@ -54,13 +54,12 @@
   package org.apache.tools.ant.taskdefs;
   
   import java.io.File;
  -import java.io.PrintWriter;
   import java.io.FileWriter;
   import java.io.IOException;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.BuildException;
  -
  +import java.io.PrintWriter;
   import java.util.Random;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   /**
    * Encapsulates a Jikes compiler, by directly executing an external
  
  
  
  1.13      +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
  
  Index: JikesOutputParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- JikesOutputParser.java	15 Apr 2002 15:33:09 -0000	1.12
  +++ JikesOutputParser.java	25 Jul 2002 15:21:05 -0000	1.13
  @@ -53,14 +53,13 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.Project;
  -    
   import java.io.BufferedReader;
  -import java.io.OutputStream;
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   import java.io.InputStreamReader;
  +import java.io.OutputStream;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   
   /**
    * Parses output from jikes and
  
  
  
  1.16      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
  
  Index: KeySubst.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/KeySubst.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- KeySubst.java	15 Apr 2002 13:36:17 -0000	1.15
  +++ KeySubst.java	25 Jul 2002 15:21:05 -0000	1.16
  @@ -54,16 +54,16 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.BuildException;
  -import java.io.File;
   import java.io.BufferedReader;
   import java.io.BufferedWriter;
  +import java.io.File;
   import java.io.FileReader;
   import java.io.FileWriter;
   import java.io.IOException;
   import java.util.Hashtable;
   import java.util.StringTokenizer;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Task;
   
   /**
    * Keyword substitution. Input file is written to output file.
  
  
  
  1.22      +8 -9      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
  
  Index: LoadFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LoadFile.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- LoadFile.java	23 Jul 2002 08:39:53 -0000	1.21
  +++ LoadFile.java	25 Jul 2002 15:21:05 -0000	1.22
  @@ -53,19 +53,18 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.types.FilterChain;
  -import org.apache.tools.ant.filters.util.ChainReaderHelper;
  -
  +import java.io.BufferedInputStream;
   import java.io.File;
   import java.io.FileInputStream;
  -import java.io.BufferedInputStream;
  -import java.io.Reader;
  -import java.io.InputStreamReader;
   import java.io.IOException;
  +import java.io.InputStreamReader;
  +import java.io.Reader;
   import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.filters.util.ChainReaderHelper;
  +import org.apache.tools.ant.types.FilterChain;
   
   /**
    * Load a file into a property
  
  
  
  1.11      +7 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
  
  Index: LoadProperties.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- LoadProperties.java	23 Jul 2002 08:39:53 -0000	1.10
  +++ LoadProperties.java	25 Jul 2002 15:21:05 -0000	1.11
  @@ -53,21 +53,20 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.types.FilterChain;
  -import org.apache.tools.ant.filters.util.ChainReaderHelper;
  -
  -import java.io.File;
  -import java.io.FileInputStream;
   import java.io.BufferedInputStream;
   import java.io.ByteArrayInputStream;
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.IOException;
   import java.io.InputStreamReader;
   import java.io.Reader;
  -import java.io.IOException;
   import java.util.Enumeration;
   import java.util.Properties;
   import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.filters.util.ChainReaderHelper;
  +import org.apache.tools.ant.types.FilterChain;
   
   /**
    * Load a file's contents as Ant properties.
  
  
  
  1.8       +3 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java
  
  Index: LogOutputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- LogOutputStream.java	14 Apr 2002 11:16:12 -0000	1.7
  +++ LogOutputStream.java	25 Jul 2002 15:21:05 -0000	1.8
  @@ -54,12 +54,11 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.Task;
  -
  +import java.io.ByteArrayOutputStream;
   import java.io.IOException;
   import java.io.OutputStream;
  -import java.io.ByteArrayOutputStream;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   
   
   /**
  
  
  
  1.6       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java
  
  Index: LogStreamHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LogStreamHandler.java	11 Apr 2002 15:59:37 -0000	1.5
  +++ LogStreamHandler.java	25 Jul 2002 15:21:05 -0000	1.6
  @@ -54,10 +54,9 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.IOException;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Task;
  -
  -import java.io.IOException;
   
   /**
    * Logs standard output and error of a subprocess to the log system of ant.
  
  
  
  1.36      +3 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java
  
  Index: Manifest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Manifest.java	9 Jul 2002 21:05:58 -0000	1.35
  +++ Manifest.java	25 Jul 2002 15:21:05 -0000	1.36
  @@ -54,9 +54,6 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import java.util.Vector;
  -import java.util.Hashtable;
  -import java.util.Enumeration;
   import java.io.BufferedReader;
   import java.io.IOException;
   import java.io.InputStream;
  @@ -65,7 +62,9 @@
   import java.io.Reader;
   import java.io.StringWriter;
   import java.io.UnsupportedEncodingException;
  -
  +import java.util.Enumeration;
  +import java.util.Hashtable;
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.util.CollectionUtils;
   
  
  
  
  1.4       +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
  
  Index: ManifestTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ManifestTask.java	23 Jul 2002 08:39:53 -0000	1.3
  +++ ManifestTask.java	25 Jul 2002 15:21:05 -0000	1.4
  @@ -54,16 +54,15 @@
   
   package org.apache.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.types.EnumeratedAttribute;
  -
   import java.io.File;
   import java.io.FileReader;
   import java.io.FileWriter;
   import java.io.IOException;
   import java.io.PrintWriter;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
   
   /**
    * Creates a manifest file for inclusion in a JAR, Ant task wrapper
  
  
  
  1.29      +20 -6     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
  
  Index: MatchingTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- MatchingTask.java	23 Jul 2002 07:54:48 -0000	1.28
  +++ MatchingTask.java	25 Jul 2002 15:21:05 -0000	1.29
  @@ -54,16 +54,30 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  +import java.io.File;
  +import java.util.Enumeration;
  +import java.util.StringTokenizer;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.PatternSet;
  -import org.apache.tools.ant.types.selectors.*;
  -
  -import java.io.File;
  -import java.util.StringTokenizer;
  -import java.util.Enumeration;
  +import org.apache.tools.ant.types.selectors.AndSelector;
  +import org.apache.tools.ant.types.selectors.ContainsSelector;
  +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;
  +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;
   
   /**
    * This is an abstract task that should be used by all those tasks that
  
  
  
  1.21      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
  
  Index: Mkdir.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Mkdir.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Mkdir.java	23 Jul 2002 08:39:53 -0000	1.20
  +++ Mkdir.java	25 Jul 2002 15:21:05 -0000	1.21
  @@ -54,9 +54,9 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.BuildException;
   import java.io.File;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Task;
   
   /**
    * Creates a given directory.
  
  
  
  1.30      +6 -7      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Move.java
  
  Index: Move.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Move.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Move.java	23 Jul 2002 08:39:53 -0000	1.29
  +++ Move.java	25 Jul 2002 15:21:05 -0000	1.30
  @@ -54,15 +54,14 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.FilterSetCollection;
  -import org.apache.tools.ant.types.FilterSet;
  -import org.apache.tools.ant.types.FileSet;
  -
   import java.io.File;
   import java.io.IOException;
   import java.util.Enumeration;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.types.FilterSet;
  +import org.apache.tools.ant.types.FilterSetCollection;
   
   /**
    * Moves a file or directory to a new file or directory.
  
  
  
  1.12      +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Parallel.java
  
  Index: Parallel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Parallel.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Parallel.java	22 Jun 2002 23:38:32 -0000	1.11
  +++ Parallel.java	25 Jul 2002 15:21:05 -0000	1.12
  @@ -53,14 +53,13 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.TaskContainer;
  +import java.util.Enumeration;
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Location;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.TaskContainer;
   import org.apache.tools.ant.util.StringUtils;
  -
  -import java.util.Vector;
  -import java.util.Enumeration;
   
   
   
  
  
  
  1.19      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Patch.java
  
  Index: Patch.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Patch.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Patch.java	23 Jul 2002 08:39:53 -0000	1.18
  +++ Patch.java	25 Jul 2002 15:21:05 -0000	1.19
  @@ -54,12 +54,12 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  +import java.io.File;
  +import java.io.IOException;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.Commandline;
  -import java.io.File;
  -import java.io.IOException;
   
   /**
    * Patches a file by applying a 'diff' file to it; requires "patch" to be
  
  
  
  1.22      +3 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
  
  Index: PathConvert.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/PathConvert.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- PathConvert.java	23 Jul 2002 15:13:37 -0000	1.21
  +++ PathConvert.java	25 Jul 2002 15:21:05 -0000	1.22
  @@ -53,6 +53,9 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.File;
  +import java.util.StringTokenizer;
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  @@ -63,10 +66,6 @@
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
  -
  -import java.util.StringTokenizer;
  -import java.util.Vector;
  -import java.io.File;
   
   /**
    * Converts path and classpath information to a specific target OS
  
  
  
  1.54      +8 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Property.java
  
  Index: Property.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Property.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- Property.java	23 Jul 2002 08:39:53 -0000	1.53
  +++ Property.java	25 Jul 2002 15:21:05 -0000	1.54
  @@ -54,20 +54,20 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.AntClassLoader;
  -import org.apache.tools.ant.ProjectHelper;
  -import org.apache.tools.ant.types.Path;
  -import org.apache.tools.ant.types.Reference;
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.IOException;
   import java.io.InputStream;
  +import java.util.Enumeration;
   import java.util.Properties;
   import java.util.Vector;
  -import java.util.Enumeration;
  +import org.apache.tools.ant.AntClassLoader;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.ProjectHelper;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Reference;
   
   /**
    * Sets a property by name, or set of properties (from file or
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
  
  Index: PumpStreamHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PumpStreamHandler.java	14 Apr 2002 11:16:13 -0000	1.6
  +++ PumpStreamHandler.java	25 Jul 2002 15:21:05 -0000	1.7
  @@ -54,8 +54,8 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   import java.io.OutputStream;
   
   /**
  
  
  
  1.15      +5 -9      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Recorder.java
  
  Index: Recorder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Recorder.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Recorder.java	9 Jul 2002 21:05:59 -0000	1.14
  +++ Recorder.java	25 Jul 2002 15:21:05 -0000	1.15
  @@ -53,18 +53,14 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.BuildException;
  -
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.EnumeratedAttribute;
  -
  -import org.apache.tools.ant.Task;
  -
  -import java.io.PrintStream;
   import java.io.FileOutputStream;
   import java.io.IOException;
  -
  +import java.io.PrintStream;
   import java.util.Hashtable;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
   
   /**
    * Adds a listener to the current build process that records the
  
  
  
  1.8       +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
  
  Index: RecorderEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- RecorderEntry.java	14 Apr 2002 11:16:13 -0000	1.7
  +++ RecorderEntry.java	25 Jul 2002 15:21:05 -0000	1.8
  @@ -53,13 +53,12 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.PrintStream;
  +import org.apache.tools.ant.BuildEvent;
   import org.apache.tools.ant.BuildLogger;
   import org.apache.tools.ant.DefaultLogger;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.BuildEvent;
   import org.apache.tools.ant.util.StringUtils;
  -
  -import java.io.PrintStream;
   
   /**
    * This is a class that represents a recorder. This is the listener to the
  
  
  
  1.12      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rename.java
  
  Index: Rename.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rename.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Rename.java	23 Jul 2002 08:39:53 -0000	1.11
  +++ Rename.java	25 Jul 2002 15:21:05 -0000	1.12
  @@ -54,11 +54,10 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.File;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.Project;
  -
  -import java.io.File;
  +import org.apache.tools.ant.Task;
   
   /**
    * Renames a file.
  
  
  
  1.35      +12 -13    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Replace.java
  
  Index: Replace.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Replace.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Replace.java	23 Jul 2002 15:13:37 -0000	1.34
  +++ Replace.java	25 Jul 2002 15:21:05 -0000	1.35
  @@ -54,28 +54,27 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -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.StringUtils;
  -
  +import java.io.BufferedReader;
  +import java.io.BufferedWriter;
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.FileNotFoundException;
  -import java.io.IOException;
  -import java.io.Reader;
  +import java.io.FileOutputStream;
   import java.io.FileReader;
  -import java.io.InputStreamReader;
  -import java.io.Writer;
   import java.io.FileWriter;
  +import java.io.IOException;
  +import java.io.InputStreamReader;
   import java.io.OutputStreamWriter;
  -import java.io.FileOutputStream;
  -import java.io.BufferedReader;
  -import java.io.BufferedWriter;
  +import java.io.Reader;
  +import java.io.Writer;
   import java.util.Enumeration;
   import java.util.Properties;
   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.util.FileUtils;
  +import org.apache.tools.ant.util.StringUtils;
   
   /**
    * Replaces all occurrences of one or more string tokens with given
  
  
  
  1.42      +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java
  
  Index: Rmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- Rmic.java	23 Jul 2002 15:13:36 -0000	1.41
  +++ Rmic.java	25 Jul 2002 15:21:05 -0000	1.42
  @@ -54,6 +54,10 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +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;
  @@ -67,11 +71,6 @@
   import org.apache.tools.ant.util.FileUtils;
   import org.apache.tools.ant.util.SourceFileScanner;
   import org.apache.tools.ant.util.facade.FacadeTaskHelper;
  -
  -import java.io.File;
  -import java.io.IOException;
  -import java.rmi.Remote;
  -import java.util.Vector;
   
   /**
    * Runs the rmic compiler against classes.</p>
  
  
  
  1.48      +17 -19    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
  
  Index: SQLExec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- SQLExec.java	23 Jul 2002 15:13:36 -0000	1.47
  +++ SQLExec.java	25 Jul 2002 15:21:05 -0000	1.48
  @@ -54,33 +54,31 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -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 java.io.File;
  -import java.io.PrintStream;
   import java.io.BufferedOutputStream;
  +import java.io.BufferedReader;
  +import java.io.File;
  +import java.io.FileInputStream;
   import java.io.FileOutputStream;
  +import java.io.FileReader;
   import java.io.IOException;
  +import java.io.InputStreamReader;
  +import java.io.PrintStream;
   import java.io.Reader;
  -import java.io.BufferedReader;
   import java.io.StringReader;
  -import java.io.FileReader;
  -import java.io.InputStreamReader;
  -import java.io.FileInputStream;
  -import java.util.Enumeration;
  -import java.util.StringTokenizer;
  -import java.util.Vector;
  -
   import java.sql.Connection;
  -import java.sql.Statement;
  -import java.sql.SQLException;
  -import java.sql.SQLWarning;
   import java.sql.ResultSet;
   import java.sql.ResultSetMetaData;
  +import java.sql.SQLException;
  +import java.sql.SQLWarning;
  +import java.sql.Statement;
  +import java.util.Enumeration;
  +import java.util.StringTokenizer;
  +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;
   
   /**
    * Executes a series of SQL statements on a database using JDBC.
  
  
  
  1.9       +3 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Sequential.java
  
  Index: Sequential.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Sequential.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Sequential.java	22 Jun 2002 23:38:32 -0000	1.8
  +++ Sequential.java	25 Jul 2002 15:21:05 -0000	1.9
  @@ -53,12 +53,11 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  +import java.util.Enumeration;
  +import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.TaskContainer;
  -import org.apache.tools.ant.BuildException;
  -
  -import java.util.Vector;
  -import java.util.Enumeration;
   
   
   
  
  
  
  1.24      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java
  
  Index: SignJar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- SignJar.java	23 Jul 2002 07:54:48 -0000	1.23
  +++ SignJar.java	25 Jul 2002 15:21:05 -0000	1.24
  @@ -59,10 +59,9 @@
   import java.util.Vector;
   import java.util.zip.ZipEntry;
   import java.util.zip.ZipFile;
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
  -
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.util.JavaEnvUtils;
   
  
  
  
  1.13      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Sleep.java
  
  Index: Sleep.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Sleep.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Sleep.java	9 Jul 2002 21:05:59 -0000	1.12
  +++ Sleep.java	25 Jul 2002 15:21:05 -0000	1.13
  @@ -53,9 +53,9 @@
    */
   package org.apache.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.BuildException;
   
   /**
    * Sleep, or pause, for a period of time.
  
  
  
  1.36      +10 -10    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java
  
  Index: Tar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Tar.java	23 Jul 2002 08:39:53 -0000	1.35
  +++ Tar.java	25 Jul 2002 15:21:05 -0000	1.36
  @@ -54,26 +54,26 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.BufferedOutputStream;
   import java.io.File;
  -import java.io.IOException;
  +import java.io.FileInputStream;
   import java.io.FileOutputStream;
  +import java.io.IOException;
   import java.io.OutputStream;
  -import java.io.FileInputStream;
  -import java.io.BufferedOutputStream;
  -import java.util.Vector;
   import java.util.Enumeration;
  +import java.util.Vector;
  +import java.util.zip.GZIPOutputStream;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  -import org.apache.tools.ant.util.SourceFileScanner;
  +import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.util.MergingMapper;
  -import org.apache.tools.tar.TarOutputStream;
  +import org.apache.tools.ant.util.SourceFileScanner;
  +import org.apache.tools.bzip2.CBZip2OutputStream;
   import org.apache.tools.tar.TarConstants;
   import org.apache.tools.tar.TarEntry;
  -import java.util.zip.GZIPOutputStream;
  -import org.apache.tools.bzip2.CBZip2OutputStream;
  +import org.apache.tools.tar.TarOutputStream;
   
   
   
  
  
  
  1.10      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java
  
  Index: TaskOutputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TaskOutputStream.java	14 Apr 2002 11:16:13 -0000	1.9
  +++ TaskOutputStream.java	25 Jul 2002 15:21:05 -0000	1.10
  @@ -54,9 +54,9 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import java.io.OutputStream;
   import java.io.IOException;
  +import java.io.OutputStream;
  +import org.apache.tools.ant.Task;
   
   /**
    * Redirects text written to a stream thru the standard
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/TempFile.java
  
  Index: TempFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/TempFile.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TempFile.java	23 Jul 2002 15:13:37 -0000	1.4
  +++ TempFile.java	25 Jul 2002 15:21:05 -0000	1.5
  @@ -54,8 +54,8 @@
   package org.apache.tools.ant.taskdefs;
   
   import java.io.File;
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.util.FileUtils;
   
   /**
  
  
  
  1.28      +7 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Touch.java
  
  Index: Touch.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Touch.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Touch.java	23 Jul 2002 08:39:53 -0000	1.27
  +++ Touch.java	25 Jul 2002 15:21:05 -0000	1.28
  @@ -54,20 +54,19 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.types.FileSet;
  -import org.apache.tools.ant.util.FileUtils;
  -import org.apache.tools.ant.util.JavaEnvUtils;
  -
   import java.io.File;
   import java.io.IOException;
   import java.text.DateFormat;
   import java.text.ParseException;
   import java.util.Locale;
   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.Task;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.util.FileUtils;
  +import org.apache.tools.ant.util.JavaEnvUtils;
   
   /**
    * Touch a file and/or fileset(s); corresponds to the Unix touch command.
  
  
  
  1.32      +6 -7      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
  
  Index: Tstamp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Tstamp.java	23 Jul 2002 08:39:53 -0000	1.31
  +++ Tstamp.java	25 Jul 2002 15:21:05 -0000	1.32
  @@ -54,12 +54,7 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.Location;
  -import org.apache.tools.ant.types.EnumeratedAttribute;
  -
  +import java.text.SimpleDateFormat;
   import java.util.Calendar;
   import java.util.Date;
   import java.util.Enumeration;
  @@ -69,7 +64,11 @@
   import java.util.StringTokenizer;
   import java.util.TimeZone;
   import java.util.Vector;
  -import java.text.SimpleDateFormat;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Location;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
   
   /**
    * Sets properties to the current time, or offsets from the current time.
  
  
  
  1.29      +8 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Untar.java
  
  Index: Untar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Untar.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Untar.java	23 Jul 2002 08:39:53 -0000	1.28
  +++ Untar.java	25 Jul 2002 15:21:05 -0000	1.29
  @@ -54,19 +54,19 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.tar.TarInputStream;
  -import org.apache.tools.tar.TarEntry;
  -import org.apache.tools.ant.util.FileUtils;
  +import java.io.BufferedInputStream;
   import java.io.File;
   import java.io.FileInputStream;
  -import java.io.BufferedInputStream;
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   import java.util.zip.GZIPInputStream;
  -import org.apache.tools.bzip2.CBZip2InputStream;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.util.FileUtils;
  +import org.apache.tools.bzip2.CBZip2InputStream;
  +import org.apache.tools.tar.TarEntry;
  +import org.apache.tools.tar.TarInputStream;
   
   
   
  
  
  
  1.24      +5 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
  
  Index: UpToDate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/UpToDate.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- UpToDate.java	23 Jul 2002 08:39:53 -0000	1.23
  +++ UpToDate.java	25 Jul 2002 15:21:05 -0000	1.24
  @@ -54,20 +54,19 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.File;
  +import java.util.Enumeration;
  +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.Task;
   import org.apache.tools.ant.taskdefs.condition.Condition;
  -import org.apache.tools.ant.types.Mapper;
   import org.apache.tools.ant.types.FileSet;
  -import org.apache.tools.ant.util.SourceFileScanner;
  +import org.apache.tools.ant.types.Mapper;
   import org.apache.tools.ant.util.FileNameMapper;
   import org.apache.tools.ant.util.MergingMapper;
  -import java.io.File;
  -import java.util.Enumeration;
  -
  -import java.util.Vector;
  +import org.apache.tools.ant.util.SourceFileScanner;
   
   /**
    * Sets the given property if the specified target has a timestamp
  
  
  
  1.14      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
  
  Index: WaitFor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/WaitFor.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- WaitFor.java	23 Jul 2002 07:54:48 -0000	1.13
  +++ WaitFor.java	25 Jul 2002 15:21:05 -0000	1.14
  @@ -54,12 +54,11 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +import java.util.Hashtable;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.taskdefs.condition.ConditionBase;
   import org.apache.tools.ant.taskdefs.condition.Condition;
  +import org.apache.tools.ant.taskdefs.condition.ConditionBase;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  -
  -import java.util.Hashtable;
   
   /**
    * Wait for an external event to occur.
  
  
  
  1.27      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/War.java
  
  Index: War.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/War.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- War.java	23 Jul 2002 08:39:53 -0000	1.26
  +++ War.java	25 Jul 2002 15:21:05 -0000	1.27
  @@ -54,13 +54,12 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.File;
  +import java.io.IOException;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.ZipFileSet;
   import org.apache.tools.zip.ZipOutputStream;
  -
  -import java.io.File;
  -import java.io.IOException;
   
   
   /**
  
  
  
  1.52      +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
  
  Index: XSLTProcess.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- XSLTProcess.java	23 Jul 2002 15:13:37 -0000	1.51
  +++ XSLTProcess.java	25 Jul 2002 15:21:05 -0000	1.52
  @@ -57,16 +57,16 @@
   import java.io.File;
   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;
  -import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.DynamicConfigurator;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.optional.TraXLiaison;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
  -import org.apache.tools.ant.util.FileUtils;
   import org.apache.tools.ant.types.XMLCatalog;
  +import org.apache.tools.ant.util.FileUtils;
   
   /**
    * Processes a set of XML documents via XSLT. This is
  
  
  
  1.7       +7 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
  
  Index: XmlProperty.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XmlProperty.java	23 Jul 2002 07:54:48 -0000	1.6
  +++ XmlProperty.java	25 Jul 2002 15:21:06 -0000	1.7
  @@ -54,20 +54,19 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.BufferedInputStream;
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.IOException;
  +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.w3c.dom.Element;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
   import org.xml.sax.SAXException;
  -
  -import javax.xml.parsers.DocumentBuilder;
  -import javax.xml.parsers.DocumentBuilderFactory;
  -import javax.xml.parsers.ParserConfigurationException;
  -import java.io.BufferedInputStream;
  -import java.io.File;
  -import java.io.FileInputStream;
  -import java.io.IOException;
   
   /**
    * Loads property values from a valid XML file,
  
  
  
  1.83      +8 -9      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
  
  Index: Zip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- Zip.java	23 Jul 2002 08:39:53 -0000	1.82
  +++ Zip.java	25 Jul 2002 15:21:06 -0000	1.83
  @@ -53,35 +53,34 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  +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.FileOutputStream;
  -import java.io.FileInputStream;
   import java.io.OutputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.ByteArrayInputStream;
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Stack;
   import java.util.Vector;
   import java.util.zip.CRC32;
   import java.util.zip.ZipInputStream;
  -
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.FileScanner;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.PatternSet;
   import org.apache.tools.ant.types.ZipFileSet;
   import org.apache.tools.ant.types.ZipScanner;
   import org.apache.tools.ant.util.FileUtils;
  -import org.apache.tools.ant.util.SourceFileScanner;
   import org.apache.tools.ant.util.MergingMapper;
  -import org.apache.tools.zip.ZipOutputStream;
  +import org.apache.tools.ant.util.SourceFileScanner;
   import org.apache.tools.zip.ZipEntry;
  +import org.apache.tools.zip.ZipOutputStream;
   
   /**
    * Create a Zip file.
  
  
  
  1.16      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java
  
  Index: CompilerAdapterFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- CompilerAdapterFactory.java	1 Jun 2002 12:26:39 -0000	1.15
  +++ CompilerAdapterFactory.java	25 Jul 2002 15:21:09 -0000	1.16
  @@ -55,8 +55,8 @@
   package org.apache.tools.ant.taskdefs.compilers;
   
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.util.JavaEnvUtils;
   
   /**
  
  
  
  1.31      +7 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  
  Index: DefaultCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- DefaultCompilerAdapter.java	22 Jun 2002 23:38:34 -0000	1.30
  +++ DefaultCompilerAdapter.java	25 Jul 2002 15:21:09 -0000	1.31
  @@ -54,21 +54,20 @@
   
   package org.apache.tools.ant.taskdefs.compilers;
   
  +import java.io.File;
  +import java.io.FileWriter;
  +import java.io.IOException;
  +import java.io.PrintWriter;
  +import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Location;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.taskdefs.Javac;
   import org.apache.tools.ant.taskdefs.Execute;
  +import org.apache.tools.ant.taskdefs.Javac;
   import org.apache.tools.ant.taskdefs.LogStreamHandler;
  -import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.util.FileUtils;
   import org.apache.tools.ant.util.JavaEnvUtils;
  -
  -import java.io.File;
  -import java.io.PrintWriter;
  -import java.io.FileWriter;
  -import java.io.IOException;
   
   /**
    * This is the default implementation for the CompilerAdapter interface.
  
  
  
  1.10      +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
  
  Index: Javac12.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Javac12.java	16 Apr 2002 07:15:18 -0000	1.9
  +++ Javac12.java	25 Jul 2002 15:21:09 -0000	1.10
  @@ -54,15 +54,14 @@
   
   package org.apache.tools.ant.taskdefs.compilers;
   
  +import java.io.IOException;
  +import java.io.OutputStream;
  +import java.lang.reflect.Constructor;
  +import java.lang.reflect.Method;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.LogOutputStream;
   import org.apache.tools.ant.types.Commandline;
  -
  -import java.io.OutputStream;
  -import java.io.IOException;
  -import java.lang.reflect.Constructor;
  -import java.lang.reflect.Method;
   
   /**
    * The implementation of the javac compiler for JDK 1.2
  
  
  
  1.10      +1 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
  
  Index: Javac13.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Javac13.java	16 Apr 2002 07:15:18 -0000	1.9
  +++ Javac13.java	25 Jul 2002 15:21:09 -0000	1.10
  @@ -54,12 +54,10 @@
   
   package org.apache.tools.ant.taskdefs.compilers;
   
  +import java.lang.reflect.Method;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -
   import org.apache.tools.ant.types.Commandline;
  -
  -import java.lang.reflect.Method;
   
   
   /**
  
  
  
  1.14      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
  
  Index: Jikes.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Jikes.java	22 Jun 2002 23:38:34 -0000	1.13
  +++ Jikes.java	25 Jul 2002 15:21:09 -0000	1.14
  @@ -56,8 +56,8 @@
   
   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.Commandline;
  +import org.apache.tools.ant.types.Path;
   
   /**
    * The implementation of the jikes compiler.
  
  
  
  1.11      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
  
  Index: Jvc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Jvc.java	22 Jun 2002 23:38:34 -0000	1.10
  +++ Jvc.java	25 Jul 2002 15:21:09 -0000	1.11
  @@ -56,8 +56,8 @@
   
   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.Commandline;
  +import org.apache.tools.ant.types.Path;
   
   /**
    * The implementation of the jvc compiler from microsoft.
  
  
  
  1.11      +1 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java
  
  Index: Kjc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Kjc.java	22 Jun 2002 23:38:34 -0000	1.10
  +++ Kjc.java	25 Jul 2002 15:21:09 -0000	1.11
  @@ -54,15 +54,11 @@
   
   package org.apache.tools.ant.taskdefs.compilers;
   
  +import java.lang.reflect.Method;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
  -
  -
  -
  -import java.lang.reflect.Method;
   
   /**
    * The implementation of the Java compiler for KJC.
  
  
  
  1.4       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/And.java
  
  Index: And.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/And.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- And.java	11 Apr 2002 07:38:15 -0000	1.3
  +++ And.java	25 Jul 2002 15:21:10 -0000	1.4
  @@ -55,7 +55,6 @@
   package org.apache.tools.ant.taskdefs.condition;
   
   import java.util.Enumeration;
  -
   import org.apache.tools.ant.BuildException;
   
   /**
  
  
  
  1.15      +1 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java
  
  Index: ConditionBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ConditionBase.java	19 Apr 2002 07:15:43 -0000	1.14
  +++ ConditionBase.java	25 Jul 2002 15:21:10 -0000	1.15
  @@ -56,8 +56,6 @@
   
   import java.util.Enumeration;
   import java.util.Vector;
  -
  -
   import org.apache.tools.ant.ProjectComponent;
   import org.apache.tools.ant.taskdefs.Available;
   import org.apache.tools.ant.taskdefs.Checksum;
  
  
  
  1.9       +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java
  
  Index: FilesMatch.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FilesMatch.java	14 Apr 2002 11:16:15 -0000	1.8
  +++ FilesMatch.java	25 Jul 2002 15:21:10 -0000	1.9
  @@ -53,10 +53,10 @@
    */
    package org.apache.tools.ant.taskdefs.condition;
   
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.util.FileUtils;
   import java.io.File;
   import java.io.IOException;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.util.FileUtils;
   
   /**
    * Compares two files for bitwise equality based on size and
  
  
  
  1.5       +4 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
  
  Index: Http.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Http.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Http.java	1 Jun 2002 12:26:39 -0000	1.4
  +++ Http.java	25 Jul 2002 15:21:10 -0000	1.5
  @@ -54,15 +54,13 @@
   
   package org.apache.tools.ant.taskdefs.condition;
   
  +import java.net.HttpURLConnection;
  +import java.net.MalformedURLException;
  +import java.net.URL;
  +import java.net.URLConnection;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.ProjectComponent;
  -
  -
  -import java.net.MalformedURLException;
  -import java.net.HttpURLConnection;
  -import java.net.URLConnection;
  -import java.net.URL;
   
   /**
    * Condition to wait for a HTTP request to succeed. Its attribute(s) are:
  
  
  
  1.4       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Or.java
  
  Index: Or.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Or.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Or.java	11 Apr 2002 07:38:15 -0000	1.3
  +++ Or.java	25 Jul 2002 15:21:10 -0000	1.4
  @@ -55,7 +55,6 @@
   package org.apache.tools.ant.taskdefs.condition;
   
   import java.util.Enumeration;
  -
   import org.apache.tools.ant.BuildException;
   
   /**
  
  
  
  1.18      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
  
  Index: Os.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Os.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Os.java	22 Jun 2002 23:38:35 -0000	1.17
  +++ Os.java	25 Jul 2002 15:21:10 -0000	1.18
  @@ -54,9 +54,8 @@
   
   package org.apache.tools.ant.taskdefs.condition;
   
  -import org.apache.tools.ant.BuildException;
  -
   import java.util.Locale;
  +import org.apache.tools.ant.BuildException;
   
   /**
    * Condition that tests the OS type.
  
  
  
  1.3       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java
  
  Index: Socket.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Socket.java	11 Apr 2002 07:38:15 -0000	1.2
  +++ Socket.java	25 Jul 2002 15:21:10 -0000	1.3
  @@ -54,11 +54,10 @@
   
   package org.apache.tools.ant.taskdefs.condition;
   
  +import java.io.IOException;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.ProjectComponent;
  -
  -import java.io.IOException;
   
   /**
    * Condition to wait for a TCP/IP socket to have a listener. Its attribute(s) are:
  
  
  
  1.6       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java
  
  Index: CVSEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CVSEntry.java	15 Apr 2002 23:49:10 -0000	1.5
  +++ CVSEntry.java	25 Jul 2002 15:21:10 -0000	1.6
  @@ -53,8 +53,8 @@
    */
   package org.apache.tools.ant.taskdefs.cvslib;
   
  -import java.util.Vector;
   import java.util.Date;
  +import java.util.Vector;
   
   /**
    * CVS Entry.
  
  
  
  1.18      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
  
  Index: ChangeLogTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ChangeLogTask.java	23 Jul 2002 07:54:50 -0000	1.17
  +++ ChangeLogTask.java	25 Jul 2002 15:21:10 -0000	1.18
  @@ -66,9 +66,9 @@
   import java.util.Properties;
   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.Task;
  -import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.taskdefs.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.FileSet;
  
  
  
  1.9       +6 -7      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
  
  Index: CvsTagDiff.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CvsTagDiff.java	9 Jul 2002 21:06:01 -0000	1.8
  +++ CvsTagDiff.java	25 Jul 2002 15:21:10 -0000	1.9
  @@ -53,12 +53,6 @@
    */
   package org.apache.tools.ant.taskdefs.cvslib;
   
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.taskdefs.Cvs;
  -import org.apache.tools.ant.util.FileUtils;
  -
   import java.io.BufferedReader;
   import java.io.File;
   import java.io.FileOutputStream;
  @@ -68,6 +62,11 @@
   import java.io.PrintWriter;
   import java.io.UnsupportedEncodingException;
   import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.taskdefs.Cvs;
  +import org.apache.tools.ant.util.FileUtils;
   
   /**
    * Examines the output of cvs rdiff between two tags.
  
  
  
  1.11      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java
  
  Index: RedirectingStreamHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- RedirectingStreamHandler.java	15 Apr 2002 15:33:11 -0000	1.10
  +++ RedirectingStreamHandler.java	25 Jul 2002 15:21:10 -0000	1.11
  @@ -53,10 +53,10 @@
    */
   package org.apache.tools.ant.taskdefs.cvslib;
   
  -import java.io.IOException;
   import java.io.ByteArrayOutputStream;
  -import org.apache.tools.ant.taskdefs.PumpStreamHandler;
  +import java.io.IOException;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.taskdefs.PumpStreamHandler;
   
   /**
    * A dummy stream handler that just passes stuff to the parser.
  
  
  
  1.5       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/email/Message.java
  
  Index: Message.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/email/Message.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Message.java	1 Jun 2002 12:26:40 -0000	1.4
  +++ Message.java	25 Jul 2002 15:21:10 -0000	1.5
  @@ -53,13 +53,12 @@
    */
   package org.apache.tools.ant.taskdefs.email;
   
  -import org.apache.tools.ant.ProjectComponent;
  -
   import java.io.BufferedReader;
   import java.io.File;
   import java.io.FileReader;
   import java.io.IOException;
   import java.io.PrintStream;
  +import org.apache.tools.ant.ProjectComponent;
   
   /**
    * Class representing an email message.
  
  
  
  1.7       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java
  
  Index: PlainMailer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PlainMailer.java	22 Jun 2002 23:38:35 -0000	1.6
  +++ PlainMailer.java	25 Jul 2002 15:21:10 -0000	1.7
  @@ -59,7 +59,6 @@
   import java.io.IOException;
   import java.io.PrintStream;
   import java.util.Enumeration;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.mail.MailMessage;
   
  
  
  
  1.15      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
  
  Index: ANTLR.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ANTLR.java	23 Jul 2002 08:39:56 -0000	1.14
  +++ ANTLR.java	25 Jul 2002 15:21:11 -0000	1.15
  @@ -59,7 +59,6 @@
   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;
  
  
  
  1.21      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
  
  Index: Cab.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Cab.java	23 Jul 2002 07:54:50 -0000	1.20
  +++ Cab.java	25 Jul 2002 15:21:11 -0000	1.21
  @@ -61,12 +61,11 @@
   import java.io.PrintWriter;
   import java.util.Enumeration;
   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.taskdefs.Execute;
   import org.apache.tools.ant.taskdefs.ExecTask;
  +import org.apache.tools.ant.taskdefs.Execute;
   import org.apache.tools.ant.taskdefs.LogOutputStream;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.taskdefs.StreamPumper;
  
  
  
  1.15      +11 -18    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
  
  Index: EchoProperties.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- EchoProperties.java	23 Jul 2002 08:39:56 -0000	1.14
  +++ EchoProperties.java	25 Jul 2002 15:21:11 -0000	1.15
  @@ -53,23 +53,6 @@
    */
   package org.apache.tools.ant.taskdefs.optional;
   
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.util.DOMElementWriter;
  -import org.apache.tools.ant.util.CollectionUtils;
  -import org.apache.tools.ant.types.EnumeratedAttribute;
  -
  -import org.w3c.dom.Document;
  -import org.w3c.dom.Element;
  -
  -import java.util.Enumeration;
  -import java.util.Hashtable;
  -
  -import java.util.Enumeration;
  -import java.util.Hashtable;
  -import java.util.Properties;
  -
   import java.io.ByteArrayOutputStream;
   import java.io.File;
   import java.io.FileInputStream;
  @@ -79,9 +62,19 @@
   import java.io.OutputStream;
   import java.io.OutputStreamWriter;
   import java.io.Writer;
  -
  +import java.util.Enumeration;
  +import java.util.Hashtable;
  +import java.util.Properties;
   import javax.xml.parsers.DocumentBuilder;
   import javax.xml.parsers.DocumentBuilderFactory;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.util.CollectionUtils;
  +import org.apache.tools.ant.util.DOMElementWriter;
  +import org.w3c.dom.Document;
  +import org.w3c.dom.Element;
   
   /**
    *  Displays all the current properties in the build. The output can be sent to
  
  
  
  1.13      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
  
  Index: IContract.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- IContract.java	23 Jul 2002 08:39:56 -0000	1.12
  +++ IContract.java	25 Jul 2002 15:21:11 -0000	1.13
  @@ -72,7 +72,6 @@
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.taskdefs.Mkdir;
   import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter;
  -
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
   
  
  
  
  1.19      +5 -9      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
  
  Index: Javah.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Javah.java	23 Jul 2002 08:39:56 -0000	1.18
  +++ Javah.java	25 Jul 2002 15:21:11 -0000	1.19
  @@ -54,21 +54,17 @@
   
   package org.apache.tools.ant.taskdefs.optional;
   
  +import java.io.File;
  +import java.util.Enumeration;
  +import java.util.StringTokenizer;
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
  -
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  -
  +import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
  -import org.apache.tools.ant.types.Commandline;
  -
   import org.apache.tools.ant.util.JavaEnvUtils;
  -
  -import java.io.File;
  -import java.util.Vector;
  -import java.util.StringTokenizer;
  -import java.util.Enumeration;
   
   /**
    * Generates JNI header files using javah.
  
  
  
  1.12      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
  
  Index: Native2Ascii.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Native2Ascii.java	23 Jul 2002 08:39:56 -0000	1.11
  +++ Native2Ascii.java	25 Jul 2002 15:21:11 -0000	1.12
  @@ -54,6 +54,7 @@
   
   package org.apache.tools.ant.taskdefs.optional;
   
  +import java.io.File;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  @@ -63,8 +64,6 @@
   import org.apache.tools.ant.util.FileNameMapper;
   import org.apache.tools.ant.util.IdentityMapper;
   import org.apache.tools.ant.util.SourceFileScanner;
  -
  -import java.io.File;
   
   /**
    * Converts files from native encodings to ASCII.
  
  
  
  1.23      +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
  
  Index: NetRexxC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- NetRexxC.java	23 Jul 2002 20:01:44 -0000	1.22
  +++ NetRexxC.java	25 Jul 2002 15:21:11 -0000	1.23
  @@ -53,18 +53,17 @@
    */
   package org.apache.tools.ant.taskdefs.optional;
   
  +import java.io.BufferedReader;
   import java.io.File;
   import java.io.IOException;
  -import java.io.StringWriter;
   import java.io.PrintWriter;
   import java.io.StringReader;
  -import java.io.BufferedReader;
  -
  -import java.util.Vector;
  -import java.util.Hashtable;
  +import java.io.StringWriter;
   import java.util.Enumeration;
  +import java.util.Hashtable;
   import java.util.Properties;
   import java.util.StringTokenizer;
  +import java.util.Vector;
   import netrexx.lang.Rexx;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
  
  
  
  1.25      +13 -13    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
  
  Index: PropertyFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- PropertyFile.java	23 Jul 2002 08:39:56 -0000	1.24
  +++ PropertyFile.java	25 Jul 2002 15:21:11 -0000	1.25
  @@ -54,28 +54,28 @@
   
   package org.apache.tools.ant.taskdefs.optional;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.types.EnumeratedAttribute;
  +import java.io.BufferedInputStream;
  +import java.io.BufferedOutputStream;
   import java.io.File;
   import java.io.FileInputStream;
  -import java.io.BufferedInputStream;
   import java.io.FileOutputStream;
   import java.io.IOException;
  -import java.io.BufferedOutputStream;
   import java.io.OutputStream;
   import java.lang.reflect.InvocationTargetException;
   import java.lang.reflect.Method;
  -import java.util.Properties;
  -import java.util.Vector;
  -import java.util.Enumeration;
  -import java.util.Date;
  -import java.util.Calendar;
  -import java.util.Hashtable;
   import java.text.DateFormat;
  -import java.text.SimpleDateFormat;
  -import java.text.ParseException;
   import java.text.DecimalFormat;
  +import java.text.ParseException;
  +import java.text.SimpleDateFormat;
  +import java.util.Calendar;
  +import java.util.Date;
  +import java.util.Enumeration;
  +import java.util.Hashtable;
  +import java.util.Properties;
  +import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
   
   /**
    *Modifies settings in a property file.
  
  
  
  1.19      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java
  
  Index: RenameExtensions.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- RenameExtensions.java	23 Jul 2002 08:39:56 -0000	1.18
  +++ RenameExtensions.java	25 Jul 2002 15:21:11 -0000	1.19
  @@ -65,7 +65,6 @@
   package org.apache.tools.ant.taskdefs.optional;
   
   import java.io.File;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.MatchingTask;
  
  
  
  1.13      +9 -10     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
  
  Index: ReplaceRegExp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ReplaceRegExp.java	23 Jul 2002 07:54:51 -0000	1.12
  +++ ReplaceRegExp.java	25 Jul 2002 15:21:11 -0000	1.13
  @@ -53,15 +53,6 @@
    */
   package org.apache.tools.ant.taskdefs.optional;
   
  -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.util.regexp.Regexp;
  -import org.apache.tools.ant.types.RegularExpression;
  -import org.apache.tools.ant.types.Substitution;
  -import org.apache.tools.ant.types.FileSet;
  -import org.apache.tools.ant.util.FileUtils;
   import java.io.BufferedReader;
   import java.io.BufferedWriter;
   import java.io.File;
  @@ -70,8 +61,16 @@
   import java.io.IOException;
   import java.io.LineNumberReader;
   import java.io.PrintWriter;
  -
   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.Task;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.types.RegularExpression;
  +import org.apache.tools.ant.types.Substitution;
  +import org.apache.tools.ant.util.FileUtils;
  +import org.apache.tools.ant.util.regexp.Regexp;
   
   /**
    * Performs regular expression string replacements in a text
  
  
  
  1.12      +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
  
  Index: Rpm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Rpm.java	23 Jul 2002 08:39:56 -0000	1.11
  +++ Rpm.java	25 Jul 2002 15:21:11 -0000	1.12
  @@ -53,20 +53,20 @@
    */
   package org.apache.tools.ant.taskdefs.optional;
   
  -import java.io.File;
  -import java.io.OutputStream;
  -import java.io.PrintStream;
   import java.io.BufferedOutputStream;
  +import java.io.File;
   import java.io.FileOutputStream;
   import java.io.IOException;
  -import org.apache.tools.ant.Task;
  +import java.io.OutputStream;
  +import java.io.PrintStream;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.taskdefs.Execute;
   import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
  -import org.apache.tools.ant.taskdefs.LogStreamHandler;
   import org.apache.tools.ant.taskdefs.LogOutputStream;
  +import org.apache.tools.ant.taskdefs.LogStreamHandler;
   import org.apache.tools.ant.taskdefs.PumpStreamHandler;
  -import org.apache.tools.ant.taskdefs.Execute;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  
  
  
  1.18      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
  
  Index: Script.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Script.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Script.java	23 Jul 2002 07:54:51 -0000	1.17
  +++ Script.java	25 Jul 2002 15:21:11 -0000	1.18
  @@ -53,15 +53,15 @@
    */
   package org.apache.tools.ant.taskdefs.optional;
   
  -import com.ibm.bsf.BSFManager;
   import com.ibm.bsf.BSFException;
  +import com.ibm.bsf.BSFManager;
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.IOException;
  -import java.util.Hashtable;
   import java.util.Enumeration;
  -import org.apache.tools.ant.Task;
  +import java.util.Hashtable;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Task;
   
   /**
    * Executes a script.
  
  
  
  1.9       +0 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java
  
  Index: StyleBook.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- StyleBook.java	9 Jul 2002 21:06:02 -0000	1.8
  +++ StyleBook.java	25 Jul 2002 15:21:11 -0000	1.9
  @@ -55,8 +55,6 @@
   
   import java.io.File;
   import org.apache.tools.ant.BuildException;
  -
  -
   import org.apache.tools.ant.taskdefs.Java;
   
   /**
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Test.java
  
  Index: Test.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Test.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Test.java	9 Jul 2002 21:06:02 -0000	1.9
  +++ Test.java	25 Jul 2002 15:21:11 -0000	1.10
  @@ -53,9 +53,9 @@
    */
   package org.apache.tools.ant.taskdefs.optional;
   
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.taskdefs.Java;
  -import java.util.Vector;
   
   /**
    * This is a primitive task to execute a unit test in the org.apache.testlet framework.
  
  
  
  1.21      +17 -23    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
  
  Index: TraXLiaison.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- TraXLiaison.java	11 Jul 2002 22:52:55 -0000	1.20
  +++ TraXLiaison.java	25 Jul 2002 15:21:11 -0000	1.21
  @@ -54,40 +54,34 @@
   
   package org.apache.tools.ant.taskdefs.optional;
   
  +import java.io.BufferedInputStream;
  +import java.io.BufferedOutputStream;
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.FileOutputStream;
   import java.io.IOException;
  -import java.io.BufferedOutputStream;
  -import java.io.BufferedInputStream;
  -import java.io.OutputStream;
   import java.io.InputStream;
  +import java.io.OutputStream;
   import java.util.Vector;
  -
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.taskdefs.XSLTLiaison;
  -import org.apache.tools.ant.taskdefs.XSLTLoggerAware;
  -import org.apache.tools.ant.taskdefs.XSLTLogger;
  -
  -import org.xml.sax.InputSource;
  -import org.xml.sax.EntityResolver;
  -import org.xml.sax.XMLReader;
  -
   import javax.xml.parsers.SAXParserFactory;
  -
  -import javax.xml.transform.TransformerFactory;
  -import javax.xml.transform.Transformer;
  -import javax.xml.transform.TransformerException;
  -import javax.xml.transform.Templates;
  -
   import javax.xml.transform.ErrorListener;
  -import javax.xml.transform.stream.StreamResult;
  -import javax.xml.transform.stream.StreamSource;
   import javax.xml.transform.Source;
  -import javax.xml.transform.URIResolver;
   import javax.xml.transform.SourceLocator;
  -
  +import javax.xml.transform.Templates;
  +import javax.xml.transform.Transformer;
  +import javax.xml.transform.TransformerException;
  +import javax.xml.transform.TransformerFactory;
  +import javax.xml.transform.URIResolver;
   import javax.xml.transform.sax.SAXSource;
  +import javax.xml.transform.stream.StreamResult;
  +import javax.xml.transform.stream.StreamSource;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.taskdefs.XSLTLiaison;
  +import org.apache.tools.ant.taskdefs.XSLTLogger;
  +import org.apache.tools.ant.taskdefs.XSLTLoggerAware;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.XMLReader;
   
   /**
    * Concrete liaison for XSLT processor implementing TraX. (ie JAXP 1.1)
  
  
  
  1.23      +7 -7      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
  
  Index: XMLValidateTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- XMLValidateTask.java	23 Jul 2002 15:13:37 -0000	1.22
  +++ XMLValidateTask.java	25 Jul 2002 15:21:11 -0000	1.23
  @@ -58,29 +58,29 @@
   import java.io.IOException;
   import java.net.MalformedURLException;
   import java.net.URL;
  -import java.util.Vector;
  -import java.util.Hashtable;
   import java.util.Enumeration;
  +import java.util.Hashtable;
  +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;
   import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.types.DTDLocation;
   import org.apache.tools.ant.types.FileSet;
   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.types.DTDLocation;
   import org.apache.tools.ant.util.JAXPUtils;
  -import org.xml.sax.XMLReader;
   import org.xml.sax.EntityResolver;
  -import org.xml.sax.Parser;
   import org.xml.sax.ErrorHandler;
  -import org.xml.sax.SAXNotRecognizedException;
  -import org.xml.sax.SAXNotSupportedException;
   import org.xml.sax.InputSource;
  +import org.xml.sax.Parser;
   import org.xml.sax.SAXException;
  +import org.xml.sax.SAXNotRecognizedException;
  +import org.xml.sax.SAXNotSupportedException;
   import org.xml.sax.SAXParseException;
  +import org.xml.sax.XMLReader;
   import org.xml.sax.helpers.ParserAdapter;
   
   /**
  
  
  
  1.14      +5 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java
  
  Index: XalanLiaison.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- XalanLiaison.java	11 Jul 2002 22:54:55 -0000	1.13
  +++ XalanLiaison.java	25 Jul 2002 15:21:11 -0000	1.14
  @@ -54,18 +54,15 @@
   
   package org.apache.tools.ant.taskdefs.optional;
   
  -import org.apache.tools.ant.taskdefs.XSLTLiaison;
  -
  -import org.apache.xalan.xslt.XSLTProcessorFactory;
  -import org.apache.xalan.xslt.XSLTProcessor;
  -import org.apache.xalan.xslt.XSLTInputSource;
  -import org.apache.xalan.xslt.XSLTResultTarget;
  -
  -
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.FileOutputStream;
   import java.io.IOException;
  +import org.apache.tools.ant.taskdefs.XSLTLiaison;
  +import org.apache.xalan.xslt.XSLTInputSource;
  +import org.apache.xalan.xslt.XSLTProcessor;
  +import org.apache.xalan.xslt.XSLTProcessorFactory;
  +import org.apache.xalan.xslt.XSLTResultTarget;
   
   /**
    * Concrete liaison for Xalan 1.x API.
  
  
  
  1.15      +1 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/XslpLiaison.java
  
  Index: XslpLiaison.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/XslpLiaison.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- XslpLiaison.java	9 Jul 2002 21:06:03 -0000	1.14
  +++ XslpLiaison.java	25 Jul 2002 15:21:11 -0000	1.15
  @@ -57,12 +57,10 @@
   import com.kvisco.xsl.XSLProcessor;
   import com.kvisco.xsl.XSLReader;
   import com.kvisco.xsl.XSLStylesheet;
  -import org.apache.tools.ant.taskdefs.XSLTLiaison;
  -import org.apache.tools.ant.BuildException;
  -
   import java.io.File;
   import java.io.FileOutputStream;
   import java.io.OutputStreamWriter;
  +import org.apache.tools.ant.taskdefs.XSLTLiaison;
   
   /**
    * Concrete liaison for XSLP
  
  
  
  1.8       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java
  
  Index: CCMCheck.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CCMCheck.java	23 Jul 2002 08:39:56 -0000	1.7
  +++ CCMCheck.java	25 Jul 2002 15:21:12 -0000	1.8
  @@ -55,7 +55,6 @@
   package org.apache.tools.ant.taskdefs.optional.ccm;
   
   import java.io.File;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.Commandline;
  
  
  
  1.12      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
  
  Index: CCMCreateTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CCMCreateTask.java	23 Jul 2002 08:39:56 -0000	1.11
  +++ CCMCreateTask.java	25 Jul 2002 15:21:12 -0000	1.12
  @@ -60,7 +60,6 @@
   import java.io.InputStream;
   import java.io.InputStreamReader;
   import java.io.OutputStream;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
  
  
  
  1.10      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
  
  Index: ClearCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ClearCase.java	23 Jul 2002 08:39:56 -0000	1.9
  +++ ClearCase.java	25 Jul 2002 15:21:12 -0000	1.10
  @@ -54,9 +54,9 @@
   
   package org.apache.tools.ant.taskdefs.optional.clearcase;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.Execute;
   import org.apache.tools.ant.taskdefs.LogStreamHandler;
   import org.apache.tools.ant.types.Commandline;
  
  
  
  1.5       +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java
  
  Index: AntAnalyzer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AntAnalyzer.java	22 Jun 2002 23:38:36 -0000	1.4
  +++ AntAnalyzer.java	25 Jul 2002 15:21:12 -0000	1.5
  @@ -55,14 +55,14 @@
   
   import java.io.File;
   import java.io.FileInputStream;
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Vector;
  -import org.apache.tools.ant.util.depend.AbstractAnalyzer;
  -import java.util.zip.ZipFile;
   import java.util.zip.ZipEntry;
  +import java.util.zip.ZipFile;
  +import org.apache.tools.ant.util.depend.AbstractAnalyzer;
   
   /**
    * An analyzer which uses the depend task's bytecode classes to analyze
  
  
  
  1.10      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java
  
  Index: ClassFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ClassFile.java	15 Apr 2002 14:56:31 -0000	1.9
  +++ ClassFile.java	25 Jul 2002 15:21:12 -0000	1.10
  @@ -57,7 +57,6 @@
   import java.io.IOException;
   import java.io.InputStream;
   import java.util.Vector;
  -
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ClassCPInfo;
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPoolEntry;
  
  
  
  1.32      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
  
  Index: Depend.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Depend.java	23 Jul 2002 08:39:57 -0000	1.31
  +++ Depend.java	25 Jul 2002 15:21:12 -0000	1.32
  @@ -63,7 +63,6 @@
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Vector;
  -
   import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
  
  
  
  1.21      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
  
  Index: Ilasm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Ilasm.java	23 Jul 2002 07:54:52 -0000	1.20
  +++ Ilasm.java	25 Jul 2002 15:21:13 -0000	1.21
  @@ -71,7 +71,6 @@
   // ====================================================================
   
   import java.io.File;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  
  
  
  1.16      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
  
  Index: NetCommand.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- NetCommand.java	25 Apr 2002 12:14:50 -0000	1.15
  +++ NetCommand.java	25 Jul 2002 15:21:13 -0000	1.16
  @@ -65,7 +65,6 @@
   
   import java.io.File;
   import java.io.IOException;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  
  
  
  1.10      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java
  
  Index: WsdlToDotnet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- WsdlToDotnet.java	23 Jul 2002 15:13:37 -0000	1.9
  +++ WsdlToDotnet.java	25 Jul 2002 15:21:13 -0000	1.10
  @@ -53,9 +53,9 @@
    */
   package org.apache.tools.ant.taskdefs.optional.dotnet;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.BuildException;
   import java.io.File;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Task;
   
   /**
    * Converts a WSDL file or URL resource into a .NET language.
  
  
  
  1.19      +5 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
  
  Index: BorlandDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- BorlandDeploymentTool.java	22 Jun 2002 23:38:36 -0000	1.18
  +++ BorlandDeploymentTool.java	25 Jul 2002 15:21:13 -0000	1.19
  @@ -56,26 +56,23 @@
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
   
  +import java.io.BufferedReader;
   import java.io.File;
   import java.io.IOException;
  -import java.io.OutputStream;
   import java.io.InputStream;
  -import java.io.BufferedReader;
   import java.io.InputStreamReader;
  -
  +import java.io.OutputStream;
   import java.util.Hashtable;
   import java.util.Iterator;
   import java.util.Vector;
  -
  -
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.taskdefs.ExecTask;
  +import org.apache.tools.ant.taskdefs.Execute;
   import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
   import org.apache.tools.ant.taskdefs.Java;
  -import org.apache.tools.ant.taskdefs.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
  -import org.apache.tools.ant.taskdefs.ExecTask;
   
   
   /**
  
  
  
  1.12      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
  
  Index: BorlandGenerateClient.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BorlandGenerateClient.java	23 Jul 2002 07:54:52 -0000	1.11
  +++ BorlandGenerateClient.java	25 Jul 2002 15:21:13 -0000	1.12
  @@ -56,7 +56,6 @@
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
   import java.io.File;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  
  
  
  1.18      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
  
  Index: DDCreator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- DDCreator.java	23 Jul 2002 07:54:52 -0000	1.17
  +++ DDCreator.java	25 Jul 2002 15:21:13 -0000	1.18
  @@ -53,14 +53,13 @@
    */
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  +import java.io.File;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.taskdefs.Java;
  +import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
  -
  -import java.io.File;
   
   /**
    * Builds a serialized deployment descriptor given a text file description of the
  
  
  
  1.11      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java
  
  Index: DDCreatorHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DDCreatorHelper.java	15 Apr 2002 13:36:19 -0000	1.10
  +++ DDCreatorHelper.java	25 Jul 2002 15:21:13 -0000	1.11
  @@ -56,7 +56,6 @@
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.ObjectInputStream;
  -
   import javax.ejb.deployment.DeploymentDescriptor;
   
   /**
  
  
  
  1.24      +5 -7      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
  
  Index: DescriptorHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- DescriptorHandler.java	15 Apr 2002 14:56:31 -0000	1.23
  +++ DescriptorHandler.java	25 Jul 2002 15:21:13 -0000	1.24
  @@ -54,20 +54,18 @@
   
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  -import java.util.Hashtable;
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.FileNotFoundException;
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   import java.net.URL;
  -
  +import java.util.Hashtable;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
  +import org.xml.sax.AttributeList;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  -import org.xml.sax.AttributeList;
  -
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.Project;
   
   /**
    * Inner class used by EjbJar to facilitate the parsing of deployment
  
  
  
  1.12      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java
  
  Index: EJBDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- EJBDeploymentTool.java	10 Jan 2002 13:59:35 -0000	1.11
  +++ EJBDeploymentTool.java	25 Jul 2002 15:21:13 -0000	1.12
  @@ -57,7 +57,6 @@
   
   
   import javax.xml.parsers.SAXParser;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Task;
   
  
  
  
  1.38      +5 -9      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
  
  Index: EjbJar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- EjbJar.java	23 Jul 2002 07:54:52 -0000	1.37
  +++ EjbJar.java	25 Jul 2002 15:21:13 -0000	1.38
  @@ -56,24 +56,20 @@
   
   // Standard java imports
   import java.io.File;
  -import java.util.List;
   import java.util.ArrayList;
   import java.util.Iterator;
  -
  -// XML imports
  +import java.util.List;
  +import javax.xml.parsers.ParserConfigurationException;
   import javax.xml.parsers.SAXParser;
   import javax.xml.parsers.SAXParserFactory;
  -import javax.xml.parsers.ParserConfigurationException;
  -import org.xml.sax.SAXException;
  -
  -// Apache/Ant imports
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.DirectoryScanner;
  +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.EnumeratedAttribute;
   import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.types.Path;
  +import org.xml.sax.SAXException;
   
   /**
    * Provides automated EJB JAR file creation.
  
  
  
  1.22      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
  
  Index: Ejbc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Ejbc.java	23 Jul 2002 07:54:52 -0000	1.21
  +++ Ejbc.java	25 Jul 2002 15:21:13 -0000	1.22
  @@ -53,14 +53,13 @@
    */
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  +import java.io.File;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.taskdefs.Java;
  +import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
  -
  -import java.io.File;
   
   /**
    * Builds EJB support classes using WebLogic's ejbc tool from a directory containing
  
  
  
  1.17      +3 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java
  
  Index: EjbcHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- EjbcHelper.java	15 Apr 2002 13:36:19 -0000	1.16
  +++ EjbcHelper.java	25 Jul 2002 15:21:13 -0000	1.17
  @@ -54,15 +54,14 @@
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
   import java.io.File;
  -import java.io.IOException;
   import java.io.FileInputStream;
  -import java.io.ObjectInputStream;
   import java.io.FileWriter;
  +import java.io.IOException;
  +import java.io.ObjectInputStream;
   import java.io.PrintWriter;
   import java.util.Vector;
  -
  -import javax.ejb.deployment.EntityDescriptor;
   import javax.ejb.deployment.DeploymentDescriptor;
  +import javax.ejb.deployment.EntityDescriptor;
   
   
   /**
  
  
  
  1.40      +11 -14    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
  
  Index: GenericDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- GenericDeploymentTool.java	9 Jul 2002 21:06:05 -0000	1.39
  +++ GenericDeploymentTool.java	25 Jul 2002 15:21:13 -0000	1.40
  @@ -54,33 +54,30 @@
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
   import java.io.File;
  -import java.io.IOException;
   import java.io.FileInputStream;
  -import java.io.InputStream;
   import java.io.FileOutputStream;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.util.ArrayList;
  +import java.util.Enumeration;
   import java.util.Hashtable;
  -import java.util.List;
   import java.util.Iterator;
  -import java.util.ArrayList;
  +import java.util.List;
   import java.util.jar.JarOutputStream;
   import java.util.jar.Manifest;
   import java.util.zip.ZipEntry;
  -import java.util.Enumeration;
  -
  -
   import javax.xml.parsers.SAXParser;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
  -
  -import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Location;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.AntClassLoader;
  -import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.util.depend.DependencyAnalyzer;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.SAXException;
   
   
   /**
  
  
  
  1.9       +2 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
  
  Index: IPlanetDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- IPlanetDeploymentTool.java	22 Jun 2002 23:38:36 -0000	1.8
  +++ IPlanetDeploymentTool.java	25 Jul 2002 15:21:13 -0000	1.9
  @@ -57,12 +57,10 @@
   import java.io.File;
   import java.io.IOException;
   import java.util.Hashtable;
  -
   import javax.xml.parsers.SAXParser;
  -import org.xml.sax.SAXException;
  -
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.xml.sax.SAXException;
   
   /**
    * This class is used to generate iPlanet Application Server (iAS) 6.0 stubs and
  
  
  
  1.12      +10 -13    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
  
  Index: IPlanetEjbc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- IPlanetEjbc.java	9 Jul 2002 21:06:05 -0000	1.11
  +++ IPlanetEjbc.java	25 Jul 2002 15:21:13 -0000	1.12
  @@ -54,30 +54,27 @@
   
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  +import java.io.BufferedReader;
   import java.io.File;
  -import java.io.InputStream;
   import java.io.FileInputStream;
  -import java.io.InputStreamReader;
  -import java.io.BufferedReader;
   import java.io.IOException;
  -import java.util.Map;
  +import java.io.InputStream;
  +import java.io.InputStreamReader;
  +import java.util.ArrayList;
  +import java.util.Date;
   import java.util.HashMap;
   import java.util.Hashtable;
  -import java.util.List;
  -import java.util.ArrayList;
   import java.util.Iterator;
  -import java.util.StringTokenizer;
  +import java.util.List;
  +import java.util.Map;
   import java.util.Properties;
  -import java.util.Date;
  -
  -
  -
  +import java.util.StringTokenizer;
   import javax.xml.parsers.SAXParser;
   import javax.xml.parsers.SAXParserFactory;
  +import org.xml.sax.AttributeList;
   import org.xml.sax.HandlerBase;
  -import org.xml.sax.SAXException;
   import org.xml.sax.InputSource;
  -import org.xml.sax.AttributeList;
  +import org.xml.sax.SAXException;
   
   /**
    * Compiles EJB stubs and skeletons for the iPlanet Application
  
  
  
  1.10      +4 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
  
  Index: IPlanetEjbcTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- IPlanetEjbcTask.java	23 Jul 2002 08:39:57 -0000	1.9
  +++ IPlanetEjbcTask.java	25 Jul 2002 15:21:13 -0000	1.10
  @@ -56,15 +56,13 @@
   
   import java.io.File;
   import java.io.IOException;
  -
  -import javax.xml.parsers.SAXParserFactory;
  -import javax.xml.parsers.SAXParser;
   import javax.xml.parsers.ParserConfigurationException;
  -import org.xml.sax.SAXException;
  -
  +import javax.xml.parsers.SAXParser;
  +import javax.xml.parsers.SAXParserFactory;
  +import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.Path;
  -import org.apache.tools.ant.BuildException;
  +import org.xml.sax.SAXException;
   
   /**
    * Compiles EJB stubs and skeletons for the iPlanet Application Server.
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java
  
  Index: InnerClassFilenameFilter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- InnerClassFilenameFilter.java	15 Apr 2002 06:01:37 -0000	1.6
  +++ InnerClassFilenameFilter.java	25 Jul 2002 15:21:13 -0000	1.7
  @@ -53,8 +53,8 @@
    */
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  -import java.io.FilenameFilter;
   import java.io.File;
  +import java.io.FilenameFilter;
   
   public class InnerClassFilenameFilter implements FilenameFilter {
       private String baseClassName;
  
  
  
  1.6       +6 -9      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
  
  Index: JonasDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JonasDeploymentTool.java	23 Jul 2002 15:13:37 -0000	1.5
  +++ JonasDeploymentTool.java	25 Jul 2002 15:21:13 -0000	1.6
  @@ -53,19 +53,16 @@
    */
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.Path;
  -import org.apache.tools.ant.taskdefs.Java;
  -import org.apache.tools.ant.AntClassLoader;
  -import org.apache.tools.ant.taskdefs.Java;
  -
   import java.io.File;
   import java.io.IOException;
  -import java.util.Hashtable;
   import java.util.Enumeration;
  -
  +import java.util.Hashtable;
   import javax.xml.parsers.SAXParser;
  +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;
  +import org.apache.tools.ant.types.Path;
   
   /**
    * The deployment tool to add the jonas specific deployment descriptors to the
  
  
  
  1.22      +1 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
  
  Index: WLRun.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- WLRun.java	23 Jul 2002 07:54:52 -0000	1.21
  +++ WLRun.java	25 Jul 2002 15:21:14 -0000	1.22
  @@ -54,13 +54,11 @@
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
   
  +import java.io.File;
   import org.apache.tools.ant.BuildException;
  -
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.Java;
   import org.apache.tools.ant.types.Path;
  -
  -import java.io.File;
   
   /**
    * Starts a WebLogic server.
  
  
  
  1.14      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java
  
  Index: WLStop.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- WLStop.java	23 Jul 2002 07:54:53 -0000	1.13
  +++ WLStop.java	25 Jul 2002 15:21:14 -0000	1.14
  @@ -55,7 +55,6 @@
   
   
   import java.io.File;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.Java;
  
  
  
  1.44      +9 -11     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
  
  Index: WeblogicDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- WeblogicDeploymentTool.java	9 Jul 2002 21:06:05 -0000	1.43
  +++ WeblogicDeploymentTool.java	25 Jul 2002 15:21:14 -0000	1.44
  @@ -54,29 +54,27 @@
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
   import java.io.File;
  -import java.io.IOException;
   import java.io.FileInputStream;
   import java.io.FileOutputStream;
  +import java.io.IOException;
   import java.io.InputStream;
  -import java.util.jar.JarFile;
  -import java.util.jar.JarOutputStream;
  -import java.util.jar.JarEntry;
  +import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Iterator;
  -import java.util.Enumeration;
   import java.util.Vector;
  -
  -import javax.xml.parsers.SAXParserFactory;
  +import java.util.jar.JarEntry;
  +import java.util.jar.JarFile;
  +import java.util.jar.JarOutputStream;
   import javax.xml.parsers.SAXParser;
  -import org.xml.sax.InputSource;
  -
  +import javax.xml.parsers.SAXParserFactory;
  +import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.AntClassLoader;
  -import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.taskdefs.Java;
   import org.apache.tools.ant.types.Environment;
  +import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.util.FileUtils;
  +import org.xml.sax.InputSource;
   
   /**
       The weblogic element is used to control the weblogic.ejbc compiler for
  
  
  
  1.14      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java
  
  Index: WeblogicTOPLinkDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- WeblogicTOPLinkDeploymentTool.java	15 Apr 2002 14:56:31 -0000	1.13
  +++ WeblogicTOPLinkDeploymentTool.java	25 Jul 2002 15:21:14 -0000	1.14
  @@ -56,7 +56,6 @@
   
   import java.io.File;
   import java.util.Hashtable;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   
  
  
  
  1.13      +9 -23     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
  
  Index: WebsphereDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- WebsphereDeploymentTool.java	9 Jul 2002 21:06:05 -0000	1.12
  +++ WebsphereDeploymentTool.java	25 Jul 2002 15:21:14 -0000	1.13
  @@ -54,37 +54,23 @@
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
   import java.io.File;
  -
  -import java.io.IOException;
  -
   import java.io.FileOutputStream;
  -
  +import java.io.IOException;
   import java.io.InputStream;
  +import java.util.Enumeration;
  +import java.util.Hashtable;
  +import java.util.Iterator;
  +import java.util.jar.JarEntry;
   import java.util.jar.JarFile;
  -
   import java.util.jar.JarOutputStream;
  -
  -import java.util.jar.JarEntry;
  -import java.util.Iterator;
  -
  -import java.util.Hashtable;
  -
  -import java.util.Enumeration;
  -
  -
  -import org.apache.tools.ant.Project;
  -
  -import org.apache.tools.ant.BuildException;
  -
   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;
  +import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  -
  -import org.apache.tools.ant.types.Path;
  -
   import org.apache.tools.ant.types.Environment;
  -
  -import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.types.Path;
   
   /**
    * Websphere deployment tool that augments the ejbjar task.
  
  
  
  1.2       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java
  
  Index: ExtensionSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ExtensionSet.java	30 Apr 2002 03:45:39 -0000	1.1
  +++ ExtensionSet.java	25 Jul 2002 15:21:15 -0000	1.2
  @@ -58,8 +58,8 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.DataType;
  -import org.apache.tools.ant.types.Reference;
   import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.types.Reference;
   
   /**
    * The Extension set lists a set of "Optional Packages" /
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java
  
  Index: JarLibManifestTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JarLibManifestTask.java	9 Jul 2002 21:06:06 -0000	1.2
  +++ JarLibManifestTask.java	25 Jul 2002 15:21:15 -0000	1.3
  @@ -61,8 +61,8 @@
   import java.util.jar.Attributes;
   import java.util.jar.Manifest;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   
   /**
    * Generates a manifest that declares all the dependencies.
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
  
  Index: JarLibResolveTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JarLibResolveTask.java	9 Jul 2002 21:06:06 -0000	1.4
  +++ JarLibResolveTask.java	25 Jul 2002 15:21:15 -0000	1.5
  @@ -59,9 +59,9 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.taskdefs.optional.extension.resolvers.AntResolver;
   import org.apache.tools.ant.taskdefs.optional.extension.resolvers.LocationResolver;
   import org.apache.tools.ant.taskdefs.optional.extension.resolvers.URLResolver;
  -import org.apache.tools.ant.taskdefs.optional.extension.resolvers.AntResolver;
   
   /**
    * Tries to locate a JAR to satisfy an extension and place
  
  
  
  1.16      +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
  
  Index: Translate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Translate.java	23 Jul 2002 08:39:57 -0000	1.15
  +++ Translate.java	25 Jul 2002 15:21:15 -0000	1.16
  @@ -53,23 +53,23 @@
    */
   package org.apache.tools.ant.taskdefs.optional.i18n;
   
  +import java.io.BufferedReader;
  +import java.io.BufferedWriter;
   import java.io.File;
   import java.io.FileInputStream;
  +import java.io.FileOutputStream;
   import java.io.IOException;
  -import java.io.BufferedReader;
   import java.io.InputStreamReader;
  -import java.io.FileOutputStream;
  -import java.io.BufferedWriter;
   import java.io.OutputStreamWriter;
  -import java.util.Vector;
   import java.util.Hashtable;
   import java.util.Locale;
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.util.FileUtils;
  -import org.apache.tools.ant.taskdefs.MatchingTask;
   
   /**
    * Translates text embedded in files using Resource Bundle files.
  
  
  
  1.11      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java
  
  Index: VAJAntTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- VAJAntTool.java	15 Apr 2002 14:56:32 -0000	1.10
  +++ VAJAntTool.java	25 Jul 2002 15:21:15 -0000	1.11
  @@ -57,7 +57,6 @@
   
   import com.ibm.ivj.util.base.Project;
   import com.ibm.ivj.util.base.ToolData;
  -
   import org.apache.tools.ant.BuildException;
   
   
  
  
  
  1.15      +22 -24    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
  
  Index: VAJAntToolGUI.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- VAJAntToolGUI.java	15 Apr 2002 14:56:32 -0000	1.14
  +++ VAJAntToolGUI.java	25 Jul 2002 15:21:15 -0000	1.15
  @@ -55,45 +55,43 @@
   package org.apache.tools.ant.taskdefs.optional.ide;
   
   
  -import java.util.Vector;
  -import java.awt.Frame;
  -import java.awt.Dialog;
  -import java.awt.Panel;
  -import java.awt.MenuBar;
  -import java.awt.Menu;
  -import java.awt.MenuItem;
  -import java.awt.Label;
  -import java.awt.TextField;
  -import java.awt.TextArea;
  -import java.awt.List;
  -import java.awt.Choice;
  +import java.awt.BorderLayout;
   import java.awt.Button;
  +import java.awt.Choice;
  +import java.awt.Dialog;
   import java.awt.FileDialog;
   import java.awt.FlowLayout;
  -import java.awt.BorderLayout;
  -import java.awt.GridBagLayout;
  +import java.awt.Font;
  +import java.awt.Frame;
   import java.awt.GridBagConstraints;
  +import java.awt.GridBagLayout;
   import java.awt.Insets;
  -import java.awt.Toolkit;
  -import java.awt.Font;
  +import java.awt.Label;
  +import java.awt.List;
  +import java.awt.Menu;
  +import java.awt.MenuBar;
  +import java.awt.MenuItem;
  +import java.awt.Panel;
   import java.awt.SystemColor;
  -import java.awt.event.ActionListener;
  -import java.awt.event.ItemListener;
  -import java.awt.event.TextListener;
  -import java.awt.event.WindowListener;
  +import java.awt.TextArea;
  +import java.awt.TextField;
  +import java.awt.Toolkit;
   import java.awt.event.ActionEvent;
  +import java.awt.event.ActionListener;
   import java.awt.event.ItemEvent;
  +import java.awt.event.ItemListener;
   import java.awt.event.TextEvent;
  +import java.awt.event.TextListener;
   import java.awt.event.WindowEvent;
  -
  +import java.awt.event.WindowListener;
   import java.beans.PropertyChangeListener;
  -
  +import java.util.Vector;
  +import org.apache.tools.ant.BuildEvent;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.BuildListener;
  -import org.apache.tools.ant.BuildEvent;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.util.StringUtils;
   import org.apache.tools.ant.util.DateUtils;
  +import org.apache.tools.ant.util.StringUtils;
   
   /**
    * This is a simple grafical user interface to provide the information needed
  
  
  
  1.9       +7 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java
  
  Index: VAJBuildInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- VAJBuildInfo.java	14 Apr 2002 11:16:18 -0000	1.8
  +++ VAJBuildInfo.java	25 Jul 2002 15:21:15 -0000	1.9
  @@ -55,19 +55,18 @@
   package org.apache.tools.ant.taskdefs.optional.ide;
   
   
  -import java.util.Vector;
  +import java.beans.PropertyChangeListener;
  +import java.beans.PropertyChangeSupport;
  +import java.io.File;
   import java.util.Enumeration;
   import java.util.StringTokenizer;
  -import java.io.File;
  -import java.beans.PropertyChangeSupport;
  -import java.beans.PropertyChangeListener;
  -
  +import java.util.Vector;
  +import org.apache.tools.ant.BuildEvent;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.BuildListener;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.ProjectHelper;
   import org.apache.tools.ant.Target;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.BuildListener;
  -import org.apache.tools.ant.BuildEvent;
   
   /**
    * This class wraps the Ant project information needed to
  
  
  
  1.9       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java
  
  Index: VAJExport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- VAJExport.java	9 Jul 2002 21:06:06 -0000	1.8
  +++ VAJExport.java	25 Jul 2002 15:21:15 -0000	1.9
  @@ -56,7 +56,6 @@
   
   
   import java.io.File;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.types.PatternSet;
   
  
  
  
  1.17      +1 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
  
  Index: VAJImport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- VAJImport.java	23 Jul 2002 07:54:53 -0000	1.16
  +++ VAJImport.java	25 Jul 2002 15:21:15 -0000	1.17
  @@ -54,14 +54,12 @@
   package org.apache.tools.ant.taskdefs.optional.ide;
   
   
  +import java.lang.reflect.Field;
   import java.util.Enumeration;
   import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
  -
   import org.apache.tools.ant.types.FileSet;
  -
  -import java.lang.reflect.Field;
   
   /**
    * Import source, class files, and resources to the Visual Age for Java
  
  
  
  1.9       +9 -11     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java
  
  Index: VAJLocalUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- VAJLocalUtil.java	15 Apr 2002 13:36:20 -0000	1.8
  +++ VAJLocalUtil.java	25 Jul 2002 15:21:15 -0000	1.9
  @@ -54,20 +54,18 @@
   
   package org.apache.tools.ant.taskdefs.optional.ide;
   
  -import java.util.Vector;
  -import java.util.Enumeration;
  -import java.io.File;
  -
  -import com.ibm.ivj.util.base.Package;
  -import com.ibm.ivj.util.base.IvjException;
  -import com.ibm.ivj.util.base.Workspace;
  -import com.ibm.ivj.util.base.ToolEnv;
   import com.ibm.ivj.util.base.ExportCodeSpec;
  -import com.ibm.ivj.util.base.ProjectEdition;
   import com.ibm.ivj.util.base.ImportCodeSpec;
  -import com.ibm.ivj.util.base.Type;
  +import com.ibm.ivj.util.base.IvjException;
  +import com.ibm.ivj.util.base.Package;
   import com.ibm.ivj.util.base.Project;
  -
  +import com.ibm.ivj.util.base.ProjectEdition;
  +import com.ibm.ivj.util.base.ToolEnv;
  +import com.ibm.ivj.util.base.Type;
  +import com.ibm.ivj.util.base.Workspace;
  +import java.io.File;
  +import java.util.Enumeration;
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   
  
  
  
  1.6       +7 -10     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java
  
  Index: VAJRemoteUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- VAJRemoteUtil.java	15 Apr 2002 06:01:37 -0000	1.5
  +++ VAJRemoteUtil.java	25 Jul 2002 15:21:15 -0000	1.6
  @@ -54,20 +54,17 @@
   
   package org.apache.tools.ant.taskdefs.optional.ide;
   
  -import java.util.Vector;
  -
  +import java.io.BufferedReader;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.InputStreamReader;
   import java.net.HttpURLConnection;
  -import java.util.Enumeration;
   import java.net.URL;
  -
  +import java.util.Enumeration;
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Task;
  -
  -import java.io.BufferedReader;
  -import java.io.IOException;
  -import java.io.InputStreamReader;
  -import java.io.InputStream;
  -import java.io.File;
   
   /**
    * Helper class for VAJ tasks. Holds Workspace singleton and
  
  
  
  1.10      +1 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java
  
  Index: VAJToolsServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- VAJToolsServlet.java	15 Apr 2002 14:56:32 -0000	1.9
  +++ VAJToolsServlet.java	25 Jul 2002 15:21:15 -0000	1.10
  @@ -57,14 +57,10 @@
   
   
   import java.io.IOException;
  -
  -
  -
  +import javax.servlet.ServletException;
   import javax.servlet.http.HttpServlet;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  -import javax.servlet.ServletException;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.util.StringUtils;
   
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java
  
  Index: VAJUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- VAJUtil.java	10 Jan 2002 13:59:36 -0000	1.7
  +++ VAJUtil.java	25 Jul 2002 15:21:15 -0000	1.8
  @@ -54,8 +54,8 @@
   
   package org.apache.tools.ant.taskdefs.optional.ide;
   
  -import java.util.Vector;
   import java.io.File;
  +import java.util.Vector;
   
   /**
    * Helper interface for VAJ tasks. Encapsulates
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java
  
  Index: GenericHotDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- GenericHotDeploymentTool.java	9 Jul 2002 21:06:07 -0000	1.7
  +++ GenericHotDeploymentTool.java	25 Jul 2002 15:21:15 -0000	1.8
  @@ -55,8 +55,8 @@
   package org.apache.tools.ant.taskdefs.optional.j2ee;
   
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.taskdefs.Java;
  +import org.apache.tools.ant.types.Commandline;
   
   /**
    *  A generic tool for J2EE server hot deployment.
  
  
  
  1.8       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
  
  Index: JonasHotDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JonasHotDeploymentTool.java	9 Jul 2002 21:06:07 -0000	1.7
  +++ JonasHotDeploymentTool.java	25 Jul 2002 15:21:15 -0000	1.8
  @@ -54,7 +54,6 @@
   package org.apache.tools.ant.taskdefs.optional.j2ee;
   
   import java.io.File;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.taskdefs.Java;
   import org.apache.tools.ant.types.Path;
  
  
  
  1.7       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java
  
  Index: ServerDeploy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ServerDeploy.java	9 Jul 2002 21:06:07 -0000	1.6
  +++ ServerDeploy.java	25 Jul 2002 15:21:15 -0000	1.7
  @@ -55,9 +55,8 @@
   package org.apache.tools.ant.taskdefs.optional.j2ee;
   
   import java.io.File;
  -import java.util.Vector;
   import java.util.Enumeration;
  -
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Task;
   
  
  
  
  1.16      +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
  
  Index: JJTree.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- JJTree.java	23 Jul 2002 07:54:53 -0000	1.15
  +++ JJTree.java	25 Jul 2002 15:21:16 -0000	1.16
  @@ -54,6 +54,10 @@
   
   package org.apache.tools.ant.taskdefs.optional.javacc;
   
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.Enumeration;
  +import java.util.Hashtable;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  @@ -62,11 +66,6 @@
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.Path;
  -
  -import java.io.File;
  -import java.io.IOException;
  -import java.util.Hashtable;
  -import java.util.Enumeration;
   
   /**
    * Runs the JJTree compiler compiler.
  
  
  
  1.19      +3 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
  
  Index: JavaCC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- JavaCC.java	23 Jul 2002 07:54:53 -0000	1.18
  +++ JavaCC.java	25 Jul 2002 15:21:16 -0000	1.19
  @@ -54,19 +54,16 @@
   
   package org.apache.tools.ant.taskdefs.optional.javacc;
   
  +import java.io.File;
  +import java.util.Enumeration;
  +import java.util.Hashtable;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.Execute;
  -
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.Path;
  -
  -import java.io.File;
  -
  -import java.util.Hashtable;
  -import java.util.Enumeration;
   
   /**
    * JavaCC compiler compiler task.
  
  
  
  1.16      +1 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
  
  Index: JDependTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- JDependTask.java	23 Jul 2002 08:39:57 -0000	1.15
  +++ JDependTask.java	25 Jul 2002 15:21:16 -0000	1.16
  @@ -58,8 +58,6 @@
   import java.io.FileWriter;
   import java.io.IOException;
   import java.io.PrintWriter;
  -
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.PathTokenizer;
   import org.apache.tools.ant.Project;
  @@ -69,9 +67,9 @@
   import org.apache.tools.ant.taskdefs.LogStreamHandler;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
  -import org.apache.tools.ant.types.EnumeratedAttribute;
   
   /**
    * Runs JDepend tests.
  
  
  
  1.9       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java
  
  Index: ClassNameReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ClassNameReader.java	15 Apr 2002 14:56:32 -0000	1.8
  +++ ClassNameReader.java	25 Jul 2002 15:21:16 -0000	1.9
  @@ -53,10 +53,10 @@
    */
   package org.apache.tools.ant.taskdefs.optional.jlink;
   
  -import java.io.IOException;
   import java.io.DataInput;
  -import java.io.InputStream;
   import java.io.DataInputStream;
  +import java.io.IOException;
  +import java.io.InputStream;
   
   /**
    * Reads just enough of a class file to determine the class' full name.
  
  
  
  1.11      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java
  
  Index: JlinkTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JlinkTask.java	23 Jul 2002 08:39:57 -0000	1.10
  +++ JlinkTask.java	25 Jul 2002 15:21:16 -0000	1.11
  @@ -53,11 +53,11 @@
    */
   package org.apache.tools.ant.taskdefs.optional.jlink;
   
  +import java.io.File;
   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 java.io.File;
   
   /**
    * This class defines objects that can link together various jar and
  
  
  
  1.7       +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
  
  Index: jlink.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jlink.java	15 Apr 2002 12:11:48 -0000	1.6
  +++ jlink.java	25 Jul 2002 15:21:16 -0000	1.7
  @@ -61,20 +61,20 @@
    */
   package org.apache.tools.ant.taskdefs.optional.jlink;
   
  -import java.io.FileOutputStream;
  +import java.io.BufferedInputStream;
   import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.InputStream;
  -import java.io.FileInputStream;
  -import java.io.BufferedInputStream;
   import java.util.Enumeration;
   import java.util.Vector;
  -import java.util.zip.ZipOutputStream;
  +import java.util.zip.CRC32;
   import java.util.zip.Deflater;
  -import java.util.zip.ZipFile;
   import java.util.zip.ZipEntry;
   import java.util.zip.ZipException;
  -import java.util.zip.CRC32;
  +import java.util.zip.ZipFile;
  +import java.util.zip.ZipOutputStream;
   
   public class jlink extends Object {
   
  
  
  
  1.24      +1 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
  
  Index: JspC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- JspC.java	23 Jul 2002 15:13:37 -0000	1.23
  +++ JspC.java	25 Jul 2002 15:21:16 -0000	1.24
  @@ -56,19 +56,15 @@
   
   import java.io.File;
   import java.util.Date;
  -
  -import java.util.Vector;
   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;
  -
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.taskdefs.optional.jsp.compilers.JspCompilerAdapter;
   import org.apache.tools.ant.taskdefs.optional.jsp.compilers.JspCompilerAdapterFactory;
  -
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
   
  
  
  
  1.12      +7 -10     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
  
  Index: WLJspc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- WLJspc.java	23 Jul 2002 08:39:57 -0000	1.11
  +++ WLJspc.java	25 Jul 2002 15:21:16 -0000	1.12
  @@ -54,19 +54,16 @@
   package org.apache.tools.ant.taskdefs.optional.jsp;
   
   //apache/ant imports
  -import org.apache.tools.ant.taskdefs.MatchingTask;
  -import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.taskdefs.Java;
  -import org.apache.tools.ant.types.Path;
  -import org.apache.tools.ant.Project;
  -
  -
  -//java imports
   import java.io.File;
  -import java.util.Vector;
   import java.util.Date;
   import java.util.StringTokenizer;
  +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.taskdefs.Java;
  +import org.apache.tools.ant.taskdefs.MatchingTask;
  +import org.apache.tools.ant.types.Path;
   
   /**
    * Precompiles JSP's using WebLogic's JSP compiler (weblogic.jspc).
  
  
  
  1.6       +3 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java
  
  Index: DefaultJspCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultJspCompilerAdapter.java	1 Jun 2002 12:26:41 -0000	1.5
  +++ DefaultJspCompilerAdapter.java	25 Jul 2002 15:21:16 -0000	1.6
  @@ -54,14 +54,12 @@
   
   package org.apache.tools.ant.taskdefs.optional.jsp.compilers;
   
  +import java.io.File;
  +import java.util.Enumeration;
  +import java.util.Vector;
   import org.apache.tools.ant.Project;
  -
   import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
   import org.apache.tools.ant.types.CommandlineJava;
  -
  -import java.util.Vector;
  -import java.util.Enumeration;
  -import java.io.File;
   
   /**
    * This is the default implementation for the JspCompilerAdapter interface.
  
  
  
  1.10      +4 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
  
  Index: JasperC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JasperC.java	1 Jun 2002 12:26:41 -0000	1.9
  +++ JasperC.java	25 Jul 2002 15:21:16 -0000	1.10
  @@ -54,17 +54,15 @@
   
   package org.apache.tools.ant.taskdefs.optional.jsp.compilers;
   
  +import java.io.File;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.CommandlineJava;
  -import org.apache.tools.ant.types.Path;
  +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.taskdefs.Java;
  -import org.apache.tools.ant.taskdefs.ExecuteJava;
  -
  -import java.io.File;
  +import org.apache.tools.ant.types.CommandlineJava;
  +import org.apache.tools.ant.types.Path;
   
   /**
    * The implementation of the jasper compiler.
  
  
  
  1.17      +7 -13     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
  
  Index: AggregateTransformer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- AggregateTransformer.java	15 Apr 2002 14:56:33 -0000	1.16
  +++ AggregateTransformer.java	25 Jul 2002 15:21:16 -0000	1.17
  @@ -53,24 +53,18 @@
    */
   package org.apache.tools.ant.taskdefs.optional.junit;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.types.EnumeratedAttribute;
  -
   import java.io.File;
  -import java.io.InputStream;
   import java.io.FileInputStream;
  -import java.io.IOException;
   import java.io.FileNotFoundException;
  -
  -
  -
  +import java.io.IOException;
  +import java.io.InputStream;
   import java.net.URL;
  -
  -import javax.xml.parsers.DocumentBuilderFactory;
   import javax.xml.parsers.DocumentBuilder;
  -
  +import javax.xml.parsers.DocumentBuilderFactory;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.w3c.dom.Document;
   
   /**
  
  
  
  1.12      +3 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java
  
  Index: BatchTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BatchTest.java	15 Apr 2002 12:11:48 -0000	1.11
  +++ BatchTest.java	25 Jul 2002 15:21:16 -0000	1.12
  @@ -55,14 +55,12 @@
   package org.apache.tools.ant.taskdefs.optional.junit;
   
   
  +import java.io.File;
  +import java.util.Enumeration;
  +import java.util.Vector;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.FileSet;
  -
  -
  -import java.util.Enumeration;
  -import java.util.Vector;
  -import java.io.File;
   
   /**
    * <p> Create then run <code>JUnitTest</code>'s based on the list of files given by the fileset attribute.
  
  
  
  1.9       +0 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java
  
  Index: BriefJUnitResultFormatter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BriefJUnitResultFormatter.java	16 Jan 2002 11:25:48 -0000	1.8
  +++ BriefJUnitResultFormatter.java	25 Jul 2002 15:21:16 -0000	1.9
  @@ -59,10 +59,8 @@
   import java.io.PrintWriter;
   import java.io.StringWriter;
   import java.text.NumberFormat;
  -
   import junit.framework.AssertionFailedError;
   import junit.framework.Test;
  -
   import org.apache.tools.ant.BuildException;
   
   /**
  
  
  
  1.6       +6 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java
  
  Index: DOMUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DOMUtil.java	15 Apr 2002 12:11:48 -0000	1.5
  +++ DOMUtil.java	25 Jul 2002 15:21:16 -0000	1.6
  @@ -53,20 +53,18 @@
    */
   package org.apache.tools.ant.taskdefs.optional.junit;
   
  -import org.w3c.dom.Node;
  -import org.w3c.dom.Document;
  +import java.util.Vector;
  +import org.w3c.dom.Attr;
   import org.w3c.dom.CDATASection;
   import org.w3c.dom.Comment;
  +import org.w3c.dom.DOMException;
  +import org.w3c.dom.Document;
   import org.w3c.dom.Element;
   import org.w3c.dom.NamedNodeMap;
  -import org.w3c.dom.Attr;
  -
  +import org.w3c.dom.Node;
  +import org.w3c.dom.NodeList;
   import org.w3c.dom.ProcessingInstruction;
   import org.w3c.dom.Text;
  -import org.w3c.dom.NodeList;
  -import org.w3c.dom.DOMException;
  -
  -import java.util.Vector;
   
   /**
    * Some utilities that might be useful when manipulating DOM trees.
  
  
  
  1.9       +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java
  
  Index: FormatterElement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FormatterElement.java	15 Apr 2002 12:11:48 -0000	1.8
  +++ FormatterElement.java	25 Jul 2002 15:21:16 -0000	1.9
  @@ -54,12 +54,11 @@
   
   package org.apache.tools.ant.taskdefs.optional.junit;
   
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.types.EnumeratedAttribute;
  -
   import java.io.File;
   import java.io.FileOutputStream;
   import java.io.OutputStream;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
   
   /**
    * <p> A wrapper for the implementations of <code>JUnitResultFormatter</code>.
  
  
  
  1.9       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java
  
  Index: JUnitResultFormatter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JUnitResultFormatter.java	15 Apr 2002 12:11:48 -0000	1.8
  +++ JUnitResultFormatter.java	25 Jul 2002 15:21:16 -0000	1.9
  @@ -55,8 +55,8 @@
   package org.apache.tools.ant.taskdefs.optional.junit;
   
   import java.io.OutputStream;
  -import org.apache.tools.ant.BuildException;
   import junit.framework.TestListener;
  +import org.apache.tools.ant.BuildException;
   
   /**
    * This Interface describes classes that format the results of a JUnit
  
  
  
  1.48      +13 -16    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
  
  Index: JUnitTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- JUnitTask.java	23 Jul 2002 08:39:57 -0000	1.47
  +++ JUnitTask.java	25 Jul 2002 15:21:16 -0000	1.48
  @@ -54,32 +54,29 @@
   
   package org.apache.tools.ant.taskdefs.optional.junit;
   
  +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;
  +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.Task;
   import org.apache.tools.ant.taskdefs.Execute;
  -import org.apache.tools.ant.taskdefs.LogStreamHandler;
   import org.apache.tools.ant.taskdefs.ExecuteWatchdog;
   import org.apache.tools.ant.taskdefs.LogOutputStream;
  +import org.apache.tools.ant.taskdefs.LogStreamHandler;
   import org.apache.tools.ant.types.Commandline;
  -import org.apache.tools.ant.types.Environment;
   import org.apache.tools.ant.types.CommandlineJava;
  -import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.types.Environment;
  +import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.util.FileUtils;
  -
  -import java.io.File;
  -import java.io.FileOutputStream;
  -import java.io.IOException;
  -import java.io.OutputStream;
  -
  -import java.util.Enumeration;
  -import java.util.Hashtable;
  -import java.util.Properties;
  -import java.util.Vector;
  -
  -import java.net.URL;
   
   /**
    * Runs JUnit tests.
  
  
  
  1.13      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
  
  Index: JUnitTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- JUnitTest.java	15 Apr 2002 12:11:48 -0000	1.12
  +++ JUnitTest.java	25 Jul 2002 15:21:16 -0000	1.13
  @@ -54,12 +54,11 @@
   
   package org.apache.tools.ant.taskdefs.optional.junit;
   
  -import org.apache.tools.ant.Project;
  -
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Properties;
   import java.util.Vector;
  +import org.apache.tools.ant.Project;
   
   /**
    * <p> Run a single JUnit test.
  
  
  
  1.25      +10 -12    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
  
  Index: JUnitTestRunner.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- JUnitTestRunner.java	22 Jun 2002 23:38:37 -0000	1.24
  +++ JUnitTestRunner.java	25 Jul 2002 15:21:16 -0000	1.25
  @@ -54,18 +54,6 @@
   
   package org.apache.tools.ant.taskdefs.optional.junit;
   
  -import org.apache.tools.ant.AntClassLoader;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.util.StringUtils;
  -
  -import junit.framework.TestListener;
  -import junit.framework.TestResult;
  -import junit.framework.Test;
  -import junit.framework.TestSuite;
  -import junit.framework.AssertionFailedError;
  -import java.lang.reflect.Method;
  -
   import java.io.BufferedReader;
   import java.io.ByteArrayOutputStream;
   import java.io.File;
  @@ -76,10 +64,20 @@
   import java.io.PrintWriter;
   import java.io.StringReader;
   import java.io.StringWriter;
  +import java.lang.reflect.Method;
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Properties;
   import java.util.Vector;
  +import junit.framework.AssertionFailedError;
  +import junit.framework.Test;
  +import junit.framework.TestListener;
  +import junit.framework.TestResult;
  +import junit.framework.TestSuite;
  +import org.apache.tools.ant.AntClassLoader;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.util.StringUtils;
   
   /**
    * Simple Testrunner for JUnit that runs all tests of a testsuite.
  
  
  
  1.3       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
  
  Index: JUnitVersionHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JUnitVersionHelper.java	15 Nov 2001 08:47:49 -0000	1.2
  +++ JUnitVersionHelper.java	25 Jul 2002 15:21:16 -0000	1.3
  @@ -55,7 +55,6 @@
   package org.apache.tools.ant.taskdefs.optional.junit;
   
   import java.lang.reflect.Method;
  -
   import junit.framework.Test;
   import junit.framework.TestCase;
   
  
  
  
  1.15      +3 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
  
  Index: PlainJUnitResultFormatter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- PlainJUnitResultFormatter.java	15 Apr 2002 12:11:48 -0000	1.14
  +++ PlainJUnitResultFormatter.java	25 Jul 2002 15:21:16 -0000	1.15
  @@ -54,17 +54,15 @@
   
   package org.apache.tools.ant.taskdefs.optional.junit;
   
  -import org.apache.tools.ant.BuildException;
  -
  +import java.io.IOException;
   import java.io.OutputStream;
  -import java.io.StringWriter;
   import java.io.PrintWriter;
  -import java.io.IOException;
  +import java.io.StringWriter;
   import java.text.NumberFormat;
   import java.util.Hashtable;
  -
   import junit.framework.AssertionFailedError;
   import junit.framework.Test;
  +import org.apache.tools.ant.BuildException;
   
   
   /**
  
  
  
  1.9       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java
  
  Index: SummaryJUnitResultFormatter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SummaryJUnitResultFormatter.java	15 Apr 2002 12:11:48 -0000	1.8
  +++ SummaryJUnitResultFormatter.java	25 Jul 2002 15:21:16 -0000	1.9
  @@ -54,12 +54,11 @@
   
   package org.apache.tools.ant.taskdefs.optional.junit;
   
  -import java.text.NumberFormat;
   import java.io.IOException;
   import java.io.OutputStream;
  +import java.text.NumberFormat;
   import junit.framework.AssertionFailedError;
   import junit.framework.Test;
  -
   import org.apache.tools.ant.BuildException;
   
   /**
  
  
  
  1.24      +7 -12     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
  
  Index: XMLJUnitResultFormatter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- XMLJUnitResultFormatter.java	21 Apr 2002 17:29:31 -0000	1.23
  +++ XMLJUnitResultFormatter.java	25 Jul 2002 15:21:16 -0000	1.24
  @@ -54,27 +54,22 @@
   
   package org.apache.tools.ant.taskdefs.optional.junit;
   
  +import java.io.IOException;
   import java.io.OutputStream;
  -import java.io.Writer;
   import java.io.OutputStreamWriter;
  -import java.io.IOException;
  -
  -
  -
  -
  -import java.util.Properties;
  +import java.io.Writer;
   import java.util.Enumeration;
   import java.util.Hashtable;
  +import java.util.Properties;
   import javax.xml.parsers.DocumentBuilder;
   import javax.xml.parsers.DocumentBuilderFactory;
  +import junit.framework.AssertionFailedError;
  +import junit.framework.Test;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.util.DOMElementWriter;
   import org.w3c.dom.Document;
   import org.w3c.dom.Element;
   import org.w3c.dom.Text;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.util.DOMElementWriter;
  -
  -import junit.framework.AssertionFailedError;
  -import junit.framework.Test;
   
   
   /**
  
  
  
  1.20      +6 -10     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
  
  Index: XMLResultAggregator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- XMLResultAggregator.java	23 Jul 2002 07:54:54 -0000	1.19
  +++ XMLResultAggregator.java	25 Jul 2002 15:21:16 -0000	1.20
  @@ -54,29 +54,25 @@
   package org.apache.tools.ant.taskdefs.optional.junit;
   
   import java.io.File;
  +import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.OutputStream;
   import java.io.OutputStreamWriter;
   import java.io.PrintWriter;
  -
  -import java.io.FileOutputStream;
   import java.util.Enumeration;
   import java.util.Vector;
  -
  -import org.w3c.dom.Element;
  -import org.w3c.dom.Document;
  -
  -
  -import org.xml.sax.SAXException;
   import javax.xml.parsers.DocumentBuilder;
   import javax.xml.parsers.DocumentBuilderFactory;
  +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.DirectoryScanner;
  -import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.util.DOMElementWriter;
   import org.apache.tools.ant.util.StringUtils;
  +import org.w3c.dom.Document;
  +import org.w3c.dom.Element;
  +import org.xml.sax.SAXException;
   
   
   /**
  
  
  
  1.9       +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java
  
  Index: Xalan1Executor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Xalan1Executor.java	15 Apr 2002 12:11:48 -0000	1.8
  +++ Xalan1Executor.java	25 Jul 2002 15:21:17 -0000	1.9
  @@ -54,10 +54,9 @@
   package org.apache.tools.ant.taskdefs.optional.junit;
   
   import java.io.OutputStream;
  -
  -import org.apache.xalan.xslt.XSLTProcessorFactory;
  -import org.apache.xalan.xslt.XSLTProcessor;
   import org.apache.xalan.xslt.XSLTInputSource;
  +import org.apache.xalan.xslt.XSLTProcessor;
  +import org.apache.xalan.xslt.XSLTProcessorFactory;
   import org.apache.xalan.xslt.XSLTResultTarget;
   
   /**
  
  
  
  1.6       +3 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java
  
  Index: Xalan2Executor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Xalan2Executor.java	3 Apr 2002 13:18:03 -0000	1.5
  +++ Xalan2Executor.java	25 Jul 2002 15:21:17 -0000	1.6
  @@ -54,14 +54,13 @@
   package org.apache.tools.ant.taskdefs.optional.junit;
   
   import java.io.OutputStream;
  -
  +import javax.xml.transform.Result;
  +import javax.xml.transform.Source;
   import javax.xml.transform.Transformer;
   import javax.xml.transform.TransformerFactory;
  -import javax.xml.transform.Source;
  -import javax.xml.transform.Result;
   import javax.xml.transform.dom.DOMSource;
  -import javax.xml.transform.stream.StreamSource;
   import javax.xml.transform.stream.StreamResult;
  +import javax.xml.transform.stream.StreamSource;
   
   /**
    * Xalan executor via JAXP. Nothing special must exists in the classpath
  
  
  
  1.5       +3 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java
  
  Index: XalanExecutor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XalanExecutor.java	3 Apr 2002 13:18:03 -0000	1.4
  +++ XalanExecutor.java	25 Jul 2002 15:21:17 -0000	1.5
  @@ -53,15 +53,13 @@
    */
   package org.apache.tools.ant.taskdefs.optional.junit;
   
  -import org.apache.tools.ant.BuildException;
  -
  +import java.io.ByteArrayOutputStream;
   import java.io.File;
  +import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.OutputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.FileOutputStream;
  -
   import java.lang.reflect.Field;
  +import org.apache.tools.ant.BuildException;
   
   /**
    * Command class that encapsulate specific behavior for each
  
  
  
  1.10      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
  
  Index: AbstractMetamataTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AbstractMetamataTask.java	23 Jul 2002 07:54:54 -0000	1.9
  +++ AbstractMetamataTask.java	25 Jul 2002 15:21:17 -0000	1.10
  @@ -60,7 +60,6 @@
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Vector;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  
  
  
  1.8       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
  
  Index: MAudit.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- MAudit.java	9 Jul 2002 21:06:08 -0000	1.7
  +++ MAudit.java	25 Jul 2002 15:21:17 -0000	1.8
  @@ -58,7 +58,6 @@
   import java.io.IOException;
   import java.io.OutputStream;
   import java.util.Vector;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
  
  
  
  1.3       +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java
  
  Index: MAuditParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MAuditParser.java	15 Apr 2002 14:56:33 -0000	1.2
  +++ MAuditParser.java	25 Jul 2002 15:21:17 -0000	1.3
  @@ -53,12 +53,11 @@
    */
   package org.apache.tools.ant.taskdefs.optional.metamata;
   
  -import java.util.Vector;
   import java.io.File;
  -
  +import java.util.Vector;
  +import org.apache.tools.ant.util.StringUtils;
   import org.apache.tools.ant.util.regexp.RegexpMatcher;
   import org.apache.tools.ant.util.regexp.RegexpMatcherFactory;
  -import org.apache.tools.ant.util.StringUtils;
   
   /**
    * Parser that will parse an output line of MAudit and return an
  
  
  
  1.7       +3 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java
  
  Index: MAuditStreamHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- MAuditStreamHandler.java	10 Apr 2002 00:19:55 -0000	1.6
  +++ MAuditStreamHandler.java	25 Jul 2002 15:21:17 -0000	1.7
  @@ -64,17 +64,15 @@
   import java.util.Vector;
   import javax.xml.parsers.DocumentBuilder;
   import javax.xml.parsers.DocumentBuilderFactory;
  -
  -import org.w3c.dom.Document;
  -import org.w3c.dom.Element;
  -
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
   import org.apache.tools.ant.taskdefs.LogOutputStream;
   import org.apache.tools.ant.taskdefs.StreamPumper;
   import org.apache.tools.ant.util.DOMElementWriter;
   import org.apache.tools.ant.util.DateUtils;
  +import org.w3c.dom.Document;
  +import org.w3c.dom.Element;
   
   /**
    * This is a very bad stream handler for the MAudit task.
  
  
  
  1.8       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java
  
  Index: MMetrics.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- MMetrics.java	23 Jul 2002 07:54:54 -0000	1.7
  +++ MMetrics.java	25 Jul 2002 15:21:17 -0000	1.8
  @@ -58,7 +58,6 @@
   import java.io.FileOutputStream;
   import java.io.IOException;
   import java.util.Vector;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
  
  
  
  1.9       +3 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java
  
  Index: MMetricsStreamHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MMetricsStreamHandler.java	15 Apr 2002 14:56:33 -0000	1.8
  +++ MMetricsStreamHandler.java	25 Jul 2002 15:21:17 -0000	1.9
  @@ -74,16 +74,14 @@
   import javax.xml.transform.sax.SAXTransformerFactory;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamResult;
  -
  -import org.xml.sax.Attributes;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributesImpl;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
   import org.apache.tools.ant.util.DateUtils;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.helpers.AttributesImpl;
   
   /**
    * A handy metrics handler. Most of this code was done only with the
  
  
  
  1.15      +6 -7      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
  
  Index: MParse.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- MParse.java	23 Jul 2002 07:54:54 -0000	1.14
  +++ MParse.java	25 Jul 2002 15:21:18 -0000	1.15
  @@ -54,19 +54,18 @@
   
   package org.apache.tools.ant.taskdefs.optional.metamata;
   
  +import java.io.File;
  +import java.io.FileWriter;
  +import java.io.IOException;
  +import java.io.PrintWriter;
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.taskdefs.Execute;
   import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
   import org.apache.tools.ant.taskdefs.LogStreamHandler;
  -import org.apache.tools.ant.taskdefs.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
  -
  -import java.io.File;
  -import java.io.IOException;
  -import java.io.FileWriter;
  -import java.io.PrintWriter;
  -import java.util.Vector;
   
   /**
    * Simple Metamata MParse task.
  
  
  
  1.26      +8 -9      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
  
  Index: FTP.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- FTP.java	23 Jul 2002 07:54:54 -0000	1.25
  +++ FTP.java	25 Jul 2002 15:21:18 -0000	1.26
  @@ -56,15 +56,6 @@
   import com.oroinc.net.ftp.FTPClient;
   import com.oroinc.net.ftp.FTPFile;
   import com.oroinc.net.ftp.FTPReply;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.FileScanner;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.types.EnumeratedAttribute;
  -import org.apache.tools.ant.types.FileSet;
  -import org.apache.tools.ant.util.FileUtils;
  -
   import java.io.BufferedInputStream;
   import java.io.BufferedOutputStream;
   import java.io.BufferedWriter;
  @@ -77,6 +68,14 @@
   import java.io.OutputStream;
   import java.util.Locale;
   import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.FileScanner;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.util.FileUtils;
   
   /**
    * Basic FTP client. Performs the following actions:
  
  
  
  1.7       +6 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
  
  Index: SetProxy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SetProxy.java	23 Jul 2002 15:13:37 -0000	1.6
  +++ SetProxy.java	25 Jul 2002 15:21:18 -0000	1.7
  @@ -54,11 +54,12 @@
   
   package org.apache.tools.ant.taskdefs.optional.net;
   
  -import java.io.*;
  -import java.net.*;
  -import java.util.*;
  -import java.lang.reflect.*;
  -import org.apache.tools.ant.*;
  +import java.lang.reflect.InvocationTargetException;
  +import java.lang.reflect.Method;
  +import java.util.Properties;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.util.JavaEnvUtils;
   
   /**
  
  
  
  1.17      +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
  
  Index: TelnetTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- TelnetTask.java	23 Jul 2002 15:13:37 -0000	1.16
  +++ TelnetTask.java	25 Jul 2002 15:21:18 -0000	1.17
  @@ -55,16 +55,15 @@
   package org.apache.tools.ant.taskdefs.optional.net;
   
   import com.oroinc.net.telnet.TelnetClient;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.Task;
  -
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.OutputStream;
   import java.util.Calendar;
   import java.util.Enumeration;
   import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   
   /**
    * Automates the telnet protocol.
  
  
  
  1.10      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java
  
  Index: P4Add.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- P4Add.java	23 Jul 2002 07:54:55 -0000	1.9
  +++ P4Add.java	25 Jul 2002 15:21:18 -0000	1.10
  @@ -62,7 +62,6 @@
   
   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;
  
  
  
  1.18      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
  
  Index: P4Base.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- P4Base.java	23 Jul 2002 07:54:55 -0000	1.17
  +++ P4Base.java	25 Jul 2002 15:21:18 -0000	1.18
  @@ -60,7 +60,6 @@
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
   import java.io.IOException;
  -
   import org.apache.oro.text.perl.Perl5Util;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  
  
  
  1.6       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java
  
  Index: P4HandlerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- P4HandlerAdapter.java	10 Jan 2002 13:59:38 -0000	1.5
  +++ P4HandlerAdapter.java	25 Jul 2002 15:21:18 -0000	1.6
  @@ -60,7 +60,6 @@
   import java.io.InputStreamReader;
   import java.io.OutputStream;
   import java.io.SequenceInputStream;
  -
   import org.apache.tools.ant.BuildException;
   
   public abstract class P4HandlerAdapter implements P4Handler {
  
  
  
  1.12      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java
  
  Index: P4Label.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- P4Label.java	9 Jul 2002 21:06:10 -0000	1.11
  +++ P4Label.java	25 Jul 2002 15:21:18 -0000	1.12
  @@ -61,7 +61,6 @@
   
   import java.text.SimpleDateFormat;
   import java.util.Date;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   
  
  
  
  1.18      +8 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
  
  Index: Pvcs.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Pvcs.java	23 Jul 2002 08:39:58 -0000	1.17
  +++ Pvcs.java	25 Jul 2002 15:21:18 -0000	1.18
  @@ -53,26 +53,26 @@
    */
   package org.apache.tools.ant.taskdefs.optional.pvcs;
   
  +import java.io.BufferedReader;
  +import java.io.BufferedWriter;
   import java.io.File;
  -import java.io.FileOutputStream;
  -import java.io.IOException;
   import java.io.FileNotFoundException;
  -import java.io.BufferedReader;
  +import java.io.FileOutputStream;
   import java.io.FileReader;
  -import java.io.BufferedWriter;
   import java.io.FileWriter;
  -import java.util.Enumeration;
  -import java.util.Vector;
  -import java.text.ParseException;
  +import java.io.IOException;
   import java.text.MessageFormat;
  +import java.text.ParseException;
  +import java.util.Enumeration;
   import java.util.Random;
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.Execute;
  +import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
   import org.apache.tools.ant.taskdefs.LogOutputStream;
   import org.apache.tools.ant.taskdefs.LogStreamHandler;
   import org.apache.tools.ant.taskdefs.PumpStreamHandler;
  -import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  
  
  
  1.19      +1 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
  
  Index: AntStarTeamCheckOut.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- AntStarTeamCheckOut.java	9 Jul 2002 21:06:11 -0000	1.18
  +++ AntStarTeamCheckOut.java	25 Jul 2002 15:21:19 -0000	1.19
  @@ -53,8 +53,6 @@
    */
   package org.apache.tools.ant.taskdefs.optional.scm;
   
  -import java.util.StringTokenizer;
  -
   import com.starbase.starteam.Folder;
   import com.starbase.starteam.Item;
   import com.starbase.starteam.Property;
  @@ -63,7 +61,7 @@
   import com.starbase.starteam.Type;
   import com.starbase.starteam.View;
   import com.starbase.util.Platform;
  -
  +import java.util.StringTokenizer;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  
  
  
  1.13      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
  
  Index: CovMerge.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- CovMerge.java	23 Jul 2002 07:54:55 -0000	1.12
  +++ CovMerge.java	25 Jul 2002 15:21:19 -0000	1.13
  @@ -60,7 +60,6 @@
   import java.io.PrintWriter;
   import java.util.Random;
   import java.util.Vector;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  
  
  
  1.14      +1 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
  
  Index: CovReport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CovReport.java	23 Jul 2002 07:54:55 -0000	1.13
  +++ CovReport.java	25 Jul 2002 15:21:19 -0000	1.14
  @@ -64,9 +64,6 @@
   import javax.xml.transform.TransformerFactory;
   import javax.xml.transform.dom.DOMSource;
   import javax.xml.transform.stream.StreamResult;
  -
  -import org.w3c.dom.Document;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  @@ -75,6 +72,7 @@
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.Path;
  +import org.w3c.dom.Document;
   
   
   /**
  
  
  
  1.13      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
  
  Index: Coverage.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Coverage.java	23 Jul 2002 07:54:55 -0000	1.12
  +++ Coverage.java	25 Jul 2002 15:21:19 -0000	1.13
  @@ -62,7 +62,6 @@
   import java.io.StringWriter;
   import java.util.Random;
   import java.util.Vector;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  
  
  
  1.6       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java
  
  Index: ReportFilters.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ReportFilters.java	26 Jan 2002 20:36:50 -0000	1.5
  +++ ReportFilters.java	25 Jul 2002 15:21:19 -0000	1.6
  @@ -55,7 +55,6 @@
   package org.apache.tools.ant.taskdefs.optional.sitraka;
   
   import java.util.Vector;
  -
   import org.apache.tools.ant.util.regexp.RegexpMatcher;
   import org.apache.tools.ant.util.regexp.RegexpMatcherFactory;
   
  
  
  
  1.8       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java
  
  Index: Triggers.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Triggers.java	9 Jul 2002 21:06:12 -0000	1.7
  +++ Triggers.java	25 Jul 2002 15:21:19 -0000	1.8
  @@ -56,7 +56,6 @@
   
   import java.util.Hashtable;
   import java.util.Vector;
  -
   import org.apache.tools.ant.BuildException;
   
   /**
  
  
  
  1.12      +5 -7      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java
  
  Index: XMLReport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- XMLReport.java	25 Feb 2002 15:16:05 -0000	1.11
  +++ XMLReport.java	25 Jul 2002 15:21:19 -0000	1.12
  @@ -61,19 +61,17 @@
   import java.util.Vector;
   import javax.xml.parsers.DocumentBuilder;
   import javax.xml.parsers.DocumentBuilderFactory;
  -
  -import org.w3c.dom.Document;
  -import org.w3c.dom.Element;
  -import org.w3c.dom.Node;
  -import org.w3c.dom.NodeList;
  -import org.xml.sax.InputSource;
  -
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassFile;
   import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassPathLoader;
   import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.MethodInfo;
   import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.Utils;
  +import org.w3c.dom.Document;
  +import org.w3c.dom.Element;
  +import org.w3c.dom.Node;
  +import org.w3c.dom.NodeList;
  +import org.xml.sax.InputSource;
   
   /**
    * Little hack to process XML report from JProbe. It will fix
  
  
  
  1.5       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java
  
  Index: ClassFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ClassFile.java	18 Nov 2001 20:19:36 -0000	1.4
  +++ ClassFile.java	25 Jul 2002 15:21:19 -0000	1.5
  @@ -56,7 +56,6 @@
   import java.io.DataInputStream;
   import java.io.IOException;
   import java.io.InputStream;
  -
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ClassCPInfo;
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
  
  
  
  1.8       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java
  
  Index: MethodInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- MethodInfo.java	26 Feb 2002 10:17:31 -0000	1.7
  +++ MethodInfo.java	25 Jul 2002 15:21:19 -0000	1.8
  @@ -55,7 +55,6 @@
   
   import java.io.DataInputStream;
   import java.io.IOException;
  -
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
   import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfo;
   
  
  
  
  1.7       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java
  
  Index: Utils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Utils.java	16 Apr 2002 06:43:04 -0000	1.6
  +++ Utils.java	25 Jul 2002 15:21:19 -0000	1.7
  @@ -55,7 +55,6 @@
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode;
   
   import java.util.Vector;
  -
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
   
  
  
  
  1.10      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java
  
  Index: SOS.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SOS.java	23 Jul 2002 15:13:38 -0000	1.9
  +++ SOS.java	25 Jul 2002 15:21:20 -0000	1.10
  @@ -54,7 +54,6 @@
   package org.apache.tools.ant.taskdefs.optional.sos;
   
   import java.io.File;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  
  
  
  1.10      +12 -17    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
  
  Index: AntSoundPlayer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AntSoundPlayer.java	15 Apr 2002 13:36:21 -0000	1.9
  +++ AntSoundPlayer.java	25 Jul 2002 15:21:20 -0000	1.10
  @@ -55,26 +55,21 @@
   package org.apache.tools.ant.taskdefs.optional.sound;
   
   // ant includes
  -import org.apache.tools.ant.BuildListener;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.BuildEvent;
  -
  -// imports for all the sound classes required
  -// note: comes with jmf or jdk1.3 +
  -// these can be obtained from http://java.sun.com/products/java-media/sound/
  -import javax.sound.sampled.LineListener;
  -import javax.sound.sampled.Clip;
  +import java.io.File;
  +import java.io.IOException;
  +import javax.sound.sampled.AudioFormat;
   import javax.sound.sampled.AudioInputStream;
   import javax.sound.sampled.AudioSystem;
  -import javax.sound.sampled.UnsupportedAudioFileException;
  -import javax.sound.sampled.AudioFormat;
  +import javax.sound.sampled.Clip;
   import javax.sound.sampled.DataLine;
  -import javax.sound.sampled.LineUnavailableException;
  -import javax.sound.sampled.LineEvent;
   import javax.sound.sampled.Line;
  -
  -import java.io.File;
  -import java.io.IOException;
  +import javax.sound.sampled.LineEvent;
  +import javax.sound.sampled.LineListener;
  +import javax.sound.sampled.LineUnavailableException;
  +import javax.sound.sampled.UnsupportedAudioFileException;
  +import org.apache.tools.ant.BuildEvent;
  +import org.apache.tools.ant.BuildListener;
  +import org.apache.tools.ant.Project;
   
   
   
  
  
  
  1.9       +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java
  
  Index: SoundTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SoundTask.java	9 Jul 2002 21:06:13 -0000	1.8
  +++ SoundTask.java	25 Jul 2002 15:21:20 -0000	1.9
  @@ -54,13 +54,12 @@
   
   package org.apache.tools.ant.taskdefs.optional.sound;
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.BuildException;
  -
   import java.io.File;
   import java.util.Random;
   import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   
   /**
    * Plays a sound file at the end of the build, according to whether the build failed or succeeded.
  
  
  
  1.4       +10 -11    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java
  
  Index: SplashScreen.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SplashScreen.java	15 Apr 2002 12:11:49 -0000	1.3
  +++ SplashScreen.java	25 Jul 2002 15:21:20 -0000	1.4
  @@ -54,22 +54,21 @@
   
   package org.apache.tools.ant.taskdefs.optional.splash;
   
  -import org.apache.tools.ant.BuildEvent;
  -import org.apache.tools.ant.BuildListener;
  -
  -import javax.swing.JWindow;
  -import javax.swing.JLabel;
  -import javax.swing.JPanel;
  -import javax.swing.JProgressBar;
  -import javax.swing.BorderFactory;
  -import javax.swing.ImageIcon;
  -import java.awt.event.ActionListener;
  -import java.awt.event.ActionEvent;
   import java.awt.BorderLayout;
   import java.awt.Color;
   import java.awt.Dimension;
   import java.awt.Font;
   import java.awt.Toolkit;
  +import java.awt.event.ActionEvent;
  +import java.awt.event.ActionListener;
  +import javax.swing.BorderFactory;
  +import javax.swing.ImageIcon;
  +import javax.swing.JLabel;
  +import javax.swing.JPanel;
  +import javax.swing.JProgressBar;
  +import javax.swing.JWindow;
  +import org.apache.tools.ant.BuildEvent;
  +import org.apache.tools.ant.BuildListener;
   
   class SplashScreen extends JWindow implements ActionListener, BuildListener {
   
  
  
  
  1.5       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
  
  Index: SplashTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SplashTask.java	9 Jul 2002 21:06:13 -0000	1.4
  +++ SplashTask.java	25 Jul 2002 15:21:20 -0000	1.5
  @@ -54,10 +54,10 @@
   
   package org.apache.tools.ant.taskdefs.optional.splash;
   
  -import java.io.InputStream;
  -import java.io.DataInputStream;
   import java.io.ByteArrayOutputStream;
  +import java.io.DataInputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   import java.net.URL;
   import java.net.URLConnection;
   import javax.swing.ImageIcon;
  
  
  
  1.7       +4 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java
  
  Index: StarTeamCheckin.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- StarTeamCheckin.java	9 Jul 2002 21:06:13 -0000	1.6
  +++ StarTeamCheckin.java	25 Jul 2002 15:21:20 -0000	1.7
  @@ -53,18 +53,16 @@
    */
   package org.apache.tools.ant.taskdefs.optional.starteam;
   
  -import java.io.FileInputStream;
  -import java.io.IOException;
  -import java.util.Enumeration;
  -import java.util.Hashtable;
  -
   import com.starbase.starteam.File;
   import com.starbase.starteam.Folder;
   import com.starbase.starteam.Item;
   import com.starbase.starteam.Status;
   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;
   
  
  
  
  1.12      +3 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
  
  Index: StarTeamCheckout.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StarTeamCheckout.java	23 Jul 2002 15:13:37 -0000	1.11
  +++ StarTeamCheckout.java	25 Jul 2002 15:21:20 -0000	1.12
  @@ -53,17 +53,15 @@
    */
   package org.apache.tools.ant.taskdefs.optional.starteam;
   
  -import java.io.IOException;
  -import java.util.Enumeration;
  -import java.util.Hashtable;
  -
   import com.starbase.starteam.File;
   import com.starbase.starteam.Folder;
   import com.starbase.starteam.Item;
   import com.starbase.starteam.Status;
   import com.starbase.starteam.View;
   import com.starbase.starteam.ViewConfiguration;
  -
  +import java.io.IOException;
  +import java.util.Enumeration;
  +import java.util.Hashtable;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   
  
  
  
  1.11      +3 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
  
  Index: StarTeamLabel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- StarTeamLabel.java	9 Jul 2002 21:06:13 -0000	1.10
  +++ StarTeamLabel.java	25 Jul 2002 15:21:20 -0000	1.11
  @@ -53,15 +53,13 @@
    */
   package org.apache.tools.ant.taskdefs.optional.starteam;
   
  -import java.text.ParseException;
  -import java.text.SimpleDateFormat;
  -import java.util.Date;
  -
   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;
  +import java.util.Date;
   import org.apache.tools.ant.BuildException;
   
   /**
  
  
  
  1.8       +2 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java
  
  Index: StarTeamList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- StarTeamList.java	9 Jul 2002 21:06:13 -0000	1.7
  +++ StarTeamList.java	25 Jul 2002 15:21:20 -0000	1.8
  @@ -53,16 +53,14 @@
    */
   package org.apache.tools.ant.taskdefs.optional.starteam;
   
  -import java.io.IOException;
  -import java.util.Hashtable;
  -
   import com.starbase.starteam.File;
   import com.starbase.starteam.Folder;
   import com.starbase.starteam.Item;
   import com.starbase.starteam.Status;
   import com.starbase.starteam.View;
   import com.starbase.starteam.ViewConfiguration;
  -
  +import java.io.IOException;
  +import java.util.Hashtable;
   import org.apache.tools.ant.BuildException;
   
   /**
  
  
  
  1.8       +1 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java
  
  Index: StarTeamTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- StarTeamTask.java	9 Jul 2002 21:06:13 -0000	1.7
  +++ StarTeamTask.java	25 Jul 2002 15:21:20 -0000	1.8
  @@ -53,13 +53,11 @@
    */
   package org.apache.tools.ant.taskdefs.optional.starteam;
   
  -import java.util.StringTokenizer;
  -
   import com.starbase.starteam.Server;
   import com.starbase.starteam.StarTeamFinder;
   import com.starbase.starteam.User;
   import com.starbase.starteam.View;
  -
  +import java.util.StringTokenizer;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Task;
   
  
  
  
  1.10      +2 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
  
  Index: TreeBasedTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TreeBasedTask.java	9 Jul 2002 21:06:13 -0000	1.9
  +++ TreeBasedTask.java	25 Jul 2002 15:21:20 -0000	1.10
  @@ -53,14 +53,12 @@
    */
   package org.apache.tools.ant.taskdefs.optional.starteam;
   
  -import java.util.Hashtable;
  -import java.util.StringTokenizer;
  -
   import com.starbase.starteam.Folder;
   import com.starbase.starteam.Label;
   import com.starbase.starteam.StarTeamFinder;
   import com.starbase.starteam.View;
  -
  +import java.util.Hashtable;
  +import java.util.StringTokenizer;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   
  
  
  
  1.23      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
  
  Index: MSVSS.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- MSVSS.java	23 Jul 2002 08:39:58 -0000	1.22
  +++ MSVSS.java	25 Jul 2002 15:21:20 -0000	1.23
  @@ -56,9 +56,9 @@
   
   
   
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.Execute;
   import org.apache.tools.ant.taskdefs.LogStreamHandler;
   import org.apache.tools.ant.types.Commandline;
  
  
  
  1.13      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java
  
  Index: MSVSSCHECKIN.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- MSVSSCHECKIN.java	23 Jul 2002 15:13:37 -0000	1.12
  +++ MSVSSCHECKIN.java	25 Jul 2002 15:21:20 -0000	1.13
  @@ -54,11 +54,10 @@
   
   package org.apache.tools.ant.taskdefs.optional.vss;
   
  +import java.io.File;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
  -
  -import java.io.File;
   
   /**
    * Performs CheckIn commands to Microsoft Visual SourceSafe.
  
  
  
  1.12      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java
  
  Index: MSVSSCHECKOUT.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- MSVSSCHECKOUT.java	23 Jul 2002 08:39:59 -0000	1.11
  +++ MSVSSCHECKOUT.java	25 Jul 2002 15:21:20 -0000	1.12
  @@ -54,11 +54,10 @@
   
   package org.apache.tools.ant.taskdefs.optional.vss;
   
  +import java.io.File;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
  -
  -import java.io.File;
   
   /**
    * Performs CheckOut commands to Microsoft Visual SourceSafe.
  
  
  
  1.21      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
  
  Index: MSVSSGET.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- MSVSSGET.java	23 Jul 2002 08:39:59 -0000	1.20
  +++ MSVSSGET.java	25 Jul 2002 15:21:20 -0000	1.21
  @@ -54,11 +54,10 @@
   
   package org.apache.tools.ant.taskdefs.optional.vss;
   
  +import java.io.File;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
  -
  -import java.io.File;
   
   /**
    * Perform Get commands to Microsoft Visual SourceSafe.
  
  
  
  1.12      +7 -7      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
  
  Index: MSVSSHISTORY.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- MSVSSHISTORY.java	23 Jul 2002 08:39:59 -0000	1.11
  +++ MSVSSHISTORY.java	25 Jul 2002 15:21:20 -0000	1.12
  @@ -54,16 +54,16 @@
   
   package org.apache.tools.ant.taskdefs.optional.vss;
   
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.types.Commandline;
  -import org.apache.tools.ant.types.EnumeratedAttribute;
   import java.io.File;
  -import java.util.Date;
  -import java.util.Calendar;
  -import java.util.GregorianCalendar;
   import java.text.DateFormat;
  -import java.text.SimpleDateFormat;
   import java.text.ParseException;
  +import java.text.SimpleDateFormat;
  +import java.util.Calendar;
  +import java.util.Date;
  +import java.util.GregorianCalendar;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
   /**
    * Performs History commands to Microsoft Visual SourceSafe.
    *
  
  
  
  1.22      +3 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
  
  Index: DefaultRmicAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- DefaultRmicAdapter.java	1 Jun 2002 12:26:41 -0000	1.21
  +++ DefaultRmicAdapter.java	25 Jul 2002 15:21:21 -0000	1.22
  @@ -54,17 +54,15 @@
   
   package org.apache.tools.ant.taskdefs.rmic;
   
  +import java.io.File;
  +import java.util.Random;
  +import java.util.Vector;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.Rmic;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
  -
   import org.apache.tools.ant.util.FileNameMapper;
   import org.apache.tools.ant.util.JavaEnvUtils;
  -
  -import java.io.File;
  -import java.util.Random;
  -import java.util.Vector;
   
   /**
    * This is the default implementation for the RmicAdapter interface.
  
  
  
  1.9       +2 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java
  
  Index: KaffeRmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- KaffeRmic.java	15 Apr 2002 12:11:50 -0000	1.8
  +++ KaffeRmic.java	25 Jul 2002 15:21:21 -0000	1.9
  @@ -54,13 +54,11 @@
   
   package org.apache.tools.ant.taskdefs.rmic;
   
  +import java.lang.reflect.Constructor;
  +import java.lang.reflect.Method;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -
   import org.apache.tools.ant.types.Commandline;
  -
  -import java.lang.reflect.Constructor;
  -import java.lang.reflect.Method;
   
   /**
    * The implementation of the rmic for Kaffe
  
  
  
  1.7       +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
  
  Index: SunRmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SunRmic.java	15 Apr 2002 12:11:50 -0000	1.6
  +++ SunRmic.java	25 Jul 2002 15:21:21 -0000	1.7
  @@ -54,15 +54,14 @@
   
   package org.apache.tools.ant.taskdefs.rmic;
   
  +import java.io.IOException;
  +import java.io.OutputStream;
  +import java.lang.reflect.Constructor;
  +import java.lang.reflect.Method;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.LogOutputStream;
   import org.apache.tools.ant.types.Commandline;
  -
  -import java.io.OutputStream;
  -import java.io.IOException;
  -import java.lang.reflect.Constructor;
  -import java.lang.reflect.Method;
   
   /**
    * The implementation of the rmic for SUN's JDK.
  
  
  
  1.11      +1 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java
  
  Index: WLRmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- WLRmic.java	15 Apr 2002 12:11:50 -0000	1.10
  +++ WLRmic.java	25 Jul 2002 15:21:21 -0000	1.11
  @@ -54,13 +54,11 @@
   
   package org.apache.tools.ant.taskdefs.rmic;
   
  +import java.lang.reflect.Method;
   import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -
   import org.apache.tools.ant.types.Commandline;
  -
  -import java.lang.reflect.Method;
   
   /**
    * The implementation of the rmic for WebLogic
  
  
  
  1.9       +23 -8     jakarta-ant/src/main/org/apache/tools/ant/types/AbstractFileSet.java
  
  Index: AbstractFileSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/AbstractFileSet.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractFileSet.java	25 Jul 2002 14:59:02 -0000	1.8
  +++ AbstractFileSet.java	25 Jul 2002 15:21:21 -0000	1.9
  @@ -53,17 +53,32 @@
    */
   package org.apache.tools.ant.types;
   
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.FileScanner;
  -import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.selectors.*;
  -
   import java.io.File;
  +import java.util.Enumeration;
  +import java.util.Hashtable;
   import java.util.Stack;
   import java.util.Vector;
  -import java.util.Hashtable;
  -import java.util.Enumeration;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.FileScanner;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.types.selectors.AndSelector;
  +import org.apache.tools.ant.types.selectors.ContainsSelector;
  +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;
  +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.SelectorScanner;
  +import org.apache.tools.ant.types.selectors.SizeSelector;
   
   /**
    * Class that holds an implicit patternset and supports nested
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/types/AntFilterReader.java
  
  Index: AntFilterReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/AntFilterReader.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AntFilterReader.java	17 Apr 2002 05:50:10 -0000	1.5
  +++ AntFilterReader.java	25 Jul 2002 15:21:21 -0000	1.6
  @@ -53,8 +53,8 @@
    */
   package org.apache.tools.ant.types;
   
  -import org.apache.tools.ant.BuildException;
   import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
   
   /**
    * An AntFileReader is a wrapper class that encloses the classname
  
  
  
  1.23      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/types/Commandline.java
  
  Index: Commandline.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/Commandline.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Commandline.java	1 Jun 2002 12:26:41 -0000	1.22
  +++ Commandline.java	25 Jul 2002 15:21:21 -0000	1.23
  @@ -54,11 +54,11 @@
   
   package org.apache.tools.ant.types;
   
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.util.StringUtils;
   import java.io.File;
  -import java.util.Vector;
   import java.util.StringTokenizer;
  +import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.util.StringUtils;
   
   
   /**
  
  
  
  1.36      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
  
  Index: CommandlineJava.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- CommandlineJava.java	1 Jun 2002 12:26:41 -0000	1.35
  +++ CommandlineJava.java	25 Jul 2002 15:21:21 -0000	1.36
  @@ -54,11 +54,11 @@
   
   package org.apache.tools.ant.types;
   
  -import java.util.Properties;
   import java.util.Enumeration;
  +import java.util.Properties;
   import java.util.Vector;
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.util.JavaEnvUtils;
   
   /**
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/types/Environment.java
  
  Index: Environment.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/Environment.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Environment.java	15 Apr 2002 12:11:50 -0000	1.7
  +++ Environment.java	25 Jul 2002 15:21:21 -0000	1.8
  @@ -54,8 +54,8 @@
   
   package org.apache.tools.ant.types;
   
  -import org.apache.tools.ant.BuildException;
   import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
   
   /**
    * Wrapper for environment variables.
  
  
  
  1.8       +10 -13    jakarta-ant/src/main/org/apache/tools/ant/types/FileList.java
  
  Index: FileList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/FileList.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- FileList.java	25 Jul 2002 14:59:02 -0000	1.7
  +++ FileList.java	25 Jul 2002 15:21:21 -0000	1.8
  @@ -54,15 +54,12 @@
   
   package org.apache.tools.ant.types;
   
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
  -
   import java.io.File;
  -
  -import java.util.StringTokenizer;
  -
   import java.util.Stack;
  +import java.util.StringTokenizer;
   import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   /**
    * FileList represents an explicitly named list of files.  FileLists
  @@ -70,12 +67,12 @@
    * whether they currently exist.  By contrast, FileSet operates as a
    * filter, only returning the name of a matched file if it currently
    * exists in the file system.
  - * 
  + *
    * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
    * @version $Revision$ $Date$
    */
   public class FileList extends DataType {
  -    
  +
       private Vector filenames = new Vector();
       private File dir;
   
  @@ -94,7 +91,7 @@
        * instance.
        *
        * <p>You must not set another attribute or nest elements inside
  -     * this element if you make it a reference.</p> 
  +     * this element if you make it a reference.</p>
        */
       public void setRefid(Reference r) throws BuildException {
           if ((dir != null) || (filenames.size() != 0)) {
  @@ -149,10 +146,10 @@
           filenames.copyInto(result);
           return result;
       }
  -    
  +
       /**
        * Performs the check for circular references and returns the
  -     * referenced FileList.  
  +     * referenced FileList.
        */
       protected FileList getRef(Project p) {
           if (!isChecked()) {
  @@ -160,7 +157,7 @@
               stk.push(this);
               dieOnCircularReference(stk, p);
           }
  -        
  +
           Object o = getRefid().getReferencedObject(p);
           if (!(o instanceof FileList)) {
               String msg = getRefid().getRefId() + " doesn\'t denote a filelist";
  
  
  
  1.6       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/types/FilterChain.java
  
  Index: FilterChain.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/FilterChain.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FilterChain.java	17 Apr 2002 05:50:10 -0000	1.5
  +++ FilterChain.java	25 Jul 2002 15:21:21 -0000	1.6
  @@ -54,7 +54,6 @@
   package org.apache.tools.ant.types;
   
   import java.util.Vector;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.filters.ClassConstants;
   import org.apache.tools.ant.filters.ExpandProperties;
  
  
  
  1.15      +0 -4      jakarta-ant/src/main/org/apache/tools/ant/types/FilterSet.java
  
  Index: FilterSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/FilterSet.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- FilterSet.java	12 Jun 2002 14:54:41 -0000	1.14
  +++ FilterSet.java	25 Jul 2002 15:21:21 -0000	1.15
  @@ -57,14 +57,10 @@
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.IOException;
  -
  -// java util classes
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Properties;
   import java.util.Vector;
  -
  -// ant classes
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   
  
  
  
  1.9       +0 -2      jakarta-ant/src/main/org/apache/tools/ant/types/FilterSetCollection.java
  
  Index: FilterSetCollection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/FilterSetCollection.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FilterSetCollection.java	15 Apr 2002 12:11:50 -0000	1.8
  +++ FilterSetCollection.java	25 Jul 2002 15:21:21 -0000	1.9
  @@ -60,8 +60,6 @@
   
   // java util classes
   import java.util.Enumeration;
  -
  -
   import java.util.Vector;
   
   // ant classes
  
  
  
  1.12      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/types/Mapper.java
  
  Index: Mapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/Mapper.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Mapper.java	25 Jul 2002 14:59:02 -0000	1.11
  +++ Mapper.java	25 Jul 2002 15:21:21 -0000	1.12
  @@ -54,13 +54,12 @@
   
   package org.apache.tools.ant.types;
   
  +import java.util.Properties;
  +import java.util.Stack;
   import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.util.FileNameMapper;
  -
  -import java.util.Properties;
  -import java.util.Stack;
   
   /**
    * Element to define a FileNameMapper.
  
  
  
  1.41      +5 -7      jakarta-ant/src/main/org/apache/tools/ant/types/Path.java
  
  Index: Path.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/Path.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- Path.java	25 Jul 2002 14:59:02 -0000	1.40
  +++ Path.java	25 Jul 2002 15:21:21 -0000	1.41
  @@ -54,18 +54,16 @@
   
   package org.apache.tools.ant.types;
   
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.PathTokenizer;
  -import org.apache.tools.ant.util.JavaEnvUtils;
  -
   import java.io.File;
  -
   import java.util.Enumeration;
   import java.util.Locale;
   import java.util.Stack;
   import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.PathTokenizer;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.util.JavaEnvUtils;
   
   
   
  
  
  
  1.27      +3 -5      jakarta-ant/src/main/org/apache/tools/ant/types/PatternSet.java
  
  Index: PatternSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/PatternSet.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- PatternSet.java	25 Jul 2002 14:59:02 -0000	1.26
  +++ PatternSet.java	25 Jul 2002 15:21:21 -0000	1.27
  @@ -54,18 +54,16 @@
   
   package org.apache.tools.ant.types;
   
  -import org.apache.tools.ant.Project;
  -
  -import org.apache.tools.ant.BuildException;
  -
  -import java.io.File;
   import java.io.BufferedReader;
  +import java.io.File;
   import java.io.FileReader;
   import java.io.IOException;
   import java.util.Enumeration;
   import java.util.Stack;
   import java.util.StringTokenizer;
   import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   /**
    * Named collection of include/exclude tags.
  
  
  
  1.11      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/types/Reference.java
  
  Index: Reference.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/Reference.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Reference.java	15 Apr 2002 12:11:50 -0000	1.10
  +++ Reference.java	25 Jul 2002 15:21:21 -0000	1.11
  @@ -54,8 +54,8 @@
   
   package org.apache.tools.ant.types;
   
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   /**
    * Class to hold a reference to another object in the project.
  
  
  
  1.15      +7 -9      jakarta-ant/src/main/org/apache/tools/ant/types/XMLCatalog.java
  
  Index: XMLCatalog.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/XMLCatalog.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- XMLCatalog.java	25 Jul 2002 14:59:02 -0000	1.14
  +++ XMLCatalog.java	25 Jul 2002 15:21:21 -0000	1.15
  @@ -56,26 +56,24 @@
   
   import java.io.File;
   import java.io.FileInputStream;
  -import java.io.InputStream;
  -import java.io.IOException;
   import java.io.FileNotFoundException;
  -import java.net.URL;
  +import java.io.IOException;
  +import java.io.InputStream;
   import java.net.MalformedURLException;
  +import java.net.URL;
   import java.util.Enumeration;
   import java.util.Stack;
   import java.util.Vector;
  +import javax.xml.parsers.ParserConfigurationException;
  +import javax.xml.parsers.SAXParserFactory;
   import javax.xml.transform.Source;
   import javax.xml.transform.TransformerException;
   import javax.xml.transform.URIResolver;
   import javax.xml.transform.sax.SAXSource;
  -import javax.xml.parsers.SAXParserFactory;
  -import javax.xml.parsers.ParserConfigurationException;
  -
  +import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.util.FileUtils;
  -
   import org.xml.sax.EntityResolver;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  
  
  
  1.11      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/types/ZipFileSet.java
  
  Index: ZipFileSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/ZipFileSet.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ZipFileSet.java	25 Jul 2002 14:59:02 -0000	1.10
  +++ ZipFileSet.java	25 Jul 2002 15:21:21 -0000	1.11
  @@ -54,11 +54,10 @@
   package org.apache.tools.ant.types;
   
   import java.io.File;
  -
  +import java.util.Stack;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  -import java.util.Stack;
   
   /**
    * A ZipFileSet is a FileSet with extra attributes useful in the context of
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/types/ZipScanner.java
  
  Index: ZipScanner.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/ZipScanner.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ZipScanner.java	12 Apr 2002 13:44:36 -0000	1.5
  +++ ZipScanner.java	25 Jul 2002 15:21:21 -0000	1.6
  @@ -54,8 +54,8 @@
   
   package org.apache.tools.ant.types;
   
  -import org.apache.tools.ant.DirectoryScanner;
   import java.io.File;
  +import org.apache.tools.ant.DirectoryScanner;
   
   /**
    * ZipScanner accesses the pattern matching algorithm in DirectoryScanner,
  
  
  
  1.11      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java
  
  Index: ClassfileSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ClassfileSet.java	15 Apr 2002 12:11:51 -0000	1.10
  +++ ClassfileSet.java	25 Jul 2002 15:21:22 -0000	1.11
  @@ -53,8 +53,8 @@
    */
   package org.apache.tools.ant.types.optional.depend;
   
  -import java.util.Vector;
   import java.util.Enumeration;
  +import java.util.Vector;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.FileSet;
  
  
  
  1.12      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java
  
  Index: DependScanner.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DependScanner.java	15 Apr 2002 12:11:51 -0000	1.11
  +++ DependScanner.java	25 Jul 2002 15:21:22 -0000	1.12
  @@ -54,13 +54,13 @@
   package org.apache.tools.ant.types.optional.depend;
   
   import java.io.File;
  -import java.util.Vector;
   import java.util.Enumeration;
   import java.util.Hashtable;
  -import org.apache.tools.ant.util.depend.DependencyAnalyzer;
  -import org.apache.tools.ant.DirectoryScanner;
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.util.depend.DependencyAnalyzer;
   
   
   /**
  
  
  
  1.3       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java
  
  Index: BaseSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BaseSelector.java	1 Jun 2002 12:26:42 -0000	1.2
  +++ BaseSelector.java	25 Jul 2002 15:21:22 -0000	1.3
  @@ -55,9 +55,8 @@
   package org.apache.tools.ant.types.selectors;
   
   import java.io.File;
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.BuildException;
  -import  org.apache.tools.ant.types.DataType;
  +import org.apache.tools.ant.types.DataType;
   
   /**
    * A convenience base class that you can subclass Selectors from. It
  
  
  
  1.3       +2 -6      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java
  
  Index: BaseSelectorContainer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BaseSelectorContainer.java	1 Jun 2002 12:26:42 -0000	1.2
  +++ BaseSelectorContainer.java	25 Jul 2002 15:21:22 -0000	1.3
  @@ -54,14 +54,11 @@
   
   package org.apache.tools.ant.types.selectors;
   
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.BuildException;
  -import  org.apache.tools.ant.types.Reference;
  -
   import java.io.File;
   import java.util.Enumeration;
  -import java.util.Stack;
   import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   /**
    * This is the base class for selectors that can contain other selectors.
  @@ -136,7 +133,6 @@
        * Add a new selector into this container.
        *
        * @param selector the new selector to add
  -     * @return the selector that was added
        */
       public void appendSelector(FileSelector selector) {
           selectorsList.addElement(selector);
  
  
  
  1.3       +3 -4      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
  
  Index: ContainsSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContainsSelector.java	1 Jun 2002 12:26:42 -0000	1.2
  +++ ContainsSelector.java	25 Jul 2002 15:21:22 -0000	1.3
  @@ -54,15 +54,14 @@
   
   package org.apache.tools.ant.types.selectors;
   
  -import java.io.File;
   import java.io.BufferedReader;
  -import java.io.InputStreamReader;
  +import java.io.File;
   import java.io.FileInputStream;
   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.BuildException;
   
   /**
    * Selector that filters files based on whether they contain a
  
  
  
  1.3       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
  
  Index: DateSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/DateSelector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DateSelector.java	1 Jun 2002 12:26:42 -0000	1.2
  +++ DateSelector.java	25 Jul 2002 15:21:22 -0000	1.3
  @@ -58,11 +58,10 @@
   import java.text.DateFormat;
   import java.text.ParseException;
   import java.util.Locale;
  -
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.taskdefs.condition.Os;
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.Parameter;
  -import org.apache.tools.ant.taskdefs.condition.Os;
   
   /**
    * Selector that chooses files based on their last modified date.
  
  
  
  1.5       +3 -4      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/DependSelector.java
  
  Index: DependSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/DependSelector.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DependSelector.java	23 Jul 2002 07:54:56 -0000	1.4
  +++ DependSelector.java	25 Jul 2002 15:21:22 -0000	1.5
  @@ -55,12 +55,11 @@
   package org.apache.tools.ant.types.selectors;
   
   import java.io.File;
  -
  -import org.apache.tools.ant.types.Mapper;
  -import org.apache.tools.ant.util.IdentityMapper;
  -import org.apache.tools.ant.util.FileNameMapper;
   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
  
  
  
  1.3       +1 -3      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java
  
  Index: DepthSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DepthSelector.java	1 Jun 2002 12:26:42 -0000	1.2
  +++ DepthSelector.java	25 Jul 2002 15:21:23 -0000	1.3
  @@ -56,10 +56,8 @@
   
   import java.io.File;
   import java.util.StringTokenizer;
  -
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.Parameter;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.types.Parameter;
   
   /**
    * Selector that filters files based on the how deep in the directory
  
  
  
  1.3       +0 -2      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java
  
  Index: ExtendFileSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExtendFileSelector.java	1 Jun 2002 12:26:42 -0000	1.2
  +++ ExtendFileSelector.java	25 Jul 2002 15:21:23 -0000	1.3
  @@ -54,8 +54,6 @@
   
   package org.apache.tools.ant.types.selectors;
   
  -import java.io.File;
  -
   import org.apache.tools.ant.types.Parameterizable;
   
   /**
  
  
  
  1.3       +2 -4      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java
  
  Index: ExtendSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExtendSelector.java	1 Jun 2002 12:26:42 -0000	1.2
  +++ ExtendSelector.java	25 Jul 2002 15:21:23 -0000	1.3
  @@ -56,12 +56,10 @@
   
   import java.io.File;
   import java.util.Vector;
  -
  -import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.AntClassLoader;
  -import org.apache.tools.ant.types.DataType;
  -import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.types.Parameter;
  +import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
   
   /**
  
  
  
  1.2       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/FileSelector.java
  
  Index: FileSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/FileSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FileSelector.java	30 Apr 2002 22:38:35 -0000	1.1
  +++ FileSelector.java	25 Jul 2002 15:21:23 -0000	1.2
  @@ -55,7 +55,6 @@
   package org.apache.tools.ant.types.selectors;
   
   import java.io.File;
  -
   import org.apache.tools.ant.BuildException;
   
   /**
  
  
  
  1.3       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java
  
  Index: FilenameSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FilenameSelector.java	1 Jun 2002 12:26:42 -0000	1.2
  +++ FilenameSelector.java	25 Jul 2002 15:21:23 -0000	1.3
  @@ -55,7 +55,6 @@
   package org.apache.tools.ant.types.selectors;
   
   import java.io.File;
  -
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.Parameter;
   
  
  
  
  1.2       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/NotSelector.java
  
  Index: NotSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/NotSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NotSelector.java	30 Apr 2002 22:38:36 -0000	1.1
  +++ NotSelector.java	25 Jul 2002 15:21:23 -0000	1.2
  @@ -54,8 +54,7 @@
   
   package org.apache.tools.ant.types.selectors;
   
  -import java.io.File;
  -import java.util.Enumeration;
  +
   
   /**
    * This selector has one other selectors whose meaning it inverts. It
  
  
  
  1.5       +3 -4      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java
  
  Index: PresentSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PresentSelector.java	23 Jul 2002 07:54:56 -0000	1.4
  +++ PresentSelector.java	25 Jul 2002 15:21:23 -0000	1.5
  @@ -55,12 +55,11 @@
   package org.apache.tools.ant.types.selectors;
   
   import java.io.File;
  -
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.Mapper;
  -import org.apache.tools.ant.util.IdentityMapper;
   import org.apache.tools.ant.util.FileNameMapper;
  -import org.apache.tools.ant.types.EnumeratedAttribute;
  -import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.util.IdentityMapper;
   
   /**
    * Selector that filters files based on whether they appear in another
  
  
  
  1.3       +0 -4      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
  
  Index: SelectSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SelectSelector.java	1 Jun 2002 12:26:42 -0000	1.2
  +++ SelectSelector.java	25 Jul 2002 15:21:23 -0000	1.3
  @@ -54,12 +54,8 @@
   
   package org.apache.tools.ant.types.selectors;
   
  -import java.io.File;
   import java.util.Enumeration;
  -
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.BuildException;
  -import  org.apache.tools.ant.types.Reference;
   
   /**
    * This selector just holds one other selector and forwards all
  
  
  
  1.3       +1 -7      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
  
  Index: SelectorContainer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SelectorContainer.java	1 Jun 2002 12:26:42 -0000	1.2
  +++ SelectorContainer.java	25 Jul 2002 15:21:23 -0000	1.3
  @@ -54,14 +54,8 @@
   
   package org.apache.tools.ant.types.selectors;
   
  -import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.BuildException;
  -import  org.apache.tools.ant.types.Reference;
  -
  -import java.io.File;
   import java.util.Enumeration;
  -import java.util.Stack;
  -import java.util.Vector;
  +import org.apache.tools.ant.Project;
   
   /**
    * This is the interface for selectors that can contain other selectors.
  
  
  
  1.3       +0 -2      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
  
  Index: SelectorUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SelectorUtils.java	9 Jul 2002 21:06:14 -0000	1.2
  +++ SelectorUtils.java	25 Jul 2002 15:21:23 -0000	1.3
  @@ -58,8 +58,6 @@
   import java.util.StringTokenizer;
   import java.util.Vector;
   
  -import org.apache.tools.ant.BuildException;
  -
   /**
    * <p>This is a utility class used by selectors and DirectoryScanner. The
    * functionality more properly belongs just to selectors, but unfortunately
  
  
  
  1.3       +0 -2      jakarta-ant/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java
  
  Index: SizeSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SizeSelector.java	1 Jun 2002 12:26:42 -0000	1.2
  +++ SizeSelector.java	25 Jul 2002 15:21:23 -0000	1.3
  @@ -55,10 +55,8 @@
   package org.apache.tools.ant.types.selectors;
   
   import java.io.File;
  -
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.Parameter;
  -import org.apache.tools.ant.BuildException;
   
   /**
    * Selector that filters files based on their size.
  
  
  
  1.12      +3 -4      jakarta-ant/src/main/org/apache/tools/ant/util/DOMElementWriter.java
  
  Index: DOMElementWriter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/DOMElementWriter.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DOMElementWriter.java	15 Apr 2002 12:11:51 -0000	1.11
  +++ DOMElementWriter.java	25 Jul 2002 15:21:24 -0000	1.12
  @@ -55,15 +55,14 @@
   package org.apache.tools.ant.util;
   
   import java.io.IOException;
  -import java.io.Writer;
   import java.io.OutputStream;
   import java.io.OutputStreamWriter;
  -
  +import java.io.Writer;
  +import org.w3c.dom.Attr;
   import org.w3c.dom.Element;
   import org.w3c.dom.NamedNodeMap;
  -import org.w3c.dom.Attr;
  -import org.w3c.dom.NodeList;
   import org.w3c.dom.Node;
  +import org.w3c.dom.NodeList;
   import org.w3c.dom.Text;
   
   /**
  
  
  
  1.29      +4 -6      jakarta-ant/src/main/org/apache/tools/ant/util/FileUtils.java
  
  Index: FileUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/FileUtils.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- FileUtils.java	22 Jun 2002 23:38:37 -0000	1.28
  +++ FileUtils.java	25 Jul 2002 15:21:24 -0000	1.29
  @@ -67,21 +67,19 @@
   import java.io.InputStreamReader;
   import java.io.OutputStreamWriter;
   import java.io.Reader;
  -
   import java.lang.reflect.Method;
  +import java.net.MalformedURLException;
  +import java.net.URL;
   import java.text.DecimalFormat;
   import java.util.Random;
   import java.util.Stack;
   import java.util.StringTokenizer;
   import java.util.Vector;
  -import java.net.URL;
  -import java.net.MalformedURLException;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.filters.util.ChainReaderHelper;
  -import org.apache.tools.ant.types.FilterSetCollection;
   import org.apache.tools.ant.taskdefs.condition.Os;
  +import org.apache.tools.ant.types.FilterSetCollection;
   
   /**
    * This class also encapsulates methods which allow Files to be
  
  
  
  1.2       +4 -6      jakarta-ant/src/main/org/apache/tools/ant/util/JAXPUtils.java
  
  Index: JAXPUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/JAXPUtils.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JAXPUtils.java	23 Apr 2002 11:42:51 -0000	1.1
  +++ JAXPUtils.java	25 Jul 2002 15:21:24 -0000	1.2
  @@ -53,16 +53,14 @@
    */
   package org.apache.tools.ant.util;
   
  +import javax.xml.parsers.FactoryConfigurationError;
  +import javax.xml.parsers.ParserConfigurationException;
  +import javax.xml.parsers.SAXParser;
  +import javax.xml.parsers.SAXParserFactory;
   import org.apache.tools.ant.BuildException;
  -
   import org.xml.sax.Parser;
   import org.xml.sax.SAXException;
   import org.xml.sax.XMLReader;
  -
  -import javax.xml.parsers.SAXParserFactory;
  -import javax.xml.parsers.SAXParser;
  -import javax.xml.parsers.ParserConfigurationException;
  -import javax.xml.parsers.FactoryConfigurationError;
   
   /**
    * Collection of helper methods that retrieve a ParserFactory or
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
  
  Index: JavaEnvUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JavaEnvUtils.java	23 Jul 2002 15:13:38 -0000	1.7
  +++ JavaEnvUtils.java	25 Jul 2002 15:21:24 -0000	1.8
  @@ -53,9 +53,9 @@
    */
   package org.apache.tools.ant.util;
   
  -import org.apache.tools.ant.taskdefs.condition.Os;
   import java.io.File;
   import java.util.Vector;
  +import org.apache.tools.ant.taskdefs.condition.Os;
   
   /**
    * A set of helper methods related to locating executables or checking
  
  
  
  1.5       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/util/LoaderUtils.java
  
  Index: LoaderUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/LoaderUtils.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LoaderUtils.java	15 Apr 2002 12:11:51 -0000	1.4
  +++ LoaderUtils.java	25 Jul 2002 15:21:24 -0000	1.5
  @@ -54,7 +54,6 @@
   package org.apache.tools.ant.util;
   
   import java.lang.reflect.InvocationTargetException;
  -
   import java.lang.reflect.Method;
   import org.apache.tools.ant.BuildException;
   
  
  
  
  1.6       +1 -3      jakarta-ant/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
  
  Index: RegexpPatternMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RegexpPatternMapper.java	15 Apr 2002 12:11:51 -0000	1.5
  +++ RegexpPatternMapper.java	25 Jul 2002 15:21:24 -0000	1.6
  @@ -54,12 +54,10 @@
   
   package org.apache.tools.ant.util;
   
  +import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.util.regexp.RegexpMatcher;
   import org.apache.tools.ant.util.regexp.RegexpMatcherFactory;
  -
  -
  -import java.util.Vector;
   
   /**
    * Implementation of FileNameMapper that does regular expression
  
  
  
  1.14      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/util/SourceFileScanner.java
  
  Index: SourceFileScanner.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/SourceFileScanner.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SourceFileScanner.java	15 Apr 2002 12:11:51 -0000	1.13
  +++ SourceFileScanner.java	25 Jul 2002 15:21:24 -0000	1.14
  @@ -54,12 +54,11 @@
   
   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.taskdefs.condition.Os;
  -
  -import java.io.File;
  -import java.util.Vector;
   
   /**
    * Utility class that collects the functionality of the various
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/util/StringUtils.java
  
  Index: StringUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/StringUtils.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StringUtils.java	15 Apr 2002 14:56:34 -0000	1.4
  +++ StringUtils.java	25 Jul 2002 15:21:24 -0000	1.5
  @@ -53,8 +53,8 @@
    */
   package org.apache.tools.ant.util;
   
  -import java.io.StringWriter;
   import java.io.PrintWriter;
  +import java.io.StringWriter;
   import java.util.Vector;
   
   /**
  
  
  
  1.2       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/util/TaskLogger.java
  
  Index: TaskLogger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/TaskLogger.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TaskLogger.java	16 Apr 2002 10:05:10 -0000	1.1
  +++ TaskLogger.java	25 Jul 2002 15:21:24 -0000	1.2
  @@ -53,8 +53,8 @@
    */
   package org.apache.tools.ant.util;
   
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Task;
   
   /**
    * A facade that makes logging nicers to use.
  
  
  
  1.5       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java
  
  Index: DependencyAnalyzer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DependencyAnalyzer.java	27 Mar 2002 10:21:31 -0000	1.4
  +++ DependencyAnalyzer.java	25 Jul 2002 15:21:24 -0000	1.5
  @@ -55,7 +55,6 @@
   import java.io.File;
   import java.io.IOException;
   import java.util.Enumeration;
  -
   import org.apache.tools.ant.types.Path;
   
   /**
  
  
  
  1.2       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java
  
  Index: NoExitSecurityManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NoExitSecurityManager.java	5 Feb 2002 16:58:34 -0000	1.1
  +++ NoExitSecurityManager.java	25 Jul 2002 15:21:24 -0000	1.2
  @@ -53,9 +53,8 @@
    */
   package org.apache.tools.ant.util.optional;
   
  -import org.apache.tools.ant.ExitException;
  -
   import java.security.Permission;
  +import org.apache.tools.ant.ExitException;
   
   /**
    * This is intended as a replacement for the default system manager.
  
  
  
  1.9       +2 -5      jakarta-ant/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
  
  Index: JakartaOroMatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JakartaOroMatcher.java	15 Apr 2002 13:36:21 -0000	1.8
  +++ JakartaOroMatcher.java	25 Jul 2002 15:21:25 -0000	1.9
  @@ -54,15 +54,12 @@
   
   package org.apache.tools.ant.util.regexp;
   
  -import org.apache.tools.ant.BuildException;
  +import java.util.Vector;
   import org.apache.oro.text.regex.MatchResult;
   import org.apache.oro.text.regex.Pattern;
   import org.apache.oro.text.regex.Perl5Compiler;
   import org.apache.oro.text.regex.Perl5Matcher;
  -
  -
  -
  -import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
   
   /**
    * Implementation of RegexpMatcher for Jakarta-ORO.
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
  
  Index: JakartaOroRegexp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JakartaOroRegexp.java	15 Apr 2002 13:36:21 -0000	1.7
  +++ JakartaOroRegexp.java	25 Jul 2002 15:21:25 -0000	1.8
  @@ -53,10 +53,10 @@
    */
   package org.apache.tools.ant.util.regexp;
   
  -import org.apache.tools.ant.BuildException;
   import org.apache.oro.text.regex.Perl5Substitution;
   import org.apache.oro.text.regex.Substitution;
   import org.apache.oro.text.regex.Util;
  +import org.apache.tools.ant.BuildException;
   
   
   
  
  
  
  1.11      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java
  
  Index: JakartaRegexpMatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JakartaRegexpMatcher.java	15 Apr 2002 13:36:21 -0000	1.10
  +++ JakartaRegexpMatcher.java	25 Jul 2002 15:21:25 -0000	1.11
  @@ -54,11 +54,10 @@
   
   package org.apache.tools.ant.util.regexp;
   
  +import java.util.Vector;
   import org.apache.regexp.RE;
   import org.apache.regexp.RESyntaxException;
  -
   import org.apache.tools.ant.BuildException;
  -import java.util.Vector;
   
   /**
    * Implementation of RegexpMatcher for Jakarta-Regexp.
  
  
  
  1.9       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
  
  Index: JakartaRegexpRegexp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JakartaRegexpRegexp.java	15 Apr 2002 13:36:21 -0000	1.8
  +++ JakartaRegexpRegexp.java	25 Jul 2002 15:21:25 -0000	1.9
  @@ -54,9 +54,9 @@
   package org.apache.tools.ant.util.regexp;
   
   
  -import org.apache.tools.ant.BuildException;
  -import org.apache.regexp.RE;
   import java.util.Vector;
  +import org.apache.regexp.RE;
  +import org.apache.tools.ant.BuildException;
   
   /***
    * Regular expression implementation using the Jakarta Regexp package
  
  
  
  1.10      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java
  
  Index: Jdk14RegexpMatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Jdk14RegexpMatcher.java	15 Apr 2002 13:36:21 -0000	1.9
  +++ Jdk14RegexpMatcher.java	25 Jul 2002 15:21:25 -0000	1.10
  @@ -58,7 +58,6 @@
   import java.util.regex.Matcher;
   import java.util.regex.Pattern;
   import java.util.regex.PatternSyntaxException;
  -
   import org.apache.tools.ant.BuildException;
   
   /**
  
  
  
  1.10      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java
  
  Index: Jdk14RegexpRegexp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Jdk14RegexpRegexp.java	15 Apr 2002 13:36:21 -0000	1.9
  +++ Jdk14RegexpRegexp.java	25 Jul 2002 15:21:25 -0000	1.10
  @@ -54,10 +54,9 @@
   package org.apache.tools.ant.util.regexp;
   
   
  -import org.apache.tools.ant.BuildException;
  -
   import java.util.regex.Matcher;
   import java.util.regex.Pattern;
  +import org.apache.tools.ant.BuildException;
   
   
   /***
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java
  
  Index: RegexpMatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- RegexpMatcher.java	12 Apr 2002 13:44:36 -0000	1.7
  +++ RegexpMatcher.java	25 Jul 2002 15:21:25 -0000	1.8
  @@ -54,8 +54,8 @@
   
   package org.apache.tools.ant.util.regexp;
   
  -import org.apache.tools.ant.BuildException;
   import java.util.Vector;
  +import org.apache.tools.ant.BuildException;
   
   /**
    * Interface describing a regular expression matcher.
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message