ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sbaill...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss MSVSS.java MSVSSCHECKIN.java MSVSSCHECKOUT.java MSVSSGET.java MSVSSHISTORY.java MSVSSLABEL.java
Date Sun, 28 Oct 2001 21:30:24 GMT
sbailliez    01/10/28 13:30:24

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional ANTLR.java
                        Cab.java IContract.java Javah.java
                        ManifestFile.java Native2Ascii.java NetRexxC.java
                        PropertyFile.java RenameExtensions.java Rpm.java
                        Script.java StyleBook.java Test.java
                        TraXLiaison.java XalanLiaison.java
                        XMLValidateTask.java XslpLiaison.java
               src/main/org/apache/tools/ant/taskdefs/optional/ccm
                        CCMCheck.java CCMCheckinDefault.java
                        CCMCreateTask.java CCMReconfigure.java
                        Continuus.java
               src/main/org/apache/tools/ant/taskdefs/optional/clearcase
                        CCCheckin.java CCCheckout.java CCUnCheckout.java
                        CCUpdate.java ClearCase.java
               src/main/org/apache/tools/ant/taskdefs/optional/depend
                        ClassFile.java ClassFileUtils.java Depend.java
                        DirectoryIterator.java JarFileIterator.java
               src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool
                        ClassCPInfo.java ConstantCPInfo.java
                        ConstantPool.java ConstantPoolEntry.java
                        DoubleCPInfo.java FieldRefCPInfo.java
                        FloatCPInfo.java IntegerCPInfo.java
                        InterfaceMethodRefCPInfo.java LongCPInfo.java
                        MethodRefCPInfo.java NameAndTypeCPInfo.java
                        StringCPInfo.java Utf8CPInfo.java
               src/main/org/apache/tools/ant/taskdefs/optional/dotnet
                        CSharp.java Ilasm.java NetCommand.java
               src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        BorlandDeploymentTool.java
                        BorlandGenerateClient.java DDCreator.java
                        DescriptorHandler.java Ejbc.java EjbcHelper.java
                        EJBDeploymentTool.java EjbJar.java
                        GenericDeploymentTool.java
                        InnerClassFilenameFilter.java
                        IPlanetDeploymentTool.java IPlanetEjbc.java
                        JbossDeploymentTool.java
                        WeblogicDeploymentTool.java
                        WeblogicTOPLinkDeploymentTool.java WLRun.java
                        WLStop.java
               src/main/org/apache/tools/ant/taskdefs/optional/ide
                        VAJAntTool.java VAJBuildInfo.java
                        VAJExportServlet.java VAJImport.java
                        VAJLoadProjects.java VAJLoadServlet.java
                        VAJLocalUtil.java VAJRemoteUtil.java
                        VAJToolsServlet.java
               src/main/org/apache/tools/ant/taskdefs/optional/javacc
                        JavaCC.java JJTree.java
               src/main/org/apache/tools/ant/taskdefs/optional/jdepend
                        JDependTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/jlink
                        ClassNameReader.java jlink.java JlinkTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/jsp
                        JspC.java
               src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers
                        CompilerAdapterFactory.java
                        DefaultCompilerAdapter.java JasperC.java
               src/main/org/apache/tools/ant/taskdefs/optional/junit
                        AggregateTransformer.java BatchTest.java
                        BriefJUnitResultFormatter.java DOMUtil.java
                        JUnitTest.java JUnitTestRunner.java
                        PlainJUnitResultFormatter.java
                        XMLJUnitResultFormatter.java
                        XMLResultAggregator.java
               src/main/org/apache/tools/ant/taskdefs/optional/metamata
                        MAudit.java MAuditStreamHandler.java MMetrics.java
                        MMetricsStreamHandler.java MParse.java
               src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
                        MimeMail.java TelnetTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/perforce
                        P4Add.java P4Base.java P4Change.java P4Counter.java
                        P4Delete.java P4Edit.java P4HandlerAdapter.java
                        P4Have.java P4Label.java P4Reopen.java
                        P4Revert.java P4Submit.java P4Sync.java
                        SimpleP4OutputHandler.java
               src/main/org/apache/tools/ant/taskdefs/optional/pvcs
                        Pvcs.java PvcsProject.java
               src/main/org/apache/tools/ant/taskdefs/optional/scm
                        AntStarTeamCheckOut.java
               src/main/org/apache/tools/ant/taskdefs/optional/sitraka
                        Coverage.java CovMerge.java CovReport.java
                        Filters.java ReportFilters.java XMLReport.java
               src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode
                        ClassFile.java ClassPathLoader.java FieldInfo.java
                        FieldInfoList.java InterfaceList.java
                        MethodInfo.java MethodInfoList.java Utils.java
               src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes
                        AttributeInfo.java AttributeInfoList.java Code.java
                        ConstantValue.java Deprecated.java Exceptions.java
                        InnerClasses.java LineNumberTable.java
                        LocalVariableTable.java SourceDir.java
                        SourceFile.java Synthetic.java Unknown.java
               src/main/org/apache/tools/ant/taskdefs/optional/sound
                        AntSoundPlayer.java SoundTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/vss
                        MSVSS.java MSVSSCHECKIN.java MSVSSCHECKOUT.java
                        MSVSSGET.java MSVSSHISTORY.java MSVSSLABEL.java
  Log:
  Code clean up:
   - removed useless/duplicate imports
   - added explicit imports rather than *
   - changed specifiers order to be conform to JLS.
  
  Revision  Changes    Path
  1.3       +10 -4     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ANTLR.java	2001/01/03 14:18:35	1.2
  +++ ANTLR.java	2001/10/28 21:30:18	1.3
  @@ -54,10 +54,16 @@
   
   package org.apache.tools.ant.taskdefs.optional;
   
  -import java.io.*;
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.types.*;
  +import java.io.File;
  +import java.io.BufferedReader;
  +import java.io.FileReader;
  +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.taskdefs.Execute;
  +import org.apache.tools.ant.taskdefs.LogStreamHandler;
  +import org.apache.tools.ant.types.CommandlineJava;
   /**
    * @author Erik Meade, emeade@geekfarm.org
    */
  
  
  
  1.8       +13 -5     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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Cab.java	2001/09/30 13:21:54	1.7
  +++ Cab.java	2001/10/28 21:30:18	1.8
  @@ -54,13 +54,21 @@
   
   package org.apache.tools.ant.taskdefs.optional;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import 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.taskdefs.MatchingTask;
  +import org.apache.tools.ant.taskdefs.ExecTask;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.types.Commandline;
   
  -import java.io.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.PrintWriter;
  +import java.io.FileOutputStream;
  +import java.io.OutputStream;
   import java.util.Enumeration;
  -import java.util.StringTokenizer;
  +
   import java.util.Vector;
   import java.util.Random;
   import java.text.DecimalFormat;
  
  
  
  1.4       +4 -4      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IContract.java	2001/04/10 05:06:47	1.3
  +++ IContract.java	2001/10/28 21:30:18	1.4
  @@ -75,7 +75,7 @@
   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.FileSet;
  +
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
   
  @@ -226,14 +226,14 @@
    */
   public class IContract extends MatchingTask {
   
  -    private static final String ICONTROL_PROPERTIES_HEADER =
  +    private final static String ICONTROL_PROPERTIES_HEADER =
           " You might want to set classRoot to point to your normal compilation class root directory.";
   
  -    private static final String ICONTROL_PROPERTIES_MESSAGE =
  +    private final static String ICONTROL_PROPERTIES_MESSAGE =
           "You should probably modify icontrol.properties' classRoot to where comiled (uninstrumented) classes go.";
   
       /** \ on windows, / on linux/unix */
  -    private static final String ps = System.getProperty( "path.separator" );
  +    private final static String ps = System.getProperty( "path.separator" );
   
       /** compiler to use for instrumenation */
       private String icCompiler = "javac";
  
  
  
  1.7       +12 -8     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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Javah.java	2001/07/22 13:12:29	1.6
  +++ Javah.java	2001/10/28 21:30:18	1.7
  @@ -55,16 +55,20 @@
   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.taskdefs.LogOutputStream;
  -import org.apache.tools.ant.types.*;
  +
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Reference;
  +import org.apache.tools.ant.types.Commandline;
  +
  +
   
  -import java.lang.reflect.Method;
  -import java.lang.reflect.Constructor;
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.util.Vector;
  +import java.util.StringTokenizer;
  +import java.util.Enumeration;
   
   /**
    * Task to generate JNI header files using javah. This task can take the following
  @@ -99,7 +103,7 @@
   
   public class Javah extends Task {
   
  -    private static final String FAIL_MSG = "Compile failed, messages should have been provided.";
  +    private final static String FAIL_MSG = "Compile failed, messages should have been provided.";
   
       private Vector classes = new Vector(2);
       private String cls;
  
  
  
  1.2       +18 -8     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ManifestFile.java
  
  Index: ManifestFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ManifestFile.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ManifestFile.java	2001/10/12 08:11:32	1.1
  +++ ManifestFile.java	2001/10/28 21:30:18	1.2
  @@ -1,10 +1,20 @@
   package org.apache.tools.ant.taskdefs.optional;
   
  -import java.io.*;
  -import java.util.*;
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  +import java.io.File;
  +import java.io.FileOutputStream;
  +import java.io.IOException;
  +import java.io.FileInputStream;
  +import java.io.FileNotFoundException;
  +import java.util.Vector;
  +import java.util.Enumeration;
  +import java.util.Comparator;
  +import java.util.ListIterator;
  +import java.util.StringTokenizer;
  +import java.util.ArrayList;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
   
  +
   /**
    * Task for creating a manifest file for a jar archiv.
    * use:
  @@ -22,10 +32,10 @@
    */
   public class ManifestFile extends Task {
   
  -    private static final String newLine = System.getProperty("line.separator");
  -    private static final String keyValueSeparator = ":";
  -    private static final String UPDATE_ = "update";
  -    private static final String REPLACEALL_ = "replaceAll";
  +    private final static String newLine = System.getProperty("line.separator");
  +    private final static String keyValueSeparator = ":";
  +    private final static String UPDATE_ = "update";
  +    private final static String REPLACEALL_ = "replaceAll";
   
       private File manifestFile;
       private Vector entries;
  
  
  
  1.3       +3 -1      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Native2Ascii.java	2000/12/18 16:37:21	1.2
  +++ Native2Ascii.java	2001/10/28 21:30:18	1.3
  @@ -60,7 +60,9 @@
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Mapper;
  -import org.apache.tools.ant.util.*;
  +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;
   
  
  
  
  1.10      +14 -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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- NetRexxC.java	2001/07/07 13:51:12	1.9
  +++ NetRexxC.java	2001/10/28 21:30:18	1.10
  @@ -53,12 +53,21 @@
    */
   package org.apache.tools.ant.taskdefs.optional;
   
  -import java.io.*;
  -import java.lang.reflect.*;
  -import java.util.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.StringWriter;
  +import java.io.PrintWriter;
  +
  +import java.util.Vector;
  +import java.util.Hashtable;
  +import java.util.Enumeration;
  +import java.util.Properties;
  +import java.util.StringTokenizer;
   import netrexx.lang.Rexx;
  -import org.apache.tools.ant.*;
  -import 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.MatchingTask;
   
   /**
    * Task to compile NetRexx source files. This task can take the following
  
  
  
  1.9       +33 -18    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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- PropertyFile.java	2001/10/23 14:10:29	1.8
  +++ PropertyFile.java	2001/10/28 21:30:18	1.9
  @@ -55,13 +55,28 @@
   
   package org.apache.tools.ant.taskdefs.optional;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  -import java.io.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
  +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.*;
  -import java.text.*;
  +import java.util.Properties;
  +import java.util.Vector;
  +import java.util.Enumeration;
  +import java.util.GregorianCalendar;
  +import java.util.Date;
  +import java.util.Calendar;
  +import java.text.DateFormat;
  +import java.text.SimpleDateFormat;
  +import java.text.ParseException;
  +import java.text.DecimalFormat;
   
   /**
    *PropertyFile task uses java.util.Properties to modify integer, String and
  @@ -144,7 +159,7 @@
       * Static variables.
       */
   
  -    private static final String NEWLINE = System.getProperty("line.separator");
  +    private final static String NEWLINE = System.getProperty("line.separator");
   
   
       /* ========================================================================
  @@ -311,11 +326,11 @@
       public static class Entry
       {
   
  -        static final String NOW_VALUE_ =        "now";
  -        static final String NULL_VALUE_ =       "never";
  +        final static String NOW_VALUE_ =        "now";
  +        final static String NULL_VALUE_ =       "never";
   
  -        private static final int    DEFAULT_INT_VALUE =     1;
  -        private static final GregorianCalendar
  +        private final static int    DEFAULT_INT_VALUE =     1;
  +        private final static GregorianCalendar
               DEFAULT_DATE_VALUE = new GregorianCalendar();
   
           private String              m_key = null;
  @@ -601,13 +616,13 @@
           public static class Operation extends EnumeratedAttribute {
   
               // Property type operations
  -            public static final int INCREMENT_OPER =   0;
  -            public static final int DECREMENT_OPER =   1;
  -            public static final int EQUALS_OPER =      2;
  +            public final static int INCREMENT_OPER =   0;
  +            public final static int DECREMENT_OPER =   1;
  +            public final static int EQUALS_OPER =      2;
   
               // Special values
  -            public static final int NOW_VALUE =        3;
  -            public static final int NULL_VALUE =       4;
  +            public final static int NOW_VALUE =        3;
  +            public final static int NULL_VALUE =       4;
   
               public String[] getValues() {
                   return new String[] {"+", "-", "=", NOW_VALUE_, NULL_VALUE_};
  @@ -636,9 +651,9 @@
           public static class Type extends EnumeratedAttribute {
   
               // Property types
  -            public static final int INTEGER_TYPE =     0;
  -            public static final int DATE_TYPE =        1;
  -            public static final int STRING_TYPE =      2;
  +            public final static int INTEGER_TYPE =     0;
  +            public final static int DATE_TYPE =        1;
  +            public final static int STRING_TYPE =      2;
   
               public String[] getValues() {
                   return new String[] {"int", "date", "string"};
  
  
  
  1.9       +6 -4      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- RenameExtensions.java	2001/01/03 14:18:35	1.8
  +++ RenameExtensions.java	2001/10/28 21:30:18	1.9
  @@ -63,10 +63,12 @@
   
   package org.apache.tools.ant.taskdefs.optional;
   
  -import java.io.*;
  -import java.util.*;
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.taskdefs.*;
  +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.taskdefs.Move;
   import org.apache.tools.ant.types.Mapper;
   
   /**
  
  
  
  1.2       +14 -3     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Rpm.java	2001/04/10 04:29:07	1.1
  +++ Rpm.java	2001/10/28 21:30:18	1.2
  @@ -53,9 +53,20 @@
    */
   package org.apache.tools.ant.taskdefs.optional;
   
  -import java.io.*;
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.taskdefs.*;
  +import java.io.File;
  +import java.io.OutputStream;
  +import java.io.PrintStream;
  +import java.io.BufferedOutputStream;
  +import java.io.FileOutputStream;
  +import java.io.IOException;
  +import org.apache.tools.ant.Task;
  +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.LogStreamHandler;
  +import org.apache.tools.ant.taskdefs.LogOutputStream;
  +import org.apache.tools.ant.taskdefs.PumpStreamHandler;
  +import org.apache.tools.ant.taskdefs.Execute;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  
  
  
  1.8       +9 -4      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Script.java	2001/10/01 12:26:11	1.7
  +++ Script.java	2001/10/28 21:30:18	1.8
  @@ -53,10 +53,15 @@
    */
   package org.apache.tools.ant.taskdefs.optional;
   
  -import com.ibm.bsf.*;
  -import java.io.*;
  -import java.util.*;
  -import org.apache.tools.ant.*;
  +import com.ibm.bsf.BSFManager;
  +import com.ibm.bsf.BSFException;
  +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 org.apache.tools.ant.BuildException;
   
   /**
    * Execute a script
  
  
  
  1.4       +3 -3      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StyleBook.java	2001/09/29 03:45:56	1.3
  +++ StyleBook.java	2001/10/28 21:30:18	1.4
  @@ -55,9 +55,9 @@
   
   import java.io.File;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.types.CommandlineJava;
  -import org.apache.tools.ant.types.Path;
  -import org.apache.tools.ant.Task;
  +
  +
  +
   import org.apache.tools.ant.taskdefs.Java;
   
   /**
  
  
  
  1.5       +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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Test.java	2001/02/09 13:59:30	1.4
  +++ Test.java	2001/10/28 21:30:18	1.5
  @@ -66,7 +66,7 @@
    
       protected Vector                          m_tests            = new Vector();
   
  -    protected static final class TestletEntry {
  +    protected final static class TestletEntry {
   
           protected String m_testname = "";
   
  
  
  
  1.5       +1 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TraXLiaison.java	2001/08/18 14:59:39	1.4
  +++ TraXLiaison.java	2001/10/28 21:30:18	1.5
  @@ -64,7 +64,7 @@
   import javax.xml.transform.TransformerFactory;
   import javax.xml.transform.Transformer;
   import javax.xml.transform.Templates;
  -import javax.xml.transform.Source;
  +
   import javax.xml.transform.stream.StreamResult;
   import javax.xml.transform.stream.StreamSource;
   
  
  
  
  1.7       +1 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XalanLiaison.java	2001/08/18 14:59:39	1.6
  +++ XalanLiaison.java	2001/10/28 21:30:18	1.7
  @@ -60,7 +60,7 @@
   import org.apache.xalan.xslt.XSLTProcessor;
   import org.apache.xalan.xslt.XSLTInputSource;
   import org.apache.xalan.xslt.XSLTResultTarget;
  -import org.xml.sax.InputSource;
  +
   
   import java.io.File;
   import java.io.FileInputStream;
  
  
  
  1.6       +20 -3     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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLValidateTask.java	2001/10/06 07:00:14	1.5
  +++ XMLValidateTask.java	2001/10/28 21:30:18	1.6
  @@ -53,10 +53,19 @@
    */
   package org.apache.tools.ant.taskdefs.optional;
   
  -import java.io.*;
  +import java.io.File;
  +import java.io.FileReader;
  +import java.io.IOException;
  +import java.io.FileInputStream;
  +import java.io.FileNotFoundException;
  +import java.io.InputStream;
   import java.net.MalformedURLException;
   import java.net.URL;
  -import java.util.*;
  +import java.util.Vector;
  +import java.util.Hashtable;
  +import java.util.ArrayList;
  +import java.util.Iterator;
  +import java.util.Enumeration;
   import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
  @@ -65,7 +74,15 @@
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
  -import org.xml.sax.*;
  +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.SAXException;
  +import org.xml.sax.SAXParseException;
   import org.xml.sax.helpers.ParserAdapter;
   
   /**
  
  
  
  1.7       +6 -4      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XslpLiaison.java	2001/08/18 14:59:39	1.6
  +++ XslpLiaison.java	2001/10/28 21:30:18	1.7
  @@ -54,13 +54,15 @@
   
   package org.apache.tools.ant.taskdefs.optional;
   
  -import java.io.*;
  -import java.net.URL;
  +import java.io.File;
  +import java.io.FileOutputStream;
  +import java.io.OutputStreamWriter;
   
  +
   import org.apache.tools.ant.taskdefs.XSLTLiaison;
  -import org.xml.sax.InputSource;
  +
  +
   
  -import com.kvisco.xsl.*;
   
   /**
    * Concrete liaison for XSLP
  
  
  
  1.2       +5 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CCMCheck.java	2001/07/27 09:14:58	1.1
  +++ CCMCheck.java	2001/10/28 21:30:19	1.2
  @@ -54,10 +54,11 @@
   
   package org.apache.tools.ant.taskdefs.optional.ccm;
   
  -import org.apache.tools.ant.*;
  +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.io.File;
   
   /**
  @@ -174,11 +175,11 @@
       /**
        * -comment flag -- comment to attach to the file
        */
  -    public static final String FLAG_COMMENT = "/comment";
  +    public final static String FLAG_COMMENT = "/comment";
       
       /**
        *  -task flag -- associate checckout task with task
        */
  -    public static final String FLAG_TASK = "/task";   
  +    public final static String FLAG_TASK = "/task";   
   }
   
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java
  
  Index: CCMCheckinDefault.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CCMCheckinDefault.java	2001/07/27 09:14:58	1.1
  +++ CCMCheckinDefault.java	2001/10/28 21:30:19	1.2
  @@ -66,6 +66,6 @@
           setTask(DEFAULT_TASK);
       }
   
  -    public static final String DEFAULT_TASK = "default";   
  +    public final static String DEFAULT_TASK = "default";   
   }
   
  
  
  
  1.2       +11 -10    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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CCMCreateTask.java	2001/07/27 09:14:58	1.1
  +++ CCMCreateTask.java	2001/10/28 21:30:19	1.2
  @@ -56,16 +56,17 @@
   
   
   import java.io.BufferedReader;
  -import java.io.File;
  +
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.InputStreamReader;
   import java.io.OutputStream;
  -import java.lang.NullPointerException;
  -import org.apache.tools.ant.*;
  +
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
   import org.apache.tools.ant.types.Commandline;
  -import org.apache.tools.ant.types.Path;
  +
   
   /**
    * Task allows to create new ccm task and set it as the default
  @@ -262,32 +263,32 @@
       /**
        * /comment -- comments associated to the task
        */
  -    public static final String FLAG_COMMENT = "/synopsis";
  +    public final static String FLAG_COMMENT = "/synopsis";
       
       /**
        *  /platform flag -- target platform
        */
  -    public static final String FLAG_PLATFORM = "/plat";   
  +    public final static String FLAG_PLATFORM = "/plat";   
   
       /**
        * /resolver flag
        */
  -    public static final String FLAG_RESOLVER = "/resolver";   
  +    public final static String FLAG_RESOLVER = "/resolver";   
   
       /**
        * /release flag
        */
  -    public static final String FLAG_RELEASE = "/release";   
  +    public final static String FLAG_RELEASE = "/release";   
   
       /**
        * /release flag
        */
  -    public static final String FLAG_SUBSYSTEM = "/subsystem";   
  +    public final static String FLAG_SUBSYSTEM = "/subsystem";   
   
       /**
        *  -task flag -- associate checckout task with task
        */
  -    public static final String FLAG_TASK = "/task";   
  +    public final static String FLAG_TASK = "/task";   
   
   
       // implementation of org.apache.tools.ant.taskdefs.ExecuteStreamHandler interface
  
  
  
  1.2       +12 -11    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java
  
  Index: CCMReconfigure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CCMReconfigure.java	2001/07/27 09:14:58	1.1
  +++ CCMReconfigure.java	2001/10/28 21:30:19	1.2
  @@ -55,15 +55,16 @@
   package org.apache.tools.ant.taskdefs.optional.ccm;
   
   
  -import java.io.BufferedReader;
  -import java.io.File;
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.InputStreamReader;
  -import java.io.OutputStream;
  -import org.apache.tools.ant.*;
  +
  +
  +
  +
  +
  +
  +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;
  +
   
   /**
    * Task allows to reconfigure a project, recurcively or not 
  @@ -185,18 +186,18 @@
       /**
        * /recurse -- 
        */
  -    public static final String FLAG_RECURSE = "/recurse";
  +    public final static String FLAG_RECURSE = "/recurse";
   
       /**
        * /recurse -- 
        */
  -    public static final String FLAG_VERBOSE = "/verbose";
  +    public final static String FLAG_VERBOSE = "/verbose";
   
       
       /**
        *  /project flag -- target project
        */
  -    public static final String FLAG_PROJECT = "/project";   
  +    public final static String FLAG_PROJECT = "/project";   
   
   }
   
  
  
  
  1.2       +10 -8     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
  
  Index: Continuus.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Continuus.java	2001/07/27 09:14:58	1.1
  +++ Continuus.java	2001/10/28 21:30:19	1.2
  @@ -54,14 +54,16 @@
   
   package org.apache.tools.ant.taskdefs.optional.ccm;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +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.LogStreamHandler;
   import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
   import org.apache.tools.ant.types.Commandline;
   
  -import java.io.File;
   
  +
   /**
    * A base class for creating tasks for executing commands on Continuus 5.1
    * <p>
  @@ -139,29 +141,29 @@
       /**
        * Constant for the thing to execute
        */
  -    private static final String CCM_EXE = "ccm";
  +    private final static String CCM_EXE = "ccm";
   
       /**
        * The 'CreateTask' command
        */
  -    public static final String COMMAND_CREATE_TASK = "create_task";
  +    public final static String COMMAND_CREATE_TASK = "create_task";
       /**
        * The 'Checkout' command
        */
  -    public static final String COMMAND_CHECKOUT = "co";
  +    public final static String COMMAND_CHECKOUT = "co";
       /**
        * The 'Checkin' command
        */
  -    public static final String COMMAND_CHECKIN = "ci";
  +    public final static String COMMAND_CHECKIN = "ci";
       /**
        * The 'Reconfigure' command
        */
  -    public static final String COMMAND_RECONFIGURE = "reconfigure";
  +    public final static String COMMAND_RECONFIGURE = "reconfigure";
   
       /**
        * The 'Reconfigure' command
        */
  -    public static final String COMMAND_DEFAULT_TASK = "default_task";
  +    public final static String COMMAND_DEFAULT_TASK = "default_task";
   
   
   }
  
  
  
  1.2       +11 -10    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java
  
  Index: CCCheckin.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CCCheckin.java	2000/11/30 12:41:09	1.1
  +++ CCCheckin.java	2001/10/28 21:30:19	1.2
  @@ -54,12 +54,13 @@
   
   package org.apache.tools.ant.taskdefs.optional.clearcase;
   
  -import org.apache.tools.ant.*;
  +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.io.File;
   
  +
  +
   /**
    * Task to perform Checkin command to ClearCase.
    * <p>
  @@ -341,31 +342,31 @@
           /**
        * -c flag -- comment to attach to the file
        */
  -    public static final String FLAG_COMMENT = "-c";
  +    public final static String FLAG_COMMENT = "-c";
           /**
        * -cfile flag -- file containing a comment to attach to the file
        */
  -    public static final String FLAG_COMMENTFILE = "-cfile";
  +    public final static String FLAG_COMMENTFILE = "-cfile";
           /**
        * -nc flag -- no comment is specified
        */
  -    public static final String FLAG_NOCOMMENT = "-nc";
  +    public final static String FLAG_NOCOMMENT = "-nc";
           /**
        * -nwarn flag -- suppresses warning messages
        */
  -    public static final String FLAG_NOWARN = "-nwarn";
  +    public final static String FLAG_NOWARN = "-nwarn";
           /**
        * -ptime flag -- preserves the modification time
        */
  -    public static final String FLAG_PRESERVETIME = "-ptime";
  +    public final static String FLAG_PRESERVETIME = "-ptime";
           /**
        * -keep flag -- keeps a copy of the file with a .keep extension
        */
  -    public static final String FLAG_KEEPCOPY = "-keep";
  +    public final static String FLAG_KEEPCOPY = "-keep";
           /**
        * -identical flag -- allows the file to be checked in even if it is identical to the original
        */
  -    public static final String FLAG_IDENTICAL = "-identical";
  +    public final static String FLAG_IDENTICAL = "-identical";
   
   }
   
  
  
  
  1.2       +14 -13    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
  
  Index: CCCheckout.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CCCheckout.java	2000/11/30 12:41:09	1.1
  +++ CCCheckout.java	2001/10/28 21:30:19	1.2
  @@ -54,12 +54,13 @@
   
   package org.apache.tools.ant.taskdefs.optional.clearcase;
   
  -import org.apache.tools.ant.*;
  +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.io.File;
   
  +
  +
   /**
    * Task to perform Checkout command to ClearCase.
    * <p>
  @@ -441,43 +442,43 @@
           /**
        *  -reserved flag -- check out the file as reserved
        */
  -    public static final String FLAG_RESERVED = "-reserved";
  +    public final static String FLAG_RESERVED = "-reserved";
           /**
        *  -reserved flag -- check out the file as unreserved
        */
  -    public static final String FLAG_UNRESERVED = "-unreserved";
  +    public final static String FLAG_UNRESERVED = "-unreserved";
           /**
        * -out flag -- create a writable file under a different filename
        */
  -    public static final String FLAG_OUT = "-out";
  +    public final static String FLAG_OUT = "-out";
           /**
        * -ndata flag -- checks out the file but does not create an editable file containing its data
        */
  -    public static final String FLAG_NODATA = "-ndata";
  +    public final static String FLAG_NODATA = "-ndata";
           /**
        * -branch flag -- checks out the file on a specified branch
        */
  -    public static final String FLAG_BRANCH = "-branch";
  +    public final static String FLAG_BRANCH = "-branch";
           /**
        * -version flag -- allows checkout of a version that is not main latest
        */
  -    public static final String FLAG_VERSION = "-version";
  +    public final static String FLAG_VERSION = "-version";
           /**
        * -nwarn flag -- suppresses warning messages
        */
  -    public static final String FLAG_NOWARN = "-nwarn";
  +    public final static String FLAG_NOWARN = "-nwarn";
           /**
        * -c flag -- comment to attach to the file
        */
  -    public static final String FLAG_COMMENT = "-c";
  +    public final static String FLAG_COMMENT = "-c";
           /**
        * -cfile flag -- file containing a comment to attach to the file
        */
  -    public static final String FLAG_COMMENTFILE = "-cfile";
  +    public final static String FLAG_COMMENTFILE = "-cfile";
           /**
        * -nc flag -- no comment is specified
        */
  -    public static final String FLAG_NOCOMMENT = "-nc";
  +    public final static String FLAG_NOCOMMENT = "-nc";
   
   }
   
  
  
  
  1.2       +6 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java
  
  Index: CCUnCheckout.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CCUnCheckout.java	2000/11/30 12:41:09	1.1
  +++ CCUnCheckout.java	2001/10/28 21:30:19	1.2
  @@ -54,12 +54,13 @@
   
   package org.apache.tools.ant.taskdefs.optional.clearcase;
   
  -import org.apache.tools.ant.*;
  +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.io.File;
   
  +
  +
   /**
    * Task to perform UnCheckout command to ClearCase.
    * <p>
  @@ -158,11 +159,11 @@
           /**
        *  -keep flag -- keep a copy of the file with .keep extension
        */
  -    public static final String FLAG_KEEPCOPY = "-keep";
  +    public final static String FLAG_KEEPCOPY = "-keep";
           /**
        *  -rm flag -- remove the copy of the file
        */
  -    public static final String FLAG_RM = "-rm";
  +    public final static String FLAG_RM = "-rm";
   
   }
   
  
  
  
  1.2       +12 -11    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java
  
  Index: CCUpdate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CCUpdate.java	2000/11/30 12:41:09	1.1
  +++ CCUpdate.java	2001/10/28 21:30:19	1.2
  @@ -54,13 +54,14 @@
   
   package org.apache.tools.ant.taskdefs.optional.clearcase;
   
  -import org.apache.tools.ant.*;
  +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.io.File;
  -import java.lang.System;
   
  +
  +
  +
   /**
    * Task to perform an Update command to ClearCase.
    * <p>
  @@ -325,31 +326,31 @@
           /**
        *  -graphical flag -- display graphical dialog during update operation
        */
  -    public static final String FLAG_GRAPHICAL = "-graphical";
  +    public final static String FLAG_GRAPHICAL = "-graphical";
           /**
        * -log flag -- file to log status to
        */
  -    public static final String FLAG_LOG = "-log";
  +    public final static String FLAG_LOG = "-log";
           /**
        * -overwrite flag -- overwrite hijacked files
        */
  -    public static final String FLAG_OVERWRITE = "-overwrite";
  +    public final static String FLAG_OVERWRITE = "-overwrite";
           /**
        * -noverwrite flag -- do not overwrite hijacked files
        */
  -    public static final String FLAG_NOVERWRITE = "-noverwrite";
  +    public final static String FLAG_NOVERWRITE = "-noverwrite";
           /**
        * -rename flag -- rename hijacked files with .keep extension
        */
  -    public static final String FLAG_RENAME = "-rename";
  +    public final static String FLAG_RENAME = "-rename";
           /**
        * -ctime flag -- modified time is written as the current time
        */
  -    public static final String FLAG_CURRENTTIME = "-ctime";
  +    public final static String FLAG_CURRENTTIME = "-ctime";
           /**
        * -ptime flag -- modified time is written as the VOB time
        */
  -    public static final String FLAG_PRESERVETIME = "-ptime";
  +    public final static String FLAG_PRESERVETIME = "-ptime";
   
   }
   
  
  
  
  1.2       +9 -7      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ClearCase.java	2000/11/30 12:41:09	1.1
  +++ ClearCase.java	2001/10/28 21:30:19	1.2
  @@ -54,13 +54,15 @@
   
   package org.apache.tools.ant.taskdefs.optional.clearcase;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.taskdefs.Execute;
   import org.apache.tools.ant.taskdefs.LogStreamHandler;
   import org.apache.tools.ant.types.Commandline;
   
  -import java.io.File;
   
  +
   /**
    * A base class for creating tasks for executing commands on ClearCase.
    * <p>
  @@ -140,24 +142,24 @@
       /**
        * Constant for the thing to execute
        */
  -    private static final String CLEARTOOL_EXE = "cleartool";
  +    private final static String CLEARTOOL_EXE = "cleartool";
   
       /**
        * The 'Update' command
        */
  -    public static final String COMMAND_UPDATE = "update";
  +    public final static String COMMAND_UPDATE = "update";
       /**
        * The 'Checkout' command
        */
  -    public static final String COMMAND_CHECKOUT = "checkout";
  +    public final static String COMMAND_CHECKOUT = "checkout";
       /**
        * The 'Checkin' command
        */
  -    public static final String COMMAND_CHECKIN = "checkin";
  +    public final static String COMMAND_CHECKIN = "checkin";
       /**
        * The 'UndoCheckout' command
        */
  -    public static final String COMMAND_UNCHECKOUT = "uncheckout";
  +    public final static String COMMAND_UNCHECKOUT = "uncheckout";
   
   }
   
  
  
  
  1.4       +9 -5      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClassFile.java	2001/01/03 14:18:36	1.3
  +++ ClassFile.java	2001/10/28 21:30:19	1.4
  @@ -53,11 +53,15 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend;
   
  -import java.io.*;
  -import java.lang.reflect.Modifier;
  -import java.util.*;
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.*;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.DataInputStream;
   
  +import java.util.Vector;
  +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ClassCPInfo;
  +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPoolEntry;
  +
   /**
    * A ClassFile object stores information about a Java class.
    * 
  @@ -72,7 +76,7 @@
       /**
        * The Magic Value that marks the start of a Java class file
        */
  -    static private final int CLASS_MAGIC = 0xCAFEBABE;
  +    private final static int CLASS_MAGIC = 0xCAFEBABE;
   
   
       /**
  
  
  
  1.4       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java
  
  Index: ClassFileUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClassFileUtils.java	2001/03/02 15:58:41	1.3
  +++ ClassFileUtils.java	2001/10/28 21:30:19	1.4
  @@ -72,7 +72,7 @@
        * 
        * @return the class name in dot notation (eg. java.lang.Object).
        */
  -    static public String convertSlashName(String name) {
  +    public static String convertSlashName(String name) {
           return name.replace('\\', '.').replace( '/', '.' );
       } 
   
  @@ -83,7 +83,7 @@
        * 
        * @return the class name in slash notation (eg. java/lang/Object).
        */
  -    static public String convertDotName(String dotName) {
  +    public static String convertDotName(String dotName) {
           return dotName.replace( '.', '/');
       } 
   }
  
  
  
  1.13      +18 -6     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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Depend.java	2001/10/10 15:30:35	1.12
  +++ Depend.java	2001/10/28 21:30:19	1.13
  @@ -54,16 +54,28 @@
   
   package org.apache.tools.ant.taskdefs.optional.depend;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.AntClassLoader;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Reference;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   
  -import java.util.*;
  -import java.io.*;
  +import java.util.Hashtable;
  +import java.util.Vector;
  +import java.util.Enumeration;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.BufferedReader;
  +import java.io.FileReader;
  +import java.io.PrintWriter;
  +import java.io.FileWriter;
  +import java.io.FileInputStream;
   import java.net.URL;
   
  -import org.apache.tools.ant.taskdefs.optional.depend.*;
   
  +
   /**
    * Generate a dependency file for a given set of classes 
    *
  @@ -73,7 +85,7 @@
       /**
        * A class (struct) user to manage information about a class
        */
  -    static private class ClassFileInfo {
  +    private static class ClassFileInfo {
           /** The file where the class file is stored in the file system */
           public File absoluteFile;
           
  
  
  
  1.4       +6 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java
  
  Index: DirectoryIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DirectoryIterator.java	2001/01/03 14:18:36	1.3
  +++ DirectoryIterator.java	2001/10/28 21:30:19	1.4
  @@ -53,8 +53,12 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend;
   
  -import java.util.*;
  -import java.io.*;
  +import java.util.Stack;
  +import java.util.Enumeration;
  +import java.util.Vector;
  +import java.io.IOException;
  +import java.io.File;
  +import java.io.FileInputStream;
   
   /**
    * An iterator which iterates through the contents of a java directory.
  
  
  
  1.3       +5 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java
  
  Index: JarFileIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JarFileIterator.java	2001/01/03 14:18:36	1.2
  +++ JarFileIterator.java	2001/10/28 21:30:19	1.3
  @@ -53,8 +53,11 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend;
   
  -import java.util.zip.*;
  -import java.io.*;
  +import java.util.zip.ZipInputStream;
  +import java.util.zip.ZipEntry;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.ByteArrayOutputStream;
   
   /**
    * A class file iterator which iterates through the contents of a Java jar file.
  
  
  
  1.3       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.java
  
  Index: ClassCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClassCPInfo.java	2001/01/03 14:18:37	1.2
  +++ ClassCPInfo.java	2001/10/28 21:30:19	1.3
  @@ -53,8 +53,9 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
  +
   
   /**
    * The constant pool entry which stores class information.
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.java
  
  Index: ConstantCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConstantCPInfo.java	2001/01/03 14:18:37	1.2
  +++ ConstantCPInfo.java	2001/10/28 21:30:19	1.3
  @@ -53,7 +53,7 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.*;
  +
   
   /**
    * A Constant Pool entry which represents a constant value.
  
  
  
  1.3       +5 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
  
  Index: ConstantPool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConstantPool.java	2001/01/03 14:18:37	1.2
  +++ ConstantPool.java	2001/10/28 21:30:19	1.3
  @@ -53,8 +53,11 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
  +import java.util.Vector;
  +import java.util.Hashtable;
  +import java.util.Enumeration;
   
   /**
    * The constant pool of a Java class.
  
  
  
  1.3       +15 -14    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
  
  Index: ConstantPoolEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConstantPoolEntry.java	2001/01/03 14:18:37	1.2
  +++ ConstantPoolEntry.java	2001/10/28 21:30:19	1.3
  @@ -53,9 +53,10 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
  +
   /**
    * An entry in the constant pool.
    * 
  @@ -70,57 +71,57 @@
       /**
        * Tag value for UTF8 entries.
        */
  -    static public final int CONSTANT_Utf8 = 1;
  +    public final static int CONSTANT_Utf8 = 1;
   
       /**
        * Tag value for Integer entries.
        */
  -    static public final int CONSTANT_Integer = 3;
  +    public final static int CONSTANT_Integer = 3;
   
       /**
        * Tag value for Float entries.
        */
  -    static public final int CONSTANT_Float = 4;
  +    public final static int CONSTANT_Float = 4;
   
       /**
        * Tag value for Long entries.
        */
  -    static public final int CONSTANT_Long = 5;
  +    public final static int CONSTANT_Long = 5;
   
       /**
        * Tag value for Double entries.
        */
  -    static public final int CONSTANT_Double = 6;
  +    public final static int CONSTANT_Double = 6;
   
       /**
        * Tag value for Class entries.
        */
  -    static public final int CONSTANT_Class = 7;
  +    public final static int CONSTANT_Class = 7;
   
       /**
        * Tag value for String entries.
        */
  -    static public final int CONSTANT_String = 8;
  +    public final static int CONSTANT_String = 8;
   
       /**
        * Tag value for Field Reference entries.
        */
  -    static public final int CONSTANT_FieldRef = 9;
  +    public final static int CONSTANT_FieldRef = 9;
   
       /**
        * Tag value for Method Reference entries.
        */
  -    static public final int CONSTANT_MethodRef = 10;
  +    public final static int CONSTANT_MethodRef = 10;
   
       /**
        * Tag value for Interface Method Reference entries.
        */
  -    static public final int CONSTANT_InterfaceMethodRef = 11;
  +    public final static int CONSTANT_InterfaceMethodRef = 11;
   
       /**
        * Tag value for Name and Type entries.
        */
  -    static public final int CONSTANT_NameAndType = 12;
  +    public final static int CONSTANT_NameAndType = 12;
   
       /**
        * This entry's tag which identifies the type of this constant pool entry.
  @@ -163,7 +164,7 @@
        * 
        * @throws IOExcception if there is a problem reading the entry from the stream.
        */
  -    static public ConstantPoolEntry readEntry(DataInputStream cpStream) throws IOException {
  +    public static ConstantPoolEntry readEntry(DataInputStream cpStream) throws IOException {
           ConstantPoolEntry cpInfo = null;
           int               cpTag = cpStream.readUnsignedByte();
   
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java
  
  Index: DoubleCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DoubleCPInfo.java	2001/01/03 14:18:37	1.2
  +++ DoubleCPInfo.java	2001/10/28 21:30:19	1.3
  @@ -55,7 +55,7 @@
   
   import java.io.IOException;
   import java.io.DataInputStream;
  -import java.io.DataOutputStream;
  +
   
   /**
    * The constant pool entry subclass used to represent double constant values.
  
  
  
  1.3       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java
  
  Index: FieldRefCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FieldRefCPInfo.java	2001/01/03 14:18:37	1.2
  +++ FieldRefCPInfo.java	2001/10/28 21:30:19	1.3
  @@ -53,8 +53,9 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
  +
   
   /**
    * A FieldRef CP Info
  
  
  
  1.3       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java
  
  Index: FloatCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FloatCPInfo.java	2001/01/03 14:18:37	1.2
  +++ FloatCPInfo.java	2001/10/28 21:30:19	1.3
  @@ -53,7 +53,8 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
   /**
    * A Float CP Info
  
  
  
  1.3       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java
  
  Index: IntegerCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IntegerCPInfo.java	2001/01/03 14:18:37	1.2
  +++ IntegerCPInfo.java	2001/10/28 21:30:19	1.3
  @@ -53,7 +53,8 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
   /**
    * An Integer CP Info
  
  
  
  1.3       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java
  
  Index: InterfaceMethodRefCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InterfaceMethodRefCPInfo.java	2001/01/03 14:18:37	1.2
  +++ InterfaceMethodRefCPInfo.java	2001/10/28 21:30:19	1.3
  @@ -53,8 +53,9 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
  +
   
   /**
    * A InterfaceMethodRef CP Info
  
  
  
  1.3       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java
  
  Index: LongCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LongCPInfo.java	2001/01/03 14:18:37	1.2
  +++ LongCPInfo.java	2001/10/28 21:30:19	1.3
  @@ -53,7 +53,8 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
   /**
    * A Long CP Info
  
  
  
  1.3       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.java
  
  Index: MethodRefCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MethodRefCPInfo.java	2001/01/03 14:18:37	1.2
  +++ MethodRefCPInfo.java	2001/10/28 21:30:19	1.3
  @@ -53,8 +53,9 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
  +
   
   /**
    * A MethodRef CP Info
  
  
  
  1.3       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.java
  
  Index: NameAndTypeCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NameAndTypeCPInfo.java	2001/01/03 14:18:37	1.2
  +++ NameAndTypeCPInfo.java	2001/10/28 21:30:19	1.3
  @@ -53,8 +53,9 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
  +
   
   /**
    * A NameAndType CP Info
  
  
  
  1.3       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.java
  
  Index: StringCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StringCPInfo.java	2001/01/03 14:18:37	1.2
  +++ StringCPInfo.java	2001/10/28 21:30:19	1.3
  @@ -53,8 +53,9 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
  +
   
   /**
    * A String Constant Pool Entry.
  
  
  
  1.3       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.java
  
  Index: Utf8CPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Utf8CPInfo.java	2001/01/03 14:18:37	1.2
  +++ Utf8CPInfo.java	2001/10/28 21:30:19	1.3
  @@ -53,8 +53,9 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
  +
   
   /**
    * A UTF8 Constant Pool Entry.
  
  
  
  1.8       +9 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
  
  Index: CSharp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CSharp.java	2001/08/07 06:19:25	1.7
  +++ CSharp.java	2001/10/28 21:30:20	1.8
  @@ -72,12 +72,13 @@
   // imports
   // ====================================================================
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.types.*;
  -import java.io.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
   
  +import org.apache.tools.ant.types.Path;
  +import java.io.File;
   
  +
   // ====================================================================
   /**
   This task compiles CSharp source into executables or modules.
  @@ -145,15 +146,15 @@
       /** name of the executable. the .exe suffix is deliberately not included 
        * in anticipation of the unix version
        */
  -    protected static final String csc_exe_name="csc";
  +    protected final static String csc_exe_name="csc";
       
       /** what is the file extension we search on?
        */
  -    protected static final String csc_file_ext="cs";
  +    protected final static String csc_file_ext="cs";
       
       /** derive the search pattern from the extension 
        */
  -    protected static final String csc_file_pattern="**/*."+csc_file_ext;
  +    protected final static String csc_file_pattern="**/*."+csc_file_ext;
       
       /** list of reference classes. (pretty much a classpath equivalent)
        */
  @@ -238,7 +239,7 @@
        * so may work on a unix box too. 
        */
   
  -    protected static final String DEFAULT_REFERENCE_LIST=
  +    protected final static String DEFAULT_REFERENCE_LIST=
               "Accessibility.dll;"+
               "cscompmgd.dll;"+
               "CustomMarshalers.dll;"+
  
  
  
  1.8       +12 -10    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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Ilasm.java	2001/08/07 06:19:25	1.7
  +++ Ilasm.java	2001/10/28 21:30:20	1.8
  @@ -72,13 +72,15 @@
   // imports
   // ====================================================================
   
  -import java.io.*;
  -import java.text.*;
  -import java.util.*;
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.types.*;
  +import java.io.File;
   
  +
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.DirectoryScanner;
  +
  +
  +
   /**
   Task to assemble .net 'Intermediate Language' files.
   The task will only work on win2K until other platforms support csc.exe or 
  @@ -122,19 +124,19 @@
       /** name of the executable. the .exe suffix is deliberately not included 
        * in anticipation of the unix version
        */
  -    protected static final String exe_name="ilasm";
  +    protected final static String exe_name="ilasm";
       
       /** what is the file extension we search on?
        */
  -    protected static final String file_ext="il";
  +    protected final static String file_ext="il";
       
       /** and now derive the search pattern from the extension 
        */
  -    protected static final String file_pattern="**/*."+file_ext;
  +    protected final static String file_pattern="**/*."+file_ext;
       
       /** title of task for external presentation
        */
  -    protected static final String exe_title="ilasm";
  +    protected final static String exe_title="ilasm";
       
       /** reset all contents. 
       */
  
  
  
  1.6       +11 -6     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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NetCommand.java	2001/01/03 14:18:38	1.5
  +++ NetCommand.java	2001/10/28 21:30:20	1.6
  @@ -65,12 +65,17 @@
   
   // imports
   
  -import java.io.*;
  -import java.text.*;
  -import java.util.*;
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.types.*;
  +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.taskdefs.Execute;
  +import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
  +import org.apache.tools.ant.taskdefs.LogStreamHandler;
  +import org.apache.tools.ant.types.Commandline;
   
   
   /**
  
  
  
  1.10      +26 -15    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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- BorlandDeploymentTool.java	2001/08/30 13:26:37	1.9
  +++ BorlandDeploymentTool.java	2001/10/28 21:30:20	1.10
  @@ -56,16 +56,27 @@
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
   
  -import java.io.*;
  -import java.net.*;
  -import java.util.*;
  -import java.util.jar.*;
  -import javax.xml.parsers.*;
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.types.*;
  -import org.xml.sax.*;
  +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.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.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;
  +
  +
   /**
    * BorlandDeploymentTool is dedicated to the Borland Application Server 4.5 and 4.5.1
    * This task generates and compiles the stubs and skeletons for all ejb described into the
  @@ -98,22 +109,22 @@
    */
   public class BorlandDeploymentTool extends GenericDeploymentTool  implements ExecuteStreamHandler 
   {
  -    public static final String PUBLICID_BORLAND_EJB
  +    public final static String PUBLICID_BORLAND_EJB
       = "-//Inprise Corporation//DTD Enterprise JavaBeans 1.1//EN";
   
  -    protected static final String DEFAULT_BAS45_EJB11_DTD_LOCATION 
  +    protected final static String DEFAULT_BAS45_EJB11_DTD_LOCATION 
       = "/com/inprise/j2ee/xml/dtds/ejb-jar.dtd";
       
  -    protected static final String DEFAULT_BAS_DTD_LOCATION 
  +    protected final static String DEFAULT_BAS_DTD_LOCATION 
       = "/com/inprise/j2ee/xml/dtds/ejb-inprise.dtd";       
       
  -    protected static final String BAS_DD = "ejb-inprise.xml";    
  +    protected final static String BAS_DD = "ejb-inprise.xml";    
   
       /** Java2iiop executable **/
  -    protected static final String JAVA2IIOP = "java2iiop";
  +    protected final static String JAVA2IIOP = "java2iiop";
   
       /** Verify class */
  -    protected static final String VERIFY = "com.inprise.ejb.util.Verify";
  +    protected final static String VERIFY = "com.inprise.ejb.util.Verify";
   
       /** Instance variable that stores the suffix for the borland jarfile. */
       private String jarSuffix = "-ejb.jar";
  
  
  
  1.4       +13 -10    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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BorlandGenerateClient.java	2001/04/24 08:41:55	1.3
  +++ BorlandGenerateClient.java	2001/10/28 21:30:20	1.4
  @@ -55,17 +55,20 @@
   
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  -import java.io.*;
  -import java.net.*;
  -import java.util.*;
  -import javax.xml.parsers.*;
  +import java.io.File;
   
  -import org.apache.tools.ant.*;
  +
  +
  +
  +import org.apache.tools.ant.Task;
  +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.Java;
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.types.Commandline.Argument;
  -import org.xml.sax.*;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Reference;
  +
  +
   
   /**
    * BorlandGenerateClient is dedicated to the Borland Application Server 4.5
  @@ -78,8 +81,8 @@
    */
   public class BorlandGenerateClient extends Task
   {
  -    static final String JAVA_MODE = "java";
  -    static final String FORK_MODE = "fork";
  +    final static String JAVA_MODE = "java";
  +    final static String FORK_MODE = "fork";
   
       /** debug the generateclient task */
       boolean debug = false;
  
  
  
  1.9       +6 -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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DDCreator.java	2001/01/03 14:18:39	1.8
  +++ DDCreator.java	2001/10/28 21:30:20	1.9
  @@ -53,9 +53,12 @@
    */
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.types.*;
  +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.types.Commandline;
  +import org.apache.tools.ant.types.Path;
   
   import java.io.File;
   
  
  
  
  1.17      +28 -23    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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DescriptorHandler.java	2001/10/10 15:14:34	1.16
  +++ DescriptorHandler.java	2001/10/28 21:30:20	1.17
  @@ -54,15 +54,20 @@
   
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  -import java.util.*;
  -import java.io.*;
  -import java.net.*;
  +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.net.URL;
   
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   import org.xml.sax.AttributeList;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.Project;
   
   /**
    * Inner class used by EjbJar to facilitate the parsing of deployment
  @@ -73,12 +78,12 @@
    * list can then be accessed through the getFiles() method.
    */
   public class DescriptorHandler extends org.xml.sax.HandlerBase {
  -    static private final int STATE_LOOKING_EJBJAR = 1;
  -    static private final int STATE_IN_EJBJAR = 2;
  -    static private final int STATE_IN_BEANS = 3;
  -    static private final int STATE_IN_SESSION = 4;
  -    static private final int STATE_IN_ENTITY = 5;
  -    static private final int STATE_IN_MESSAGE = 6;
  +    private final static int STATE_LOOKING_EJBJAR = 1;
  +    private final static int STATE_IN_EJBJAR = 2;
  +    private final static int STATE_IN_BEANS = 3;
  +    private final static int STATE_IN_SESSION = 4;
  +    private final static int STATE_IN_ENTITY = 5;
  +    private final static int STATE_IN_MESSAGE = 6;
   
       private Task owningTask;
   
  @@ -88,19 +93,19 @@
        * Bunch of constants used for storing entries in a hashtable, and for
        * constructing the filenames of various parts of the ejb jar.
        */
  -    private static final String EJB_REF               = "ejb-ref";
  -    private static final String HOME_INTERFACE        = "home";
  -    private static final String REMOTE_INTERFACE      = "remote";
  -    private static final String LOCAL_HOME_INTERFACE  = "local-home";
  -    private static final String LOCAL_INTERFACE       = "local";
  -    private static final String BEAN_CLASS            = "ejb-class";
  -    private static final String PK_CLASS              = "prim-key-class";
  -    private static final String EJB_NAME              = "ejb-name";
  -    private static final String EJB_JAR               = "ejb-jar";
  -    private static final String ENTERPRISE_BEANS      = "enterprise-beans";
  -    private static final String ENTITY_BEAN           = "entity";
  -    private static final String SESSION_BEAN          = "session";
  -    private static final String MESSAGE_BEAN          = "message-driven";
  +    private final static String EJB_REF               = "ejb-ref";
  +    private final static String HOME_INTERFACE        = "home";
  +    private final static String REMOTE_INTERFACE      = "remote";
  +    private final static String LOCAL_HOME_INTERFACE  = "local-home";
  +    private final static String LOCAL_INTERFACE       = "local";
  +    private final static String BEAN_CLASS            = "ejb-class";
  +    private final static String PK_CLASS              = "prim-key-class";
  +    private final static String EJB_NAME              = "ejb-name";
  +    private final static String EJB_JAR               = "ejb-jar";
  +    private final static String ENTERPRISE_BEANS      = "enterprise-beans";
  +    private final static String ENTITY_BEAN           = "entity";
  +    private final static String SESSION_BEAN          = "session";
  +    private final static String MESSAGE_BEAN          = "message-driven";
   
       /**
        * The state of the parsing
  
  
  
  1.12      +6 -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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Ejbc.java	2001/01/03 14:18:39	1.11
  +++ Ejbc.java	2001/10/28 21:30:20	1.12
  @@ -53,9 +53,12 @@
    */
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.types.*;
  +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.types.Commandline;
  +import org.apache.tools.ant.types.Path;
   
   import java.io.File;
   
  
  
  
  1.10      +7 -2      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- EjbcHelper.java	2001/04/24 07:09:28	1.9
  +++ EjbcHelper.java	2001/10/28 21:30:20	1.10
  @@ -53,8 +53,13 @@
    */
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.FileInputStream;
  +import java.io.ObjectInputStream;
  +import java.io.FileWriter;
  +import java.io.PrintWriter;
  +import java.util.Vector;
   
   import javax.ejb.deployment.EntityDescriptor;
   import javax.ejb.deployment.DeploymentDescriptor;
  
  
  
  1.10      +2 -2      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- EJBDeploymentTool.java	2001/09/13 08:40:38	1.9
  +++ EJBDeploymentTool.java	2001/10/28 21:30:20	1.10
  @@ -54,13 +54,13 @@
   
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  -import java.io.*;
   
  +
   import javax.xml.parsers.SAXParser;
   
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.types.*;
  +
   
   public interface EJBDeploymentTool {
       /**
  
  
  
  1.23      +11 -7     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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- EjbJar.java	2001/09/13 08:33:45	1.22
  +++ EjbJar.java	2001/10/28 21:30:20	1.23
  @@ -55,8 +55,10 @@
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
   // Standard java imports
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.util.List;
  +import java.util.ArrayList;
  +import java.util.Iterator;
   
   // XML imports
   import javax.xml.parsers.SAXParser;
  @@ -69,7 +71,9 @@
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.taskdefs.MatchingTask;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.types.FileSet;
   
   /**
    * <p>Provides automated ejb jar file creation for ant.  Extends the MatchingTask
  @@ -175,10 +179,10 @@
       }
   
       public static class NamingScheme extends EnumeratedAttribute {
  -        static public final String EJB_NAME = "ejb-name";
  -        static public final String DIRECTORY = "directory";
  -        static public final String DESCRIPTOR = "descriptor";
  -        static public final String BASEJARNAME = "basejarname";
  +        public final static String EJB_NAME = "ejb-name";
  +        public final static String DIRECTORY = "directory";
  +        public final static String DESCRIPTOR = "descriptor";
  +        public final static String BASEJARNAME = "basejarname";
           public String[] getValues() {
               return new String[] {EJB_NAME, DIRECTORY, DESCRIPTOR, BASEJARNAME};
           }
  
  
  
  1.23      +23 -9     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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- GenericDeploymentTool.java	2001/08/08 11:43:35	1.22
  +++ GenericDeploymentTool.java	2001/10/28 21:30:20	1.23
  @@ -53,18 +53,32 @@
    */
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  -import java.io.*;
  -import java.util.*;
  -import java.util.jar.*;
  -import java.util.zip.*;
  -import java.net.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.FileInputStream;
  +import java.io.InputStream;
  +import java.io.FileOutputStream;
  +import java.util.Hashtable;
  +import java.util.List;
  +import java.util.Iterator;
  +import java.util.ArrayList;
  +import java.util.jar.JarOutputStream;
  +import java.util.jar.Manifest;
  +import java.util.zip.ZipEntry;
   
  +
   import javax.xml.parsers.SAXParser;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +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.types.FileSet;
   
   /**
    * A deployment tool which creates generic EJB jars. Generic jars contains
  @@ -76,8 +90,8 @@
    */
   public class GenericDeploymentTool implements EJBDeploymentTool {
       /** Private constants that are used when constructing the standard jarfile */
  -    protected static final String META_DIR  = "META-INF/";
  -    protected static final String EJB_DD    = "ejb-jar.xml";
  +    protected final static String META_DIR  = "META-INF/";
  +    protected final static String EJB_DD    = "ejb-jar.xml";
   
       /**
        * The configuration from the containing task. This config combined with the 
  
  
  
  1.4       +2 -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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InnerClassFilenameFilter.java	2001/01/03 14:18:39	1.3
  +++ InnerClassFilenameFilter.java	2001/10/28 21:30:20	1.4
  @@ -53,7 +53,8 @@
    */
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  -import java.io.*;
  +import java.io.FilenameFilter;
  +import java.io.File;
   
   public class InnerClassFilenameFilter implements FilenameFilter {
       private String baseClassName;
  
  
  
  1.4       +1 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IPlanetDeploymentTool.java	2001/06/25 15:17:32	1.3
  +++ IPlanetDeploymentTool.java	2001/10/28 21:30:20	1.4
  @@ -150,7 +150,7 @@
        * written in the completed JAR file as "ias-ejb-jar.xml".  This is the
        * naming convention implemented by iAS.
        */
  -    private static final String IAS_DD = "ias-ejb-jar.xml";    
  +    private final static String IAS_DD = "ias-ejb-jar.xml";    
   
       /**
        * Setter method used to store the "home" directory of the user's iAS
  
  
  
  1.2       +5 -5      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IPlanetEjbc.java	2001/05/01 10:31:48	1.1
  +++ IPlanetEjbc.java	2001/10/28 21:30:20	1.2
  @@ -69,9 +69,9 @@
   import java.util.StringTokenizer;
   import java.util.Properties;
   import java.util.Date;
  -import java.util.jar.JarFile;
  -import java.util.zip.ZipEntry;
   
  +
  +
   import javax.xml.parsers.SAXParser;
   import javax.xml.parsers.SAXParserFactory;
   import org.xml.sax.HandlerBase;
  @@ -106,9 +106,9 @@
   public class IPlanetEjbc {
   
   	/* Constants used for the "beantype" attribute */
  -	private static final String ENTITY_BEAN       = "entity";
  -	private static final String STATELESS_SESSION = "stateless";
  -	private static final String STATEFUL_SESSION  = "stateful";
  +	private final static String ENTITY_BEAN       = "entity";
  +	private final static String STATELESS_SESSION = "stateless";
  +	private final static String STATEFUL_SESSION  = "stateful";
   
   	/* Filenames of the standard EJB descriptor and the iAS-specific descriptor */
   	private File        stdDescriptor;
  
  
  
  1.4       +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java
  
  Index: JbossDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JbossDeploymentTool.java	2001/06/25 15:17:33	1.3
  +++ JbossDeploymentTool.java	2001/10/28 21:30:20	1.4
  @@ -53,9 +53,9 @@
    */
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  -import java.io.*;
  -import java.util.*;
  -import org.apache.tools.ant.*;
  +import java.io.File;
  +import java.util.Hashtable;
  +import org.apache.tools.ant.Project;
   
   /**
    * The deployment tool to add the jboss specific deployment descriptor to the ejb jar file.
  @@ -67,8 +67,8 @@
    * @see EjbJar#createJboss
    */
   public class JbossDeploymentTool extends GenericDeploymentTool {
  -    protected static final String JBOSS_DD = "jboss.xml";
  -    protected static final String JBOSS_CMPD = "jaws.xml";
  +    protected final static String JBOSS_DD = "jboss.xml";
  +    protected final static String JBOSS_CMPD = "jaws.xml";
   
       /** Instance variable that stores the suffix for the jboss jarfile. */
       private String jarSuffix = ".jar";
  
  
  
  1.32      +36 -25    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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- WeblogicDeploymentTool.java	2001/10/09 12:13:40	1.31
  +++ WeblogicDeploymentTool.java	2001/10/28 21:30:20	1.32
  @@ -54,49 +54,60 @@
   
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  -import java.io.*;
  -import java.util.jar.*;
  -import java.util.*;
  -import java.net.*;
  -
  -import javax.xml.parsers.*;
  -import org.xml.sax.*;
  -
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.FileInputStream;
  +import java.io.FileOutputStream;
  +import java.io.InputStream;
  +import java.util.jar.JarFile;
  +import java.util.jar.JarOutputStream;
  +import java.util.jar.JarEntry;
  +import java.util.Hashtable;
  +import java.util.Iterator;
  +import java.util.Enumeration;
  +
  +
  +import javax.xml.parsers.SAXParserFactory;
  +import javax.xml.parsers.SAXParser;
  +import org.xml.sax.InputSource;
  +
  +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;
   
   public class WeblogicDeploymentTool extends GenericDeploymentTool {
  -    public static final String PUBLICID_EJB11
  +    public final static String PUBLICID_EJB11
           = "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN";
  -    public static final String PUBLICID_EJB20
  +    public final static String PUBLICID_EJB20
           = "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN";
  -    public static final String PUBLICID_WEBLOGIC_EJB510
  +    public final static String PUBLICID_WEBLOGIC_EJB510
           = "-//BEA Systems, Inc.//DTD WebLogic 5.1.0 EJB//EN";
  -    public static final String PUBLICID_WEBLOGIC_EJB600
  +    public final static String PUBLICID_WEBLOGIC_EJB600
           = "-//BEA Systems, Inc.//DTD WebLogic 6.0.0 EJB//EN";
   
  -    protected static final String DEFAULT_WL51_EJB11_DTD_LOCATION
  +    protected final static String DEFAULT_WL51_EJB11_DTD_LOCATION
           = "/weblogic/ejb/deployment/xml/ejb-jar.dtd";
  -    protected static final String DEFAULT_WL60_EJB11_DTD_LOCATION
  +    protected final static String DEFAULT_WL60_EJB11_DTD_LOCATION
           = "/weblogic/ejb20/dd/xml/ejb11-jar.dtd";
  -    protected static final String DEFAULT_WL60_EJB20_DTD_LOCATION
  +    protected final static String DEFAULT_WL60_EJB20_DTD_LOCATION
           = "/weblogic/ejb20/dd/xml/ejb20-jar.dtd";
   
  -    protected static final String DEFAULT_WL51_DTD_LOCATION
  +    protected final static String DEFAULT_WL51_DTD_LOCATION
           = "/weblogic/ejb/deployment/xml/weblogic-ejb-jar.dtd";
  -    protected static final String DEFAULT_WL60_51_DTD_LOCATION
  +    protected final static String DEFAULT_WL60_51_DTD_LOCATION
           = "/weblogic/ejb20/dd/xml/weblogic510-ejb-jar.dtd";
  -    protected static final String DEFAULT_WL60_DTD_LOCATION
  +    protected final static String DEFAULT_WL60_DTD_LOCATION
           = "/weblogic/ejb20/dd/xml/weblogic600-ejb-jar.dtd";
   
  -    protected static final String DEFAULT_COMPILER = "default";
  +    protected final static String DEFAULT_COMPILER = "default";
   
  -    protected static final String WL_DD = "weblogic-ejb-jar.xml";
  -    protected static final String WL_CMP_DD = "weblogic-cmp-rdbms-jar.xml";
  +    protected final static String WL_DD = "weblogic-ejb-jar.xml";
  +    protected final static String WL_CMP_DD = "weblogic-cmp-rdbms-jar.xml";
   
  -    protected static final String COMPILER_EJB11 = "weblogic.ejbc";
  -    protected static final String COMPILER_EJB20 = "weblogic.ejbc20";
  +    protected final static String COMPILER_EJB11 = "weblogic.ejbc";
  +    protected final static String COMPILER_EJB20 = "weblogic.ejbc20";
   
       /** Instance variable that stores the suffix for the weblogic jarfile. */
       private String jarSuffix = ".jar";
  
  
  
  1.8       +3 -3      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- WeblogicTOPLinkDeploymentTool.java	2001/06/25 15:17:37	1.7
  +++ WeblogicTOPLinkDeploymentTool.java	2001/10/28 21:30:20	1.8
  @@ -54,15 +54,15 @@
   
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.util.Hashtable;
   
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   
   public class WeblogicTOPLinkDeploymentTool extends WeblogicDeploymentTool {
   
  -    private static final String TL_DTD_LOC = "http://www.objectpeople.com/tlwl/dtd/toplink-cmp_2_5_1.dtd";
  +    private final static String TL_DTD_LOC = "http://www.objectpeople.com/tlwl/dtd/toplink-cmp_2_5_1.dtd";
   
       private String toplinkDescriptor;
       private String toplinkDTD;
  
  
  
  1.13      +5 -5      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- WLRun.java	2001/08/30 13:26:37	1.12
  +++ WLRun.java	2001/10/28 21:30:20	1.13
  @@ -55,9 +55,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.*;
  +import org.apache.tools.ant.taskdefs.Java;
   import org.apache.tools.ant.types.Path;
   
   import java.io.File;
  @@ -69,9 +69,9 @@
    * @author <a href="mailto:conor@cortexebusiness.com.au">Conor MacNeill</a>, Cortex ebusiness Pty Limited
    */
   public class WLRun extends Task {
  -    static protected final String DEFAULT_WL51_POLICY_FILE = "weblogic.policy";
  -    static protected final String DEFAULT_WL60_POLICY_FILE = "lib/weblogic.policy";
  -    static protected final String DEFAULT_PROPERTIES_FILE = "weblogic.properties";
  +    protected final static String DEFAULT_WL51_POLICY_FILE = "weblogic.policy";
  +    protected final static String DEFAULT_WL60_POLICY_FILE = "lib/weblogic.policy";
  +    protected final static String DEFAULT_PROPERTIES_FILE = "weblogic.properties";
   
       /**
        * The classpath to be used when running the Java VM. It must contain the weblogic
  
  
  
  1.8       +2 -2      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- WLStop.java	2001/02/13 12:31:59	1.7
  +++ WLStop.java	2001/10/28 21:30:20	1.8
  @@ -55,9 +55,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.*;
  +import org.apache.tools.ant.taskdefs.Java;
   import org.apache.tools.ant.types.Path;
   
   import java.io.File;
  
  
  
  1.3       +2 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VAJAntTool.java	2001/10/25 12:37:31	1.2
  +++ VAJAntTool.java	2001/10/28 21:30:20	1.3
  @@ -57,7 +57,7 @@
   
   import com.ibm.ivj.util.base.Project;
   import com.ibm.ivj.util.base.ToolData;
  -import com.ibm.ivj.util.base.IvjException;
  +
   import org.apache.tools.ant.BuildException;
   
   
  @@ -71,7 +71,7 @@
    * @author: Wolf Siberski
    */
   public class VAJAntTool {
  -    private static final String TOOL_DATA_KEY = "AntTool";
  +    private final static String TOOL_DATA_KEY = "AntTool";
   
   	
       /**
  
  
  
  1.3       +1 -1      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VAJBuildInfo.java	2001/10/25 12:37:31	1.2
  +++ VAJBuildInfo.java	2001/10/28 21:30:21	1.3
  @@ -88,7 +88,7 @@
       /**
        * This exception is thrown when a build is interrupted
        */
  -    static public class BuildInterruptedException extends BuildException {
  +    public static class BuildInterruptedException extends BuildException {
           public String toString() {
               return "BUILD INTERRUPTED";
           }
  
  
  
  1.2       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java
  
  Index: VAJExportServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- VAJExportServlet.java	2001/10/25 12:37:31	1.1
  +++ VAJExportServlet.java	2001/10/28 21:30:21	1.2
  @@ -150,8 +150,8 @@
    */
   public class VAJExportServlet extends VAJToolsServlet {
       // constants for servlet param names
  -    public static final String WITH_DEBUG_INFO = "deb";
  -    public static final String OVERWRITE_PARAM = "owr";
  +    public final static String WITH_DEBUG_INFO = "deb";
  +    public final static String OVERWRITE_PARAM = "owr";
   
       /**
        * Respond to a request to export packages from the Workbench.
  
  
  
  1.9       +2 -2      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- VAJImport.java	2001/10/25 12:37:31	1.8
  +++ VAJImport.java	2001/10/28 21:30:21	1.9
  @@ -53,12 +53,12 @@
    */
   package org.apache.tools.ant.taskdefs.optional.ide;
   
  -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.Task;
  +
   import org.apache.tools.ant.types.FileSet;
   
   import java.lang.reflect.Field;
  
  
  
  1.7       +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java
  
  Index: VAJLoadProjects.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- VAJLoadProjects.java	2001/10/25 12:37:31	1.6
  +++ VAJLoadProjects.java	2001/10/28 21:30:21	1.7
  @@ -56,11 +56,11 @@
   
   
   
  -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;
  +
  +
  +
  +
  +
   
   /**
    * This is only there for backward compatibility with the default task list
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java
  
  Index: VAJLoadServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- VAJLoadServlet.java	2001/10/25 12:37:31	1.1
  +++ VAJLoadServlet.java	2001/10/28 21:30:21	1.2
  @@ -83,7 +83,7 @@
   public class VAJLoadServlet extends VAJToolsServlet {
   
       // constants for servlet param names
  -    public static final String VERSION_PARAM = "version";
  +    public final static String VERSION_PARAM = "version";
   
       /**
        * Respond to a request to load a project from the Repository
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- VAJLocalUtil.java	2001/10/25 12:37:31	1.1
  +++ VAJLocalUtil.java	2001/10/28 21:30:21	1.2
  @@ -59,7 +59,7 @@
   import java.util.Enumeration;
   import java.io.File;
   
  -import com.ibm.ivj.util.base.*;
  +
   import com.ibm.ivj.util.base.Package;
   
   import org.apache.tools.ant.BuildException;
  @@ -74,7 +74,7 @@
    */
   abstract class VAJLocalUtil implements VAJUtil{
       // singleton containing the VAJ workspace
  -    static private Workspace workspace;
  +    private static Workspace workspace;
   		
       /**
        * Wraps IvjException into a BuildException
  
  
  
  1.2       +1 -1      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- VAJRemoteUtil.java	2001/10/25 12:37:31	1.1
  +++ VAJRemoteUtil.java	2001/10/28 21:30:21	1.2
  @@ -55,7 +55,7 @@
   package org.apache.tools.ant.taskdefs.optional.ide;
   
   import java.util.Vector;
  -import java.net.URLConnection;
  +
   import java.net.HttpURLConnection;
   import java.util.Enumeration;
   import java.net.URL;
  
  
  
  1.2       +13 -11    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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- VAJToolsServlet.java	2001/10/25 12:37:31	1.1
  +++ VAJToolsServlet.java	2001/10/28 21:30:21	1.2
  @@ -54,10 +54,12 @@
   
   package org.apache.tools.ant.taskdefs.optional.ide;
   
  -import com.ibm.ivj.toolserver.servletclasses.servlet.*;
  -import com.ibm.ivj.toolserver.servletclasses.servlet.http.*;
  -import java.io.*;
   
  +
  +import java.io.IOException;
  +import java.io.StringWriter;
  +import java.io.PrintWriter;
  +
   import javax.servlet.http.HttpServlet;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  @@ -99,14 +101,14 @@
       }
   	
       // constants for servlet param names
  -    public static final String DIR_PARAM = "dir";
  -    public static final String INCLUDE_PARAM = "include";
  -    public static final String EXCLUDE_PARAM = "exclude";
  -    public static final String CLASSES_PARAM = "cls";
  -    public static final String SOURCES_PARAM = "src";
  -    public static final String RESOURCES_PARAM = "res";
  -    public static final String DEFAULT_EXCLUDES_PARAM = "dex";
  -    public static final String PROJECT_NAME_PARAM = "project";
  +    public final static String DIR_PARAM = "dir";
  +    public final static String INCLUDE_PARAM = "include";
  +    public final static String EXCLUDE_PARAM = "exclude";
  +    public final static String CLASSES_PARAM = "cls";
  +    public final static String SOURCES_PARAM = "src";
  +    public final static String RESOURCES_PARAM = "res";
  +    public final static String DEFAULT_EXCLUDES_PARAM = "dex";
  +    public final static String PROJECT_NAME_PARAM = "project";
   
   
       // current request
  
  
  
  1.9       +23 -23    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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JavaCC.java	2001/01/03 14:18:42	1.8
  +++ JavaCC.java	2001/10/28 21:30:21	1.9
  @@ -58,13 +58,13 @@
   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;
   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;
   
  @@ -77,27 +77,27 @@
   public class JavaCC extends Task {
   
       // keys to optional attributes
  -    private static final String LOOKAHEAD              = "LOOKAHEAD";
  -    private static final String CHOICE_AMBIGUITY_CHECK = "CHOICE_AMBIGUITY_CHECK";
  -    private static final String OTHER_AMBIGUITY_CHECK  = "OTHER_AMBIGUITY_CHECK";
  -
  -    private static final String STATIC                 = "STATIC";
  -    private static final String DEBUG_PARSER           = "DEBUG_PARSER";
  -    private static final String DEBUG_LOOKAHEAD        = "DEBUG_LOOKAHEAD";
  -    private static final String DEBUG_TOKEN_MANAGER    = "DEBUG_TOKEN_MANAGER";
  -    private static final String OPTIMIZE_TOKEN_MANAGER = "OPTIMIZE_TOKEN_MANAGER";
  -    private static final String ERROR_REPORTING        = "ERROR_REPORTING";
  -    private static final String JAVA_UNICODE_ESCAPE    = "JAVA_UNICODE_ESCAPE";
  -    private static final String UNICODE_INPUT          = "UNICODE_INPUT";
  -    private static final String IGNORE_CASE            = "IGNORE_CASE";
  -    private static final String COMMON_TOKEN_ACTION    = "COMMON_TOKEN_ACTION";
  -    private static final String USER_TOKEN_MANAGER     = "USER_TOKEN_MANAGER";
  -    private static final String USER_CHAR_STREAM       = "USER_CHAR_STREAM";
  -    private static final String BUILD_PARSER           = "BUILD_PARSER";
  -    private static final String BUILD_TOKEN_MANAGER    = "BUILD_TOKEN_MANAGER";
  -    private static final String SANITY_CHECK           = "SANITY_CHECK";
  -    private static final String FORCE_LA_CHECK         = "FORCE_LA_CHECK";
  -    private static final String CACHE_TOKENS           = "CACHE_TOKENS";
  +    private final static String LOOKAHEAD              = "LOOKAHEAD";
  +    private final static String CHOICE_AMBIGUITY_CHECK = "CHOICE_AMBIGUITY_CHECK";
  +    private final static String OTHER_AMBIGUITY_CHECK  = "OTHER_AMBIGUITY_CHECK";
  +
  +    private final static String STATIC                 = "STATIC";
  +    private final static String DEBUG_PARSER           = "DEBUG_PARSER";
  +    private final static String DEBUG_LOOKAHEAD        = "DEBUG_LOOKAHEAD";
  +    private final static String DEBUG_TOKEN_MANAGER    = "DEBUG_TOKEN_MANAGER";
  +    private final static String OPTIMIZE_TOKEN_MANAGER = "OPTIMIZE_TOKEN_MANAGER";
  +    private final static String ERROR_REPORTING        = "ERROR_REPORTING";
  +    private final static String JAVA_UNICODE_ESCAPE    = "JAVA_UNICODE_ESCAPE";
  +    private final static String UNICODE_INPUT          = "UNICODE_INPUT";
  +    private final static String IGNORE_CASE            = "IGNORE_CASE";
  +    private final static String COMMON_TOKEN_ACTION    = "COMMON_TOKEN_ACTION";
  +    private final static String USER_TOKEN_MANAGER     = "USER_TOKEN_MANAGER";
  +    private final static String USER_CHAR_STREAM       = "USER_CHAR_STREAM";
  +    private final static String BUILD_PARSER           = "BUILD_PARSER";
  +    private final static String BUILD_TOKEN_MANAGER    = "BUILD_TOKEN_MANAGER";
  +    private final static String SANITY_CHECK           = "SANITY_CHECK";
  +    private final static String FORCE_LA_CHECK         = "FORCE_LA_CHECK";
  +    private final static String CACHE_TOKENS           = "CACHE_TOKENS";
   
       private final Hashtable optionalAttrs = new Hashtable();
   
  
  
  
  1.5       +11 -11    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JJTree.java	2001/07/04 10:33:33	1.4
  +++ JJTree.java	2001/10/28 21:30:21	1.5
  @@ -77,18 +77,18 @@
   public class JJTree extends Task {
   
       // keys to optional attributes
  -    private static final String BUILD_NODE_FILES  = "BUILD_NODE_FILES";
  -    private static final String MULTI             = "MULTI";
  -    private static final String NODE_DEFAULT_VOID = "NODE_DEFAULT_VOID";
  -    private static final String NODE_FACTORY      = "NODE_FACTORY";
  -    private static final String NODE_SCOPE_HOOK   = "NODE_SCOPE_HOOK";
  -    private static final String NODE_USES_PARSER  = "NODE_USES_PARSER";
  -    private static final String STATIC            = "STATIC";
  -    private static final String VISITOR           = "VISITOR";
  +    private final static String BUILD_NODE_FILES  = "BUILD_NODE_FILES";
  +    private final static String MULTI             = "MULTI";
  +    private final static String NODE_DEFAULT_VOID = "NODE_DEFAULT_VOID";
  +    private final static String NODE_FACTORY      = "NODE_FACTORY";
  +    private final static String NODE_SCOPE_HOOK   = "NODE_SCOPE_HOOK";
  +    private final static String NODE_USES_PARSER  = "NODE_USES_PARSER";
  +    private final static String STATIC            = "STATIC";
  +    private final static String VISITOR           = "VISITOR";
   
  -    private static final String NODE_PACKAGE      = "NODE_PACKAGE";
  -    private static final String VISITOR_EXCEPTION = "VISITOR_EXCEPTION";
  -    private static final String NODE_PREFIX       = "NODE_PREFIX";
  +    private final static String NODE_PACKAGE      = "NODE_PACKAGE";
  +    private final static String VISITOR_EXCEPTION = "VISITOR_EXCEPTION";
  +    private final static String NODE_PREFIX       = "NODE_PREFIX";
   
       private final Hashtable optionalAttrs = new Hashtable();
   
  
  
  
  1.3       +4 -4      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JDependTask.java	2001/10/16 10:12:23	1.2
  +++ JDependTask.java	2001/10/28 21:30:21	1.3
  @@ -58,8 +58,8 @@
   import java.io.FileWriter;
   import java.io.IOException;
   import java.io.PrintWriter;
  -import java.util.Enumeration;
  -import java.util.Vector;
  +
  +
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.PathTokenizer;
   import org.apache.tools.ant.Project;
  @@ -247,11 +247,11 @@
       /**
        * No problems with this test.
        */
  -    private static final int SUCCESS = 0;
  +    private final static int SUCCESS = 0;
       /**
        * An error occured.
        */
  -    private static final int ERRORS = 1;
  +    private final static int ERRORS = 1;
   
       public void execute() throws BuildException {
   
  
  
  
  1.4       +5 -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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClassNameReader.java	2001/01/03 14:18:43	1.3
  +++ ClassNameReader.java	2001/10/28 21:30:21	1.4
  @@ -53,7 +53,10 @@
    */
   package org.apache.tools.ant.taskdefs.optional.jlink;
   
  -import java.io .*;
  +import java.io.IOException;
  +import java.io.DataInput;
  +import java.io.InputStream;
  +import java.io.DataInputStream;
   
   /**
    * Reads just enough of a class file to determine the class' full name.
  @@ -64,7 +67,7 @@
    */
   class ConstantPool extends Object{
   
  -    static final 
  +    final static 
           byte UTF8 = 1, UNUSED = 2, INTEGER = 3, FLOAT = 4, LONG = 5, DOUBLE = 6,
           CLASS = 7, STRING = 8, FIELDREF = 9, METHODREF = 10,
           INTERFACEMETHODREF = 11, NAMEANDTYPE = 12;
  
  
  
  1.5       +12 -2     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jlink.java	2001/01/03 14:18:43	1.4
  +++ jlink.java	2001/10/28 21:30:21	1.5
  @@ -64,10 +64,20 @@
    */
   package org.apache.tools.ant.taskdefs.optional.jlink;
   
  -import java.io .*;
  +import java.io.FileOutputStream;
  +import java.io.File;
  +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 .*;
  +import java.util.zip.ZipOutputStream;
  +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;
   
   public class jlink extends Object{
   
  
  
  
  1.4       +3 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JlinkTask.java	2001/01/03 14:18:43	1.3
  +++ JlinkTask.java	2001/10/28 21:30:21	1.4
  @@ -53,9 +53,10 @@
    */
   package org.apache.tools.ant.taskdefs.optional.jlink;
   
  -import org.apache.tools.ant .*;
  +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 .*;
  +import org.apache.tools.ant.types.Path;
   import java.io.File;
   
   /**
  
  
  
  1.3       +7 -6      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JspC.java	2001/10/19 00:33:07	1.2
  +++ JspC.java	2001/10/28 21:30:21	1.3
  @@ -56,15 +56,16 @@
   
   import java.io.File;
   import java.util.Date;
  -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.MatchingTask;
  -import org.apache.tools.ant.taskdefs.optional.jsp.compilers.*;
  -import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapter;
  +import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapterFactory;
  +
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
   
  @@ -98,7 +99,7 @@
    * &lt;/jspc&gt;
    * </pre>
    *
  - * @version $Revision: 1.2 $ $Date: 2001/10/19 00:33:07 $
  + * @version $Revision: 1.3 $ $Date: 2001/10/28 21:30:21 $
    * @author <a href="mailto:mattw@i3sp.com">Matthew Watson</a>
    * <p> Large Amount of cutting and pasting from the Javac task...
    * @author James Davidson <a href="mailto:duncan@x180.com">duncan@x180.com</a>
  @@ -132,7 +133,7 @@
        */
       private File uriroot;
   	
  -    private static final String FAIL_MSG
  +    private final static String FAIL_MSG
           = "Compile failed, messages should have been provided.";
       /* ------------------------------------------------------------ */
       /**
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java
  
  Index: CompilerAdapterFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CompilerAdapterFactory.java	2001/09/13 08:31:21	1.1
  +++ CompilerAdapterFactory.java	2001/10/28 21:30:21	1.2
  @@ -55,7 +55,7 @@
   
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.Project;
  +
   
   /**
    * Creates the necessary compiler adapter, given basic criteria.
  
  
  
  1.2       +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java
  
  Index: DefaultCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultCompilerAdapter.java	2001/09/13 08:31:21	1.1
  +++ DefaultCompilerAdapter.java	2001/10/28 21:30:21	1.2
  @@ -54,10 +54,10 @@
   
   package org.apache.tools.ant.taskdefs.optional.jsp.compilers;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.taskdefs.optional.*;
  +import org.apache.tools.ant.Project;
  +
   import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.types.Commandline;
   
   import java.util.Vector;
   import java.util.Enumeration;
  
  
  
  1.3       +2 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JasperC.java	2001/10/19 00:33:15	1.2
  +++ JasperC.java	2001/10/28 21:30:21	1.3
  @@ -56,9 +56,9 @@
   
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
  -import org.apache.tools.ant.taskdefs.*;
  +import org.apache.tools.ant.taskdefs.Java;
   
   /**
    * The implementation of the jasper compiler.
  
  
  
  1.7       +17 -10    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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AggregateTransformer.java	2001/08/07 22:30:07	1.6
  +++ AggregateTransformer.java	2001/10/28 21:30:22	1.7
  @@ -58,10 +58,17 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.types.EnumeratedAttribute;
   
  -import java.io.*;
  +import java.io.File;
  +import java.io.InputStream;
  +import java.io.FileInputStream;
  +import java.io.IOException;
  +import java.io.FileNotFoundException;
  +import java.io.OutputStream;
  +import java.io.ByteArrayOutputStream;
  +import java.io.FileOutputStream;
   
  -import java.util.Enumeration;
  -import java.util.Hashtable;
  +
  +
   import java.lang.reflect.Field;
   import java.net.URL;
   
  @@ -72,7 +79,7 @@
   
   import javax.xml.parsers.DocumentBuilderFactory;
   import javax.xml.parsers.DocumentBuilder;
  -import javax.xml.parsers.ParserConfigurationException;
  +
   import javax.xml.transform.Transformer;
   import javax.xml.transform.TransformerFactory;
   import javax.xml.transform.Source;
  @@ -83,12 +90,12 @@
   
   import org.w3c.dom.Document;
   import org.w3c.dom.Element;
  -import org.w3c.dom.Node;
  -import org.w3c.dom.NodeList;
  -import org.w3c.dom.NamedNodeMap;
  +
  +
  +
  +
  +
   
  -import org.xml.sax.SAXException;
  -import org.xml.sax.InputSource;
   
   /**
    * Transform a JUnit xml report.
  @@ -127,7 +134,7 @@
       protected String format;
   
       /** XML Parser factory */
  -    protected static final DocumentBuilderFactory dbfactory = DocumentBuilderFactory.newInstance();
  +    protected final static DocumentBuilderFactory dbfactory = DocumentBuilderFactory.newInstance();
   
       public AggregateTransformer(Task task){
           this.task = task;
  
  
  
  1.8       +5 -4      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BatchTest.java	2001/08/03 14:44:25	1.7
  +++ BatchTest.java	2001/10/28 21:30:22	1.8
  @@ -54,13 +54,14 @@
   
   package org.apache.tools.ant.taskdefs.optional.junit;
   
  -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.Reference;
  +
   
  -import java.util.*;
  +import java.util.Enumeration;
  +import java.util.Vector;
   import java.io.File;
   
   /**
  @@ -182,7 +183,7 @@
        * @param filename the filename to "convert" to a classname.
        * @return the classname matching the filename.
        */
  -    public final static String javaToClass(String filename){
  +    public static final String javaToClass(String filename){
           return filename.replace(File.separatorChar, '.');
       }
   
  
  
  
  1.4       +2 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BriefJUnitResultFormatter.java	2001/07/24 13:28:56	1.3
  +++ BriefJUnitResultFormatter.java	2001/10/28 21:30:22	1.4
  @@ -56,7 +56,8 @@
   
   import org.apache.tools.ant.BuildException;
   
  -import junit.framework.*;
  +import junit.framework.Test;
  +import junit.framework.AssertionFailedError;
   
   /**
    * Prints plain text output of the test to a specified Writer.
  
  
  
  1.4       +1 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DOMUtil.java	2001/09/15 04:06:08	1.3
  +++ DOMUtil.java	2001/10/28 21:30:22	1.4
  @@ -60,7 +60,7 @@
   import org.w3c.dom.Element;
   import org.w3c.dom.NamedNodeMap;
   import org.w3c.dom.Attr;
  -import org.w3c.dom.EntityReference;
  +
   import org.w3c.dom.ProcessingInstruction;
   import org.w3c.dom.Text;
   import org.w3c.dom.NodeList;
  
  
  
  1.8       +2 -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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JUnitTest.java	2001/07/24 13:28:56	1.7
  +++ JUnitTest.java	2001/10/28 21:30:22	1.8
  @@ -55,9 +55,9 @@
   package org.apache.tools.ant.taskdefs.optional.junit;
   
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.Commandline;
   
  -import java.io.File;
  +
  +
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Properties;
  
  
  
  1.13      +19 -9     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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- JUnitTestRunner.java	2001/07/24 13:28:56	1.12
  +++ JUnitTestRunner.java	2001/10/28 21:30:22	1.13
  @@ -54,15 +54,25 @@
   
   package org.apache.tools.ant.taskdefs.optional.junit;
   
  -import org.apache.tools.ant.*;
  -
  -import junit.framework.*;
  -import java.lang.reflect.*;
  -import java.io.*;
  +import org.apache.tools.ant.AntClassLoader;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.BuildException;
  +
  +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.PrintStream;
  +import java.io.ByteArrayOutputStream;
  +import java.io.IOException;
  +import java.io.FileInputStream;
  +import java.io.File;
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Properties;
  -import java.util.StringTokenizer;
  +
   import java.util.Vector;
   
   /**
  @@ -89,17 +99,17 @@
       /**
        * No problems with this test.
        */
  -    public static final int SUCCESS = 0;
  +    public final static int SUCCESS = 0;
   
       /**
        * Some tests failed.
        */
  -    public static final int FAILURES = 1;
  +    public final static int FAILURES = 1;
   
       /**
        * An error occured.
        */
  -    public static final int ERRORS = 2;
  +    public final static int ERRORS = 2;
   
       /**
        * Holds the registered formatters.
  
  
  
  1.8       +4 -1      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- PlainJUnitResultFormatter.java	2001/10/23 10:23:18	1.7
  +++ PlainJUnitResultFormatter.java	2001/10/28 21:30:22	1.8
  @@ -56,7 +56,10 @@
   
   import org.apache.tools.ant.BuildException;
   
  -import java.io.*;
  +import java.io.OutputStream;
  +import java.io.StringWriter;
  +import java.io.PrintWriter;
  +import java.io.IOException;
   import java.text.NumberFormat;
   
   import junit.framework.AssertionFailedError;
  
  
  
  1.13      +15 -6     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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- XMLJUnitResultFormatter.java	2001/10/23 10:23:18	1.12
  +++ XMLJUnitResultFormatter.java	2001/10/28 21:30:22	1.13
  @@ -54,12 +54,21 @@
   
   package org.apache.tools.ant.taskdefs.optional.junit;
   
  -import java.io.*;
  -import java.text.CharacterIterator;
  -import java.text.StringCharacterIterator;
  -import java.util.*;
  -import javax.xml.parsers.*;
  -import org.w3c.dom.*;
  +import java.io.OutputStream;
  +import java.io.Writer;
  +import java.io.OutputStreamWriter;
  +import java.io.IOException;
  +import java.io.StringWriter;
  +import java.io.PrintWriter;
  +
  +
  +import java.util.Properties;
  +import java.util.Enumeration;
  +import javax.xml.parsers.DocumentBuilder;
  +import javax.xml.parsers.DocumentBuilderFactory;
  +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;
   
  
  
  
  1.6       +2 -2      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLResultAggregator.java	2001/07/24 13:28:56	1.5
  +++ XMLResultAggregator.java	2001/10/28 21:30:22	1.6
  @@ -65,8 +65,8 @@
   
   import org.w3c.dom.Element;
   import org.w3c.dom.Document;
  -import org.w3c.dom.Node;
  -import org.w3c.dom.*;
  +
  +
   import org.xml.sax.SAXException;
   import javax.xml.parsers.DocumentBuilder;
   import javax.xml.parsers.DocumentBuilderFactory;
  
  
  
  1.2       +13 -9     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MAudit.java	2001/08/01 10:22:18	1.1
  +++ MAudit.java	2001/10/28 21:30:22	1.2
  @@ -55,15 +55,19 @@
   
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.util.regexp.*;
   
  -import java.io.*;
  -import java.util.*;
  +import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
  +import org.apache.tools.ant.taskdefs.LogStreamHandler;
  +import org.apache.tools.ant.types.Path;
   
  +
  +
  +import java.io.File;
  +import java.io.OutputStream;
  +import java.io.FileOutputStream;
  +import java.io.IOException;
  +import java.util.Vector;
  +
   /**
    * Metamata Audit evaluates Java code for programming errors, weaknesses, and
    * style violation.
  @@ -113,7 +117,7 @@
       /** pattern used by maudit to report the error for a file */
       /** RE does not seems to support regexp pattern with comments so i'm stripping it*/
       // (?:file:)?((?#filepath).+):((?#line)\\d+)\\s*:\\s+((?#message).*)
  -    static final String AUDIT_PATTERN = "(?:file:)?(.+):(\\d+)\\s*:\\s+(.*)";
  +    final static String AUDIT_PATTERN = "(?:file:)?(.+):(\\d+)\\s*:\\s+(.*)";
   
       protected File outFile = null;
       
  @@ -237,7 +241,7 @@
       }
   
       /** the inner class used to report violation information */
  -    static final class Violation {
  +    final static class Violation {
           int line;
           String error;
       }
  
  
  
  1.2       +20 -9     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MAuditStreamHandler.java	2001/08/01 10:22:18	1.1
  +++ MAuditStreamHandler.java	2001/10/28 21:30:22	1.2
  @@ -54,18 +54,29 @@
   package org.apache.tools.ant.taskdefs.optional.metamata;
   
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.util.regexp.*;
  -import org.apache.tools.ant.BuildException;
  +
  +import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
  +
  +import org.apache.tools.ant.util.regexp.RegexpMatcher;
  +import org.apache.tools.ant.util.regexp.RegexpMatcherFactory;
  +
   import org.apache.tools.ant.util.DOMElementWriter;
   
  -import org.w3c.dom.*;
  +import org.w3c.dom.Document;
  +import org.w3c.dom.Element;
   
  -import java.io.*;
  -import java.util.*;
  -import javax.xml.parsers.*;
  +import java.io.BufferedReader;
  +import java.io.OutputStream;
  +import java.io.InputStream;
  +import java.io.IOException;
  +import java.io.InputStreamReader;
  +import java.io.Writer;
  +import java.io.OutputStreamWriter;
  +import java.util.Hashtable;
  +import java.util.Enumeration;
  +import java.util.Vector;
  +import javax.xml.parsers.DocumentBuilder;
  +import javax.xml.parsers.DocumentBuilderFactory;
   
   
   /**
  
  
  
  1.2       +9 -5      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MMetrics.java	2001/08/01 10:22:18	1.1
  +++ MMetrics.java	2001/10/28 21:30:22	1.2
  @@ -55,14 +55,18 @@
   
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.types.*;
   
  +import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
  +import org.apache.tools.ant.taskdefs.LogStreamHandler;
  +import org.apache.tools.ant.types.Path;
   
   
  -import java.io.*;
  -import java.util.*;
  +
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.IOException;
  +import java.io.FileOutputStream;
  +import java.util.Vector;
   
   /**
    * Calculates global complexity and quality metrics on Java source code.
  
  
  
  1.3       +22 -8     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MMetricsStreamHandler.java	2001/08/03 14:34:07	1.2
  +++ MMetricsStreamHandler.java	2001/10/28 21:30:22	1.3
  @@ -54,14 +54,28 @@
   package org.apache.tools.ant.taskdefs.optional.metamata;
   
   
  -import org.xml.sax.*;
  -import org.xml.sax.helpers.*;
  -import javax.xml.transform.*;
  -import javax.xml.transform.stream.*;
  -import javax.xml.transform.sax.*;
  -import java.util.*;
  -import java.io.*;
  -import java.text.*;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.Attributes;
  +import org.xml.sax.helpers.AttributesImpl;
  +import javax.xml.transform.TransformerFactory;
  +import javax.xml.transform.Transformer;
  +import javax.xml.transform.OutputKeys;
  +import javax.xml.transform.stream.StreamResult;
  +import javax.xml.transform.sax.TransformerHandler;
  +import javax.xml.transform.sax.SAXTransformerFactory;
  +import java.util.Stack;
  +import java.util.EmptyStackException;
  +import java.util.Enumeration;
  +import java.util.Vector;
  +import java.io.InputStream;
  +import java.io.OutputStream;
  +import java.io.IOException;
  +import java.io.OutputStreamWriter;
  +import java.io.BufferedReader;
  +import java.io.InputStreamReader;
  +import java.text.ParseException;
  +import java.text.NumberFormat;
  +import java.text.DecimalFormat;
   
   import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
   import org.apache.tools.ant.Task;
  
  
  
  1.5       +10 -4     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MParse.java	2001/02/18 13:44:43	1.4
  +++ MParse.java	2001/10/28 21:30:22	1.5
  @@ -57,13 +57,19 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.taskdefs.*;
  +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.CommandlineJava;
   import org.apache.tools.ant.types.Path;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.FileWriter;
  +import java.io.PrintWriter;
  +import java.util.Vector;
  +import java.util.Random;
   
   /**
    * Simple Metamata MParse task based on the original written by
  @@ -341,7 +347,7 @@
       }
       
       /** create a temporary file in the current directory */
  -    protected final static File createTmpFile(){
  +    protected static final File createTmpFile(){
           // must be compatible with JDK 1.1 !!!!
           final long rand = (new Random(System.currentTimeMillis())).nextLong();
           File file = new File("metamata" + rand + ".tmp");
  
  
  
  1.10      +19 -6     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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- FTP.java	2001/09/30 13:21:54	1.9
  +++ FTP.java	2001/10/28 21:30:22	1.10
  @@ -54,12 +54,25 @@
   
   package org.apache.tools.ant.taskdefs.optional.net;
   
  -import com.oroinc.net.ftp.*;
  -import java.io.*;
  -import java.net.*;
  -import java.util.*;
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  +
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.BufferedWriter;
  +import java.io.FileWriter;
  +import java.io.InputStream;
  +import java.io.BufferedInputStream;
  +import java.io.FileInputStream;
  +import java.io.OutputStream;
  +import java.io.BufferedOutputStream;
  +import java.io.FileOutputStream;
  +
  +import java.util.Vector;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.FileScanner;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.types.FileSet;
   
   /**
    * Basic FTP client that performs the following actions:
  
  
  
  1.2       +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
  
  Index: MimeMail.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MimeMail.java	2001/07/11 16:11:45	1.1
  +++ MimeMail.java	2001/10/28 21:30:22	1.2
  @@ -63,12 +63,12 @@
   import java.io.IOException;
   
   //imported for the mail api
  -import javax.mail.Address;
  +
   import javax.mail.Session;
   import javax.mail.Message;
  -import javax.mail.BodyPart;
  -import javax.mail.Multipart;
  -import javax.mail.SendFailedException;
  +
  +
  +
   import javax.mail.MessagingException;
   import javax.mail.Transport;
   import javax.mail.internet.InternetAddress;
  @@ -84,10 +84,10 @@
   // Ant imports
   import org.apache.tools.ant.Task;
   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.EnumeratedAttribute;
  +
   import org.apache.tools.ant.types.FileSet;
   
   
  
  
  
  1.3       +12 -8     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TelnetTask.java	2000/11/14 10:17:00	1.2
  +++ TelnetTask.java	2001/10/28 21:30:22	1.3
  @@ -57,19 +57,23 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.taskdefs.MatchingTask;
  -import com.oroinc.net.telnet.*;
  -import org.apache.tools.ant.BuildException;
  -import java.io.*;
  -import java.lang.*;
  -import java.util.*;
   
  +
  +
  +
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.OutputStream;
  +
  +import java.util.Vector;
  +import java.util.Enumeration;
  +import java.util.Calendar;
  +
   /**
    * Class to provide automated telnet protocol support for the Ant build tool
    *
    * @author Scott Carlson<a href="mailto:ScottCarlson@email.com">ScottCarlson@email.com</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   
   public class TelnetTask extends Task {
  
  
  
  1.2       +3 -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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- P4Add.java	2001/09/11 01:37:47	1.1
  +++ P4Add.java	2001/10/28 21:30:22	1.2
  @@ -61,7 +61,9 @@
   
   import java.io.File;
   import java.util.Vector;
  -import org.apache.tools.ant.*;
  +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;
   
   /** P4Add  - add the specified files to perforce.
  
  
  
  1.6       +6 -5      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- P4Base.java	2001/07/13 13:10:12	1.5
  +++ P4Base.java	2001/10/28 21:30:22	1.6
  @@ -58,11 +58,12 @@
   
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
  -import java.io.*;
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.types.*;
  -import org.apache.oro.text.perl.*;
  +import java.io.IOException;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.taskdefs.Execute;
  +import org.apache.tools.ant.types.Commandline;
  +import org.apache.oro.text.perl.Perl5Util;
   
   
   /** Base class for Perforce (P4) ANT tasks. See individual task for example usage.
  
  
  
  1.4       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java
  
  Index: P4Change.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- P4Change.java	2001/03/19 13:18:31	1.3
  +++ P4Change.java	2001/10/28 21:30:22	1.4
  @@ -58,9 +58,10 @@
   
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
  -import java.io.*;
   
  -import org.apache.tools.ant.*;
  +
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   /** P4Change - grab a new changelist from Perforce.
    *
  
  
  
  1.3       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java
  
  Index: P4Counter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- P4Counter.java	2001/04/06 08:50:11	1.2
  +++ P4Counter.java	2001/10/28 21:30:22	1.3
  @@ -58,7 +58,8 @@
   
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   /** P4Counter - Obtain or set the value of a counter.
    * P4Counter can be used to either print the value of a counter
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java
  
  Index: P4Delete.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- P4Delete.java	2001/10/01 09:13:01	1.1
  +++ P4Delete.java	2001/10/28 21:30:22	1.2
  @@ -53,7 +53,7 @@
    */
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
   
   /** P4Delete - checkout file(s) for delete.
    *
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java
  
  Index: P4Edit.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- P4Edit.java	2001/01/12 15:28:34	1.2
  +++ P4Edit.java	2001/10/28 21:30:22	1.3
  @@ -58,7 +58,7 @@
   
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
   
   /** P4Edit - checkout file(s) for edit.
    *
  
  
  
  1.2       +7 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- P4HandlerAdapter.java	2001/01/12 15:28:34	1.1
  +++ P4HandlerAdapter.java	2001/10/28 21:30:22	1.2
  @@ -54,8 +54,13 @@
   
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
  -import java.io.*;
  -import org.apache.tools.ant.*;
  +import java.io.IOException;
  +import java.io.OutputStream;
  +import java.io.InputStream;
  +import java.io.BufferedReader;
  +import java.io.InputStreamReader;
  +import java.io.SequenceInputStream;
  +import org.apache.tools.ant.BuildException;
   
   public abstract class P4HandlerAdapter implements P4Handler {
   
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java
  
  Index: P4Have.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- P4Have.java	2001/01/12 15:28:34	1.2
  +++ P4Have.java	2001/10/28 21:30:22	1.3
  @@ -58,7 +58,7 @@
   
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
   
   
   /** P4Have - lists files currently on client.
  
  
  
  1.4       +2 -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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- P4Label.java	2001/05/17 10:30:49	1.3
  +++ P4Label.java	2001/10/28 21:30:22	1.4
  @@ -58,7 +58,8 @@
   
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   import java.util.Date;
   import java.text.SimpleDateFormat;
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java
  
  Index: P4Reopen.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- P4Reopen.java	2001/07/27 06:46:49	1.1
  +++ P4Reopen.java	2001/10/28 21:30:22	1.2
  @@ -58,7 +58,7 @@
   
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
   
   /* P4Reopen - move files to a new changelist
    *
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java
  
  Index: P4Revert.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- P4Revert.java	2001/07/27 06:46:49	1.1
  +++ P4Revert.java	2001/10/28 21:30:22	1.2
  @@ -58,7 +58,7 @@
   
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
   
   /* P4Revert - revert open files or files in a changelist
    *
  
  
  
  1.3       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java
  
  Index: P4Submit.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- P4Submit.java	2001/01/12 15:28:35	1.2
  +++ P4Submit.java	2001/10/28 21:30:22	1.3
  @@ -58,7 +58,8 @@
   
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   /** P4Submit - submit a numbered changelist to Perforce.
    *
  
  
  
  1.3       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java
  
  Index: P4Sync.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- P4Sync.java	2001/01/12 15:28:35	1.2
  +++ P4Sync.java	2001/10/28 21:30:22	1.3
  @@ -58,7 +58,8 @@
   
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   /** P4Sync  - synchronise client space to a perforce depot view.
    *  The API allows additional functionality of the "p4 sync" command 
  
  
  
  1.3       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java
  
  Index: SimpleP4OutputHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimpleP4OutputHandler.java	2001/01/12 15:28:35	1.2
  +++ SimpleP4OutputHandler.java	2001/10/28 21:30:22	1.3
  @@ -58,7 +58,8 @@
   
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   public class SimpleP4OutputHandler extends P4HandlerAdapter {
   
  
  
  
  1.4       +13 -5     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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Pvcs.java	2001/09/06 02:48:08	1.3
  +++ Pvcs.java	2001/10/28 21:30:23	1.4
  @@ -57,10 +57,18 @@
    */
   package org.apache.tools.ant.taskdefs.optional.pvcs;
   
  -import java.io.*;
  +import java.io.File;
  +import java.io.FileOutputStream;
  +import java.io.IOException;
  +import java.io.FileNotFoundException;
  +import java.io.BufferedReader;
  +import java.io.FileReader;
  +import java.io.BufferedWriter;
  +import java.io.FileWriter;
   import java.util.Enumeration;
   import java.util.Vector;
  -import java.text.*;
  +import java.text.ParseException;
  +import java.text.MessageFormat;
   import java.util.Random;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  @@ -105,17 +113,17 @@
       /**
        * Constant for the thing to execute
        */
  -    private static final String PCLI_EXE = "pcli";
  +    private final static String PCLI_EXE = "pcli";
   
       /**
        * Constant for the PCLI listversionedfiles recursive i a format "get" understands
        */
  -    private static final String PCLI_LVF_ARGS = "lvf -z -aw";
  +    private final static String PCLI_LVF_ARGS = "lvf -z -aw";
   
       /**
        * Constant for the thing to execute
        */
  -    private static final String GET_EXE = "get";
  +    private final static String GET_EXE = "get";
   
   
       protected int runCmd(Commandline cmd, ExecuteStreamHandler out) {
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java
  
  Index: PvcsProject.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PvcsProject.java	2001/04/27 12:36:12	1.1
  +++ PvcsProject.java	2001/10/28 21:30:23	1.2
  @@ -56,7 +56,7 @@
   
   package org.apache.tools.ant.taskdefs.optional.pvcs;
   
  -import org.apache.tools.ant.Project;
  +
   
   /**
    * class to handle &lt;pvcsprojec&gt; elements
  
  
  
  1.6       +10 -10    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AntStarTeamCheckOut.java	2001/01/03 14:18:45	1.5
  +++ AntStarTeamCheckOut.java	2001/10/28 21:30:23	1.6
  @@ -54,11 +54,11 @@
    */
   package org.apache.tools.ant.taskdefs.optional.scm; 
    
  -import com.starbase.starteam.*;
  +
   import com.starbase.util.Platform;
  -import java.io.*;
  -import java.util.*;
  -import org.apache.tools.ant.*;
  +
  +import java.util.StringTokenizer;
  +import org.apache.tools.ant.BuildException;
   
   /**
    * Checks out files from a specific StarTeam server, project, view, and
  @@ -116,7 +116,7 @@
        * @see #getForceAsBoolean()
        * @see #setForce(String force)
        */
  -    static public final String DEFAULT_FORCESETTING = "false";
  +    public final static String DEFAULT_FORCESETTING = "false";
   
       /**
        * This field is used in setting <CODE>verbose</CODE> to "false", the
  @@ -131,7 +131,7 @@
        * @see #getVerboseAsBoolean()
        * @see #setVerbose(String verbose)
        */
  -    static public final String DEFAULT_VERBOSESETTING = "false";
  +    public final static String DEFAULT_VERBOSESETTING = "false";
   
       /**
        * <CODE>DEFAULT_RECURSIONSETTING</CODE> contains the normal setting --
  @@ -143,7 +143,7 @@
        * @see #getRecursion()
        * @see #setRecursion(String recursion)
        */
  -    static public final String DEFAULT_RECURSIONSETTING = "true";
  +    public final static String DEFAULT_RECURSIONSETTING = "true";
   
       /**
        * This constant sets the filter to include all files. This default has
  @@ -152,7 +152,7 @@
        * @see #getIncludes()
        * @see #setIncludes(String includes)
        */
  -    static public final String DEFAULT_INCLUDESETTING = "*";
  +    public final static String DEFAULT_INCLUDESETTING = "*";
   
       /**
        * This disables the exclude filter by default. In other words, no files
  @@ -162,7 +162,7 @@
        * @see #getExcludes()
        * @see #setExcludes(String excludes)
        */
  -    static public final String DEFAULT_EXCLUDESETTING = null;
  +    public final static String DEFAULT_EXCLUDESETTING = null;
   
       /**
        * The default folder to search; the root folder.  Since
  @@ -172,7 +172,7 @@
        * @see #getFolderName()
        * @see #setFolderName(String folderName)
        */
  -    static public final String DEFAULT_FOLDERSETTING = null;
  +    public final static String DEFAULT_FOLDERSETTING = null;
   
       /**
        * This is used when formatting the output. The directory name is
  
  
  
  1.2       +1 -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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Coverage.java	2001/07/31 08:40:12	1.1
  +++ Coverage.java	2001/10/28 21:30:23	1.2
  @@ -62,7 +62,7 @@
   import java.io.IOException;
   import java.util.Vector;
   import java.util.Random;
  -import java.util.Hashtable;
  +
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.BuildException;
  
  
  
  1.2       +5 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CovMerge.java	2001/07/31 08:40:12	1.1
  +++ CovMerge.java	2001/10/28 21:30:23	1.2
  @@ -57,16 +57,17 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.taskdefs.*;
  +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.CommandlineJava;
  -import org.apache.tools.ant.types.Path;
  +
  +
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.DirectoryScanner;
   import java.util.Vector;
   import java.util.Random;
   import java.io.File;
  -import java.io.FilenameFilter;
  +
   import java.io.FileWriter;
   import java.io.PrintWriter;
   import java.io.IOException;
  
  
  
  1.3       +16 -11    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CovReport.java	2001/09/30 13:21:54	1.2
  +++ CovReport.java	2001/10/28 21:30:23	1.3
  @@ -57,26 +57,31 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.taskdefs.*;
  +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.CommandlineJava;
  +
   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.DirectoryScanner;
  +
  +
   import java.util.Vector;
   import java.io.File;
  -import java.io.FilenameFilter;
  +
   import java.io.IOException;
   
  -import javax.xml.transform.*;
  -import javax.xml.transform.stream.*;
  -import javax.xml.transform.dom.*;
  +import javax.xml.transform.TransformerFactory;
  +import javax.xml.transform.Transformer;
  +import javax.xml.transform.OutputKeys;
  +import javax.xml.transform.Source;
  +import javax.xml.transform.Result;
  +import javax.xml.transform.stream.StreamResult;
  +import javax.xml.transform.dom.DOMSource;
   import org.w3c.dom.Document;
  +
  +
  +
   
  -import org.apache.tools.ant.taskdefs.optional.depend.*;
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.*;
  -import java.io.*;
   
   /**
    * Convenient task to run the snapshot merge utility for JProbe Coverage 3.0.
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java
  
  Index: Filters.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Filters.java	2001/07/31 08:40:12	1.1
  +++ Filters.java	2001/10/28 21:30:23	1.2
  @@ -105,7 +105,7 @@
           return buf.toString();
       }
   
  -    public static abstract class FilterElement {
  +    abstract public static class FilterElement {
           protected String clazz;
           protected String method = "*"; // default is all methods
           protected boolean enabled = true; // default is enable
  
  
  
  1.2       +4 -3      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ReportFilters.java	2001/07/31 08:40:12	1.1
  +++ ReportFilters.java	2001/10/28 21:30:23	1.2
  @@ -55,9 +55,10 @@
   package org.apache.tools.ant.taskdefs.optional.sitraka;
   
   import java.util.Vector;
  -import java.util.Enumeration;
  -import org.apache.tools.ant.util.regexp.*;
   
  +import org.apache.tools.ant.util.regexp.RegexpMatcher;
  +import org.apache.tools.ant.util.regexp.RegexpMatcherFactory;
  +
   /**
    * Filters information from coverage, somewhat similar to a <tt>FileSet</tt>.
    *
  @@ -131,7 +132,7 @@
   
   
   	/** default abstract filter element class */
  -	public static abstract class FilterElement {
  +	abstract public static class FilterElement {
   		protected String clazz = "*"; // default is all classes
   		protected String method = "*"; // default is all methods
   
  
  
  
  1.2       +22 -8     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLReport.java	2001/07/31 08:40:12	1.1
  +++ XMLReport.java	2001/10/28 21:30:23	1.2
  @@ -55,15 +55,29 @@
   
   import javax.xml.parsers.DocumentBuilder;
   import javax.xml.parsers.DocumentBuilderFactory;
  -import javax.xml.transform.*;
  -import javax.xml.transform.dom.*;
  -import javax.xml.transform.stream.*;
  +import javax.xml.transform.TransformerFactory;
  +import javax.xml.transform.Transformer;
  +import javax.xml.transform.OutputKeys;
  +import javax.xml.transform.dom.DOMSource;
  +import javax.xml.transform.stream.StreamResult;
   
  -import org.w3c.dom.*;
  -import org.xml.sax.*;
  -import java.io.*;
  -import java.util.*;
  -import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.*;
  +import org.w3c.dom.Document;
  +import org.w3c.dom.NodeList;
  +import org.w3c.dom.Element;
  +import org.w3c.dom.Node;
  +import org.xml.sax.InputSource;
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.FileOutputStream;
  +import java.util.Hashtable;
  +import java.util.Enumeration;
  +import java.util.Vector;
  +import java.util.NoSuchElementException;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassPathLoader;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassFile;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.MethodInfo;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.MethodInfoList;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.Utils;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.Project;
   
  
  
  
  1.2       +8 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ClassFile.java	2001/07/31 08:40:12	1.1
  +++ ClassFile.java	2001/10/28 21:30:23	1.2
  @@ -53,11 +53,17 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.DataInputStream;
   
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ClassCPInfo;
  -import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.*;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfoList;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.SourceFile;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfo;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.SourceDir;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.LineNumberTable;
   
   
   /**
  
  
  
  1.2       +15 -3     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java
  
  Index: ClassPathLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ClassPathLoader.java	2001/07/31 08:40:12	1.1
  +++ ClassPathLoader.java	2001/10/28 21:30:23	1.2
  @@ -53,9 +53,21 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode;
   
  -import java.io.*;
  -import java.util.*;
  -import java.util.zip.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.BufferedInputStream;
  +import java.io.ByteArrayOutputStream;
  +import java.io.ByteArrayInputStream;
  +import java.io.FilenameFilter;
  +import java.io.FileInputStream;
  +import java.util.Enumeration;
  +import java.util.StringTokenizer;
  +import java.util.Vector;
  +import java.util.Hashtable;
  +import java.util.NoSuchElementException;
  +import java.util.zip.ZipFile;
  +import java.util.zip.ZipEntry;
   
   /**
    * Core of the bytecode analyzer. It loads classes from a given classpath.
  
  
  
  1.2       +5 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/FieldInfo.java
  
  Index: FieldInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/FieldInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FieldInfo.java	2001/07/31 08:40:12	1.1
  +++ FieldInfo.java	2001/10/28 21:30:23	1.2
  @@ -53,12 +53,14 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
   
  -import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.*;
  +
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfoList;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfo;
   
   /**
    * field structure
  
  
  
  1.2       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/FieldInfoList.java
  
  Index: FieldInfoList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/FieldInfoList.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FieldInfoList.java	2001/07/31 08:40:12	1.1
  +++ FieldInfoList.java	2001/10/28 21:30:23	1.2
  @@ -53,10 +53,11 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
  +
   
   /**
    * field structure list
  
  
  
  1.2       +4 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/InterfaceList.java
  
  Index: InterfaceList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/InterfaceList.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InterfaceList.java	2001/07/31 08:40:12	1.1
  +++ InterfaceList.java	2001/10/28 21:30:23	1.2
  @@ -53,9 +53,11 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.*;
  +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ClassCPInfo;
   
   /**
    * list of interfaces implemented in a class.
  
  
  
  1.2       +8 -3      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MethodInfo.java	2001/07/31 08:40:12	1.1
  +++ MethodInfo.java	2001/10/28 21:30:23	1.2
  @@ -53,10 +53,15 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.*;
  -import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.*;
  +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.Code;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.Exceptions;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfoList;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfo;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.LineNumberTable;
   
   /**
    * Method info structure.
  
  
  
  1.2       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfoList.java
  
  Index: MethodInfoList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfoList.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MethodInfoList.java	2001/07/31 08:40:12	1.1
  +++ MethodInfoList.java	2001/10/28 21:30:23	1.2
  @@ -53,10 +53,11 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
  +
   
   /**
    * A list of method_info structures.
  
  
  
  1.2       +15 -14    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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Utils.java	2001/07/31 08:40:12	1.1
  +++ Utils.java	2001/10/28 21:30:23	1.2
  @@ -54,7 +54,8 @@
   
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode;
   
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.*;
  +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
   import java.util.Vector;
   
   /**
  @@ -64,31 +65,31 @@
    */
   public class Utils {
   	/** public access flag */
  -    public static final short ACC_PUBLIC = 1;
  +    public final static short ACC_PUBLIC = 1;
   	/** private access flag */
  -    public static final short ACC_PRIVATE = 2;
  +    public final static short ACC_PRIVATE = 2;
   	/** protected access flag */
  -    public static final short ACC_PROTECTED = 4;
  +    public final static short ACC_PROTECTED = 4;
   	/** static access flag */
  -    public static final short ACC_STATIC = 8;
  +    public final static short ACC_STATIC = 8;
   	/** final access flag */
  -    public static final short ACC_FINAL = 16;
  +    public final static short ACC_FINAL = 16;
   	/** super access flag */
  -    public static final short ACC_SUPER = 32;
  +    public final static short ACC_SUPER = 32;
   	/** synchronized access flag */
  -    public static final short ACC_SYNCHRONIZED = 32;
  +    public final static short ACC_SYNCHRONIZED = 32;
   	/** volatile access flag */
  -    public static final short ACC_VOLATILE = 64;
  +    public final static short ACC_VOLATILE = 64;
   	/** transient access flag */
  -    public static final short ACC_TRANSIENT = 128;
  +    public final static short ACC_TRANSIENT = 128;
   	/** native access flag */
  -    public static final short ACC_NATIVE = 256;
  +    public final static short ACC_NATIVE = 256;
   	/** interface access flag */
  -    public static final short ACC_INTERFACE = 512;
  +    public final static short ACC_INTERFACE = 512;
   	/** abstract access flag */
  -    public static final short ACC_ABSTRACT = 1024;
  +    public final static short ACC_ABSTRACT = 1024;
   	/** strict access flag */
  -    public static final short ACC_STRICT = 2048;
  +    public final static short ACC_STRICT = 2048;
   
   	/** private constructor */
   	private Utils(){
  
  
  
  1.2       +4 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java
  
  Index: AttributeInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AttributeInfo.java	2001/07/31 08:40:13	1.1
  +++ AttributeInfo.java	2001/10/28 21:30:24	1.2
  @@ -53,10 +53,11 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.*;
  -import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.*;
  +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.Utils;
   
   /**
    * Attribute info structure that provides base methods
  
  
  
  1.2       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfoList.java
  
  Index: AttributeInfoList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfoList.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AttributeInfoList.java	2001/07/31 08:40:13	1.1
  +++ AttributeInfoList.java	2001/10/28 21:30:24	1.2
  @@ -53,10 +53,11 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
  +
   
   /**
    * list of attributes
  
  
  
  1.2       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Code.java
  
  Index: Code.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Code.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Code.java	2001/07/31 08:40:13	1.1
  +++ Code.java	2001/10/28 21:30:24	1.2
  @@ -53,10 +53,11 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
  +
   
   /**
    * Code structure.
  
  
  
  1.2       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/ConstantValue.java
  
  Index: ConstantValue.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/ConstantValue.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConstantValue.java	2001/07/31 08:40:13	1.1
  +++ ConstantValue.java	2001/10/28 21:30:24	1.2
  @@ -54,7 +54,8 @@
   
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
  
  
  
  1.2       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Deprecated.java
  
  Index: Deprecated.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Deprecated.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Deprecated.java	2001/07/31 08:40:13	1.1
  +++ Deprecated.java	2001/10/28 21:30:24	1.2
  @@ -53,10 +53,10 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes;
   
  -import java.io.*;
   
  +
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
  +
   
   /**
    * deprecated structure
  
  
  
  1.2       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Exceptions.java
  
  Index: Exceptions.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Exceptions.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Exceptions.java	2001/07/31 08:40:13	1.1
  +++ Exceptions.java	2001/10/28 21:30:24	1.2
  @@ -54,10 +54,10 @@
   
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes;
   
  -import java.io.*;
   
  +
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
  +
   
   /**
    * exceptions structure
  
  
  
  1.2       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/InnerClasses.java
  
  Index: InnerClasses.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/InnerClasses.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InnerClasses.java	2001/07/31 08:40:13	1.1
  +++ InnerClasses.java	2001/10/28 21:30:24	1.2
  @@ -53,10 +53,10 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes;
   
  -import java.io.*;
   
  +
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
  +
   
   /**
    * inner classes structure
  
  
  
  1.2       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/LineNumberTable.java
  
  Index: LineNumberTable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/LineNumberTable.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LineNumberTable.java	2001/07/31 08:40:13	1.1
  +++ LineNumberTable.java	2001/10/28 21:30:24	1.2
  @@ -53,10 +53,11 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
  +
   
   /**
    * line number table structure
  
  
  
  1.2       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/LocalVariableTable.java
  
  Index: LocalVariableTable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/LocalVariableTable.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LocalVariableTable.java	2001/07/31 08:40:13	1.1
  +++ LocalVariableTable.java	2001/10/28 21:30:24	1.2
  @@ -53,7 +53,8 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
  
  
  
  1.2       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/SourceDir.java
  
  Index: SourceDir.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/SourceDir.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SourceDir.java	2001/07/31 08:40:13	1.1
  +++ SourceDir.java	2001/10/28 21:30:24	1.2
  @@ -53,7 +53,8 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
  
  
  
  1.2       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/SourceFile.java
  
  Index: SourceFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/SourceFile.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SourceFile.java	2001/07/31 08:40:13	1.1
  +++ SourceFile.java	2001/10/28 21:30:24	1.2
  @@ -53,7 +53,8 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.DataInputStream;
   
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
  
  
  
  1.2       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Synthetic.java
  
  Index: Synthetic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Synthetic.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Synthetic.java	2001/07/31 08:40:13	1.1
  +++ Synthetic.java	2001/10/28 21:30:24	1.2
  @@ -53,10 +53,10 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes;
   
  -import java.io.*;
   
  +
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
  -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
  +
   
   /**
    * synthetic structure
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Unknown.java
  
  Index: Unknown.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Unknown.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Unknown.java	2001/07/31 08:40:13	1.1
  +++ Unknown.java	2001/10/28 21:30:24	1.2
  @@ -53,7 +53,7 @@
    */
   package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes;
   
  -import java.io.*;
  +
   
   import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
   
  
  
  
  1.4       +17 -5     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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AntSoundPlayer.java	2001/02/04 10:51:00	1.3
  +++ AntSoundPlayer.java	2001/10/28 21:30:24	1.4
  @@ -55,17 +55,29 @@
   package org.apache.tools.ant.taskdefs.optional.sound;
   
   // ant includes
  -import org.apache.tools.ant.*;
  +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.*;
  +import javax.sound.sampled.LineListener;
  +import javax.sound.sampled.Clip;
  +import javax.sound.sampled.AudioInputStream;
  +import javax.sound.sampled.AudioSystem;
  +import javax.sound.sampled.UnsupportedAudioFileException;
  +import javax.sound.sampled.AudioFormat;
  +import javax.sound.sampled.DataLine;
  +import javax.sound.sampled.LineUnavailableException;
  +import javax.sound.sampled.LineEvent;
  +import javax.sound.sampled.Line;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.io.IOException;
   
   
  +
   /**
    * This class is designed to be used by any AntTask that requires audio output.
    *
  @@ -75,7 +87,7 @@
    * I have only tested this with .WAV and .AIFF sound file formats. Both seem to work fine.
    *
    * @author Nick Pellow
  - * @version $Revision: 1.3 $, $Date: 2001/02/04 10:51:00 $
  + * @version $Revision: 1.4 $, $Date: 2001/10/28 21:30:24 $
    */
   
   public class AntSoundPlayer implements LineListener, BuildListener {
  
  
  
  1.4       +5 -4      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SoundTask.java	2001/02/04 10:51:01	1.3
  +++ SoundTask.java	2001/10/28 21:30:24	1.4
  @@ -54,10 +54,11 @@
   
   package org.apache.tools.ant.taskdefs.optional.sound;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.Project;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.util.Random;
   
   /**
    * This is an example of an AntTask that makes of use of the AntSoundPlayer.
  @@ -76,7 +77,7 @@
    *   Ant play them back
    *
    * @author Nick Pellow
  - * @version $Revision: 1.3 $, $Date: 2001/02/04 10:51:01 $
  + * @version $Revision: 1.4 $, $Date: 2001/10/28 21:30:24 $
    */
   
   public class SoundTask extends Task {
  
  
  
  1.11      +24 -22    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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MSVSS.java	2001/07/27 08:43:26	1.10
  +++ MSVSS.java	2001/10/28 21:30:24	1.11
  @@ -55,8 +55,10 @@
   package org.apache.tools.ant.taskdefs.optional.vss;
   
   
  -import java.io.File;
  -import org.apache.tools.ant.*;
  +
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.taskdefs.Execute;
   import org.apache.tools.ant.taskdefs.LogStreamHandler;
   import org.apache.tools.ant.types.Commandline;
  @@ -193,56 +195,56 @@
       /**
        * Constant for the thing to execute
        */
  -    private static final String SS_EXE = "ss";
  +    private final static String SS_EXE = "ss";
       /** */
  -    public static final String PROJECT_PREFIX = "$";
  +    public final static String PROJECT_PREFIX = "$";
   
       /**
        * The 'Get' command
        */
  -    public static final String COMMAND_GET = "Get";
  +    public final static String COMMAND_GET = "Get";
       /**
        * The 'Checkout' command
        */
  -    public static final String COMMAND_CHECKOUT = "Checkout";
  +    public final static String COMMAND_CHECKOUT = "Checkout";
       /**
        * The 'Checkin' command
        */
  -    public static final String COMMAND_CHECKIN = "Checkin";
  +    public final static String COMMAND_CHECKIN = "Checkin";
       /**
        * The 'Label' command
        */
  -    public static final String COMMAND_LABEL = "Label";
  +    public final static String COMMAND_LABEL = "Label";
       /**
        * The 'History' command
        */
  -    public static final String COMMAND_HISTORY = "History";
  +    public final static String COMMAND_HISTORY = "History";
   
       /** */
  -    public static final String FLAG_LOGIN = "-Y";
  +    public final static String FLAG_LOGIN = "-Y";
       /** */
  -    public static final String FLAG_OVERRIDE_WORKING_DIR = "-GL";
  +    public final static String FLAG_OVERRIDE_WORKING_DIR = "-GL";
       /** */
  -    public static final String FLAG_AUTORESPONSE_DEF = "-I-";
  +    public final static String FLAG_AUTORESPONSE_DEF = "-I-";
       /** */
  -    public static final String FLAG_AUTORESPONSE_YES = "-I-Y";
  +    public final static String FLAG_AUTORESPONSE_YES = "-I-Y";
       /** */
  -    public static final String FLAG_AUTORESPONSE_NO = "-I-N";
  +    public final static String FLAG_AUTORESPONSE_NO = "-I-N";
       /** */
  -    public static final String FLAG_RECURSION = "-R";
  +    public final static String FLAG_RECURSION = "-R";
       /** */
  -    public static final String FLAG_VERSION = "-V";
  +    public final static String FLAG_VERSION = "-V";
       /** */
  -    public static final String FLAG_VERSION_DATE = "-Vd";
  +    public final static String FLAG_VERSION_DATE = "-Vd";
       /** */
  -    public static final String FLAG_VERSION_LABEL = "-VL";
  +    public final static String FLAG_VERSION_LABEL = "-VL";
       /** */
  -    public static final String FLAG_WRITABLE = "-W";
  +    public final static String FLAG_WRITABLE = "-W";
       /** */
  -    public static final String VALUE_NO = "-N";
  +    public final static String VALUE_NO = "-N";
       /** */
  -    public static final String VALUE_YES = "-Y";
  +    public final static String VALUE_YES = "-Y";
       /** */
  -    public static final String FLAG_QUIET = "-O-";
  +    public final static String FLAG_QUIET = "-O-";
   }
   
  
  
  
  1.2       +1 -1      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MSVSSCHECKIN.java	2001/04/29 16:23:20	1.1
  +++ MSVSSCHECKIN.java	2001/10/28 21:30:24	1.2
  @@ -54,7 +54,7 @@
   
   package org.apache.tools.ant.taskdefs.optional.vss;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
   
  
  
  
  1.2       +1 -1      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MSVSSCHECKOUT.java	2001/04/29 16:23:20	1.1
  +++ MSVSSCHECKOUT.java	2001/10/28 21:30:24	1.2
  @@ -54,7 +54,7 @@
   
   package org.apache.tools.ant.taskdefs.optional.vss;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
   
  
  
  
  1.11      +1 -1      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MSVSSGET.java	2001/07/27 08:43:26	1.10
  +++ MSVSSGET.java	2001/10/28 21:30:24	1.11
  @@ -54,7 +54,7 @@
   
   package org.apache.tools.ant.taskdefs.optional.vss;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
   
  
  
  
  1.3       +11 -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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MSVSSHISTORY.java	2001/04/04 06:56:34	1.2
  +++ MSVSSHISTORY.java	2001/10/28 21:30:24	1.3
  @@ -54,12 +54,16 @@
   
   package org.apache.tools.ant.taskdefs.optional.vss;
   
  -import org.apache.tools.ant.*;
  +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.*;
  -import java.text.*;
  +import java.util.Date;
  +import java.util.Calendar;
  +import java.util.GregorianCalendar;
  +import java.text.DateFormat;
  +import java.text.SimpleDateFormat;
  +import java.text.ParseException;
   /**
    * Task to perform HISTORY commands to Microsoft Visual Source Safe.
    *
  @@ -82,11 +86,11 @@
       private String m_Style = "";
       private boolean m_Recursive = false;
       
  -    public static final String VALUE_FROMDATE = "~d";
  -    public static final String VALUE_FROMLABEL = "~L";
  +    public final static String VALUE_FROMDATE = "~d";
  +    public final static String VALUE_FROMLABEL = "~L";
   
  -    public static final String FLAG_OUTPUT = "-O";
  -    public static final String FLAG_USER = "-U";
  +    public final static String FLAG_OUTPUT = "-O";
  +    public final static String FLAG_USER = "-U";
   
       /**
        * Executes the task.
  
  
  
  1.4       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java
  
  Index: MSVSSLABEL.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MSVSSLABEL.java	2001/07/27 08:43:26	1.3
  +++ MSVSSLABEL.java	2001/10/28 21:30:24	1.4
  @@ -54,7 +54,7 @@
   
   package org.apache.tools.ant.taskdefs.optional.vss;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  @@ -116,7 +116,7 @@
       private String m_Version = null;
       private String m_Comment = "-";
   
  -    public static final String FLAG_LABEL = "-L";
  +    public final static String FLAG_LABEL = "-L";
   
       /**
        * Executes the task.
  
  
  

--
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