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/ide VAJAntToolGUI.java VAJToolsServlet.java
Date Sun, 20 Jan 2002 20:45:58 GMT
sbailliez    02/01/20 12:45:58

  Modified:    src/main/org/apache/tools/bzip2 CBZip2InputStream.java
                        CBZip2OutputStream.java
               src/main/org/apache/tools/ant/types/optional/depend
                        ClassfileSet.java DependScanner.java
               src/main/org/apache/tools/ant/taskdefs/compilers
                        DefaultCompilerAdapter.java
               src/main/org/apache/tools/ant DefaultLogger.java
                        TaskAdapter.java XmlLogger.java
               src/main/org/apache/tools/ant/taskdefs/rmic
                        DefaultRmicAdapter.java
               src/main/org/apache/tools/ant/util/depend Dependencies.java
                        Filter.java
               src/main/org/apache/tools/ant/taskdefs Echo.java Exit.java
                        Input.java Jar.java Javadoc.java LoadFile.java
                        SQLExec.java Tstamp.java Untar.java WaitFor.java
               src/main/org/apache/tools/ant/util FileUtils.java
               src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        GenericDeploymentTool.java
                        WebsphereDeploymentTool.java
               src/main/org/apache/tools/ant/taskdefs/condition Http.java
                        Os.java
               src/main/org/apache/tools/ant/types PatternSet.java
               src/main/org/apache/tools/ant/taskdefs/optional/junit
                        PlainJUnitResultFormatter.java
                        XMLJUnitResultFormatter.java
                        XMLResultAggregator.java
               src/main/org/apache/tools/ant/taskdefs/optional
                        ReplaceRegExp.java TraXLiaison.java
               src/main/org/apache/tools/ant/taskdefs/optional/starteam
                        StarTeamLabel.java StarTeamList.java
               src/main/org/apache/tools/ant/taskdefs/optional/i18n
                        Translate.java
               src/main/org/apache/tools/ant/taskdefs/optional/ide
                        VAJAntToolGUI.java VAJToolsServlet.java
  Log:
  - Fix order of modifiers
  - Fix duplicate/unecessary imports
  - Fix single if/else and loop without block
  
  Revision  Changes    Path
  1.7       +9 -8      jakarta-ant/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
  
  Index: CBZip2InputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/bzip2/CBZip2InputStream.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CBZip2InputStream.java	10 Jan 2002 10:40:47 -0000	1.6
  +++ CBZip2InputStream.java	20 Jan 2002 20:45:55 -0000	1.7
  @@ -59,7 +59,8 @@
    */
   package org.apache.tools.bzip2;
   
  -import java.io.*;
  +import java.io.InputStream;
  +import java.io.IOException;
   
   /**
    * An input stream that decompresses from the BZip2 format (without the file
  @@ -151,13 +152,13 @@
   
       private int currentChar = -1;
   
  -    private static final int START_BLOCK_STATE = 1;
  -    private static final int RAND_PART_A_STATE = 2;
  -    private static final int RAND_PART_B_STATE = 3;
  -    private static final int RAND_PART_C_STATE = 4;
  -    private static final int NO_RAND_PART_A_STATE = 5;
  -    private static final int NO_RAND_PART_B_STATE = 6;
  -    private static final int NO_RAND_PART_C_STATE = 7;
  +    private final static int START_BLOCK_STATE = 1;
  +    private final static int RAND_PART_A_STATE = 2;
  +    private final static int RAND_PART_B_STATE = 3;
  +    private final static int RAND_PART_C_STATE = 4;
  +    private final static int NO_RAND_PART_A_STATE = 5;
  +    private final static int NO_RAND_PART_B_STATE = 6;
  +    private final static int NO_RAND_PART_C_STATE = 7;
   
       private int currentState = START_BLOCK_STATE;
   
  
  
  
  1.7       +9 -8      jakarta-ant/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
  
  Index: CBZip2OutputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CBZip2OutputStream.java	10 Jan 2002 10:40:47 -0000	1.6
  +++ CBZip2OutputStream.java	20 Jan 2002 20:45:55 -0000	1.7
  @@ -60,7 +60,8 @@
   
   package org.apache.tools.bzip2;
   
  -import java.io.*;
  +import java.io.OutputStream;
  +import java.io.IOException;
   
   /**
    * An output stream that compresses into the BZip2 format (without the file
  @@ -71,12 +72,12 @@
    * TODO:    Update to BZip2 1.0.1
    */
   public class CBZip2OutputStream extends OutputStream implements BZip2Constants {
  -    protected static final int SETMASK = (1 << 21);
  -    protected static final int CLEARMASK = (~SETMASK);
  -    protected static final int GREATER_ICOST = 15;
  -    protected static final int LESSER_ICOST = 0;
  -    protected static final int SMALL_THRESH = 20;
  -    protected static final int DEPTH_THRESH = 10;
  +    protected final static int SETMASK = (1 << 21);
  +    protected final static int CLEARMASK = (~SETMASK);
  +    protected final static int GREATER_ICOST = 15;
  +    protected final static int LESSER_ICOST = 0;
  +    protected final static int SMALL_THRESH = 20;
  +    protected final static int DEPTH_THRESH = 10;
   
       /*
         If you are ever unlucky/improbable enough
  @@ -86,7 +87,7 @@
         stack go above 27 elems, so the following
         limit seems very generous.
       */
  -    protected static final int QSORT_STACK_SIZE = 1000;
  +    protected final static int QSORT_STACK_SIZE = 1000;
   
       private static void panic() {
           System.out.println("panic");
  
  
  
  1.4       +4 -4      jakarta-ant/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java
  
  Index: ClassfileSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClassfileSet.java	13 Dec 2001 11:53:44 -0000	1.3
  +++ ClassfileSet.java	20 Jan 2002 20:45:55 -0000	1.4
  @@ -53,15 +53,15 @@
    */
   package org.apache.tools.ant.types.optional.depend;
   
  -import java.io.File;
  -import java.util.Stack;
  +
  +
   import java.util.List;
   import java.util.ArrayList;
   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.util.depend.Dependencies;
  +
   
   /**
    * A DepSet is a FileSet, that enlists all classes that depend on a
  @@ -76,7 +76,7 @@
   public class ClassfileSet extends FileSet {
       private List rootClasses = new ArrayList();
   
  -    static public class ClassRoot {
  +    public static class ClassRoot {
           private String rootClass;
           
           public void setClassname(String name) {
  
  
  
  1.4       +11 -4     jakarta-ant/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java
  
  Index: DependScanner.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DependScanner.java	29 Nov 2001 13:47:38 -0000	1.3
  +++ DependScanner.java	20 Jan 2002 20:45:55 -0000	1.4
  @@ -53,15 +53,22 @@
    */
   package org.apache.tools.ant.types.optional.depend;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.List;
  +import java.util.LinkedList;
  +import java.util.Set;
  +import java.util.TreeSet;
  +import java.util.Iterator;
  +import java.util.HashSet;
   
   import org.apache.tools.ant.util.depend.Dependencies;
   import org.apache.tools.ant.util.depend.Filter;
   import org.apache.tools.ant.DirectoryScanner;
   
  -import org.apache.bcel.classfile.*;
  -import org.apache.bcel.*;
  +import org.apache.bcel.classfile.JavaClass;
  +import org.apache.bcel.classfile.ClassParser;
  +
   
   /**
    * An interface used to describe the actions required by any type of 
  
  
  
  1.19      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  
  Index: DefaultCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- DefaultCompilerAdapter.java	21 Nov 2001 23:09:39 -0000	1.18
  +++ DefaultCompilerAdapter.java	20 Jan 2002 20:45:56 -0000	1.19
  @@ -62,7 +62,7 @@
   import org.apache.tools.ant.taskdefs.LogStreamHandler;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Commandline;
  -import org.apache.tools.ant.types.FileSet;
  +
   import org.apache.tools.ant.util.FileUtils;
   
   import java.io.File;
  
  
  
  1.26      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/DefaultLogger.java
  
  Index: DefaultLogger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/DefaultLogger.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- DefaultLogger.java	10 Jan 2002 11:21:19 -0000	1.25
  +++ DefaultLogger.java	20 Jan 2002 20:45:56 -0000	1.26
  @@ -55,8 +55,8 @@
   package org.apache.tools.ant;
   
   import java.io.PrintStream;
  -import java.io.PrintWriter;
  -import java.io.StringWriter;
  +
  +
   
   import org.apache.tools.ant.util.StringUtils;
   
  
  
  
  1.12      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/TaskAdapter.java
  
  Index: TaskAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/TaskAdapter.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- TaskAdapter.java	10 Jan 2002 11:21:19 -0000	1.11
  +++ TaskAdapter.java	20 Jan 2002 20:45:56 -0000	1.12
  @@ -55,7 +55,7 @@
   package org.apache.tools.ant;
   
   import java.lang.reflect.Method;
  -import java.lang.reflect.Modifier;
  +
   
   
   /**
  
  
  
  1.20      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/XmlLogger.java
  
  Index: XmlLogger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/XmlLogger.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- XmlLogger.java	10 Jan 2002 11:21:19 -0000	1.19
  +++ XmlLogger.java	20 Jan 2002 20:45:56 -0000	1.20
  @@ -58,8 +58,8 @@
   import java.io.OutputStreamWriter;
   import java.io.FileOutputStream;
   import java.io.IOException;
  -import java.io.ByteArrayOutputStream;
  -import java.io.PrintStream;
  +
  +
   import java.util.Hashtable;
   import java.util.Stack;
   import javax.xml.parsers.DocumentBuilder;
  
  
  
  1.13      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
  
  Index: DefaultRmicAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DefaultRmicAdapter.java	8 Jan 2002 20:21:58 -0000	1.12
  +++ DefaultRmicAdapter.java	20 Jan 2002 20:45:56 -0000	1.13
  @@ -58,7 +58,7 @@
   import org.apache.tools.ant.taskdefs.Rmic;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
  -import org.apache.tools.ant.types.FileSet;
  +
   import org.apache.tools.ant.util.FileNameMapper;
   
   import java.io.File;
  
  
  
  1.4       +42 -4     jakarta-ant/src/main/org/apache/tools/ant/util/depend/Dependencies.java
  
  Index: Dependencies.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/depend/Dependencies.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Dependencies.java	8 Jan 2002 22:16:54 -0000	1.3
  +++ Dependencies.java	20 Jan 2002 20:45:56 -0000	1.4
  @@ -53,10 +53,48 @@
    */
   package org.apache.tools.ant.util.depend;
   
  -import java.io.*;
  -import java.util.*;
  -import org.apache.bcel.classfile.*;
  -import org.apache.bcel.*;
  +import java.io.File;
  +import java.util.Set;
  +import java.util.HashSet;
  +import java.util.StringTokenizer;
  +import java.util.TreeSet;
  +import java.util.Iterator;
  +import java.util.Collection;
  +import org.apache.bcel.classfile.Visitor;
  +import org.apache.bcel.classfile.JavaClass;
  +import org.apache.bcel.classfile.ConstantPool;
  +import org.apache.bcel.classfile.Code;
  +import org.apache.bcel.classfile.CodeException;
  +import org.apache.bcel.classfile.ConstantClass;
  +import org.apache.bcel.classfile.ConstantDouble;
  +import org.apache.bcel.classfile.ConstantFieldref;
  +import org.apache.bcel.classfile.ConstantFloat;
  +import org.apache.bcel.classfile.ConstantInteger;
  +import org.apache.bcel.classfile.ConstantInterfaceMethodref;
  +import org.apache.bcel.classfile.ConstantLong;
  +import org.apache.bcel.classfile.ConstantMethodref;
  +import org.apache.bcel.classfile.ConstantNameAndType;
  +import org.apache.bcel.classfile.Constant;
  +import org.apache.bcel.classfile.ConstantString;
  +import org.apache.bcel.classfile.ConstantUtf8;
  +import org.apache.bcel.classfile.ConstantValue;
  +import org.apache.bcel.classfile.Deprecated;
  +import org.apache.bcel.classfile.ExceptionTable;
  +import org.apache.bcel.classfile.Field;
  +import org.apache.bcel.classfile.InnerClass;
  +import org.apache.bcel.classfile.InnerClasses;
  +import org.apache.bcel.classfile.Method;
  +import org.apache.bcel.classfile.LineNumber;
  +import org.apache.bcel.classfile.LineNumberTable;
  +import org.apache.bcel.classfile.LocalVariable;
  +import org.apache.bcel.classfile.LocalVariableTable;
  +import org.apache.bcel.classfile.SourceFile;
  +import org.apache.bcel.classfile.Synthetic;
  +import org.apache.bcel.classfile.Unknown;
  +import org.apache.bcel.classfile.StackMap;
  +import org.apache.bcel.classfile.StackMapEntry;
  +import org.apache.bcel.classfile.ClassParser;
  +
   
   
   public class Dependencies implements Visitor {
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/util/depend/Filter.java
  
  Index: Filter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/depend/Filter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Filter.java	8 Nov 2001 12:58:21 -0000	1.1
  +++ Filter.java	20 Jan 2002 20:45:56 -0000	1.2
  @@ -53,7 +53,7 @@
    */
   package org.apache.tools.ant.util.depend;
   
  -import java.util.*;
  +
   
   public interface Filter {
       boolean accept(Object object);
  
  
  
  1.12      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java
  
  Index: Echo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Echo.java	10 Jan 2002 13:59:31 -0000	1.11
  +++ Echo.java	20 Jan 2002 20:45:56 -0000	1.12
  @@ -57,7 +57,7 @@
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.ProjectHelper;
  +
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import java.io.File;
   import java.io.FileWriter;
  
  
  
  1.11      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exit.java
  
  Index: Exit.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exit.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Exit.java	10 Jan 2002 13:59:31 -0000	1.10
  +++ Exit.java	20 Jan 2002 20:45:56 -0000	1.11
  @@ -56,7 +56,7 @@
   
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.ProjectHelper;
  +
   
   /**
    * Just exit the active build, giving an additional message 
  
  
  
  1.4       +3 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Input.java
  
  Index: Input.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Input.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Input.java	12 Dec 2001 09:31:51 -0000	1.3
  +++ Input.java	20 Jan 2002 20:45:56 -0000	1.4
  @@ -59,7 +59,9 @@
   import  java.io.IOException;
   import  java.util.StringTokenizer;
   import  java.util.Vector;
  -import  org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   
   /**
  
  
  
  1.33      +11 -2     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
  
  Index: Jar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Jar.java	10 Jan 2002 13:59:31 -0000	1.32
  +++ Jar.java	20 Jan 2002 20:45:56 -0000	1.33
  @@ -60,9 +60,18 @@
   import org.apache.tools.ant.types.ZipFileSet;
   import org.apache.tools.zip.ZipOutputStream;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.File;
  +import java.io.InputStream;
  +import java.io.Reader;
  +import java.io.FileReader;
  +import java.io.ByteArrayOutputStream;
  +import java.io.PrintWriter;
  +import java.io.ByteArrayInputStream;
  +import java.io.OutputStreamWriter;
  +import java.io.InputStreamReader;
   import java.util.Enumeration;
  -import java.util.Vector;
  +
   
   /**
    * Creates a JAR archive.
  
  
  
  1.72      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- Javadoc.java	11 Jan 2002 14:59:40 -0000	1.71
  +++ Javadoc.java	20 Jan 2002 20:45:56 -0000	1.72
  @@ -64,7 +64,7 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.ProjectHelper;
  +
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.condition.Os;
   import org.apache.tools.ant.types.Path;
  
  
  
  1.5       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
  
  Index: LoadFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LoadFile.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LoadFile.java	10 Jan 2002 13:59:31 -0000	1.4
  +++ LoadFile.java	20 Jan 2002 20:45:56 -0000	1.5
  @@ -56,8 +56,8 @@
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.ProjectHelper;
  -import org.apache.tools.ant.types.EnumeratedAttribute;
  +
  +
   
   import java.io.File;
   import java.io.FileInputStream;
  
  
  
  1.32      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
  
  Index: SQLExec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- SQLExec.java	10 Jan 2002 13:59:31 -0000	1.31
  +++ SQLExec.java	20 Jan 2002 20:45:56 -0000	1.32
  @@ -59,7 +59,7 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.ProjectHelper;
  +
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
  
  
  
  1.18      +8 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
  
  Index: Tstamp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Tstamp.java	10 Jan 2002 13:59:32 -0000	1.17
  +++ Tstamp.java	20 Jan 2002 20:45:56 -0000	1.18
  @@ -234,14 +234,14 @@
   
       public static class Unit extends EnumeratedAttribute {
   
  -        private static final String MILLISECOND = "millisecond";
  -        private static final String SECOND = "second";
  -        private static final String MINUTE = "minute";
  -        private static final String HOUR = "hour";
  -        private static final String DAY = "day";
  -        private static final String WEEK = "week";
  -        private static final String MONTH = "month";
  -        private static final String YEAR = "year";
  +        private final static String MILLISECOND = "millisecond";
  +        private final static String SECOND = "second";
  +        private final static String MINUTE = "minute";
  +        private final static String HOUR = "hour";
  +        private final static String DAY = "day";
  +        private final static String WEEK = "week";
  +        private final static String MONTH = "month";
  +        private final static String YEAR = "year";
   
           private final static String[] units = {
                                                   MILLISECOND,
  
  
  
  1.19      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Untar.java
  
  Index: Untar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Untar.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Untar.java	10 Jan 2002 13:59:32 -0000	1.18
  +++ Untar.java	20 Jan 2002 20:45:56 -0000	1.19
  @@ -62,7 +62,7 @@
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.IOException;
  -import java.util.Date;
  +
   
   /**
    * Untar a file.
  
  
  
  1.6       +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
  
  Index: WaitFor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/WaitFor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WaitFor.java	10 Jan 2002 13:59:32 -0000	1.5
  +++ WaitFor.java	20 Jan 2002 20:45:56 -0000	1.6
  @@ -161,12 +161,12 @@
   
       public static class Unit extends EnumeratedAttribute {
   
  -        private static final String MILLISECOND = "millisecond";
  -        private static final String SECOND = "second";
  -        private static final String MINUTE = "minute";
  -        private static final String HOUR = "hour";
  -        private static final String DAY = "day";
  -        private static final String WEEK = "week";
  +        private final static String MILLISECOND = "millisecond";
  +        private final static String SECOND = "second";
  +        private final static String MINUTE = "minute";
  +        private final static String HOUR = "hour";
  +        private final static String DAY = "day";
  +        private final static String WEEK = "week";
   
           private final static String[] units = {
               MILLISECOND, SECOND, MINUTE, HOUR, DAY, WEEK
  
  
  
  1.12      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/util/FileUtils.java
  
  Index: FileUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/FileUtils.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- FileUtils.java	26 Nov 2001 11:03:52 -0000	1.11
  +++ FileUtils.java	20 Jan 2002 20:45:57 -0000	1.12
  @@ -64,7 +64,7 @@
   import java.io.FileWriter;
   import java.io.IOException;
   import java.io.InputStream;
  -import java.io.InputStream;
  +
   import java.lang.reflect.Method;
   import java.text.DecimalFormat;
   import java.util.Random;
  @@ -85,7 +85,7 @@
    * @author <a href="mailto:conor@apache.org">Conor MacNeill</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
    *
  - * @version $Revision: 1.11 $
  + * @version $Revision: 1.12 $
    */
    
   public class FileUtils {
  
  
  
  1.27      +5 -4      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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- GenericDeploymentTool.java	10 Jan 2002 13:59:35 -0000	1.26
  +++ GenericDeploymentTool.java	20 Jan 2002 20:45:57 -0000	1.27
  @@ -74,12 +74,13 @@
   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.util.depend.Dependencies;
   import org.apache.tools.ant.util.depend.Filter;
  -import org.apache.bcel.classfile.*;
  -import org.apache.bcel.*;
  +import org.apache.bcel.classfile.JavaClass;
  +import org.apache.bcel.classfile.ClassParser;
  +
   
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.BuildException;
  
  
  
  1.5       +31 -19    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
  
  Index: WebsphereDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WebsphereDeploymentTool.java	10 Jan 2002 14:28:54 -0000	1.4
  +++ WebsphereDeploymentTool.java	20 Jan 2002 20:45:57 -0000	1.5
  @@ -54,18 +54,30 @@
   
   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.taskdefs.*;
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.taskdefs.ExecTask;
  +import java.io.File;
  +import java.io.IOException;
  +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.Iterator;
  +import java.util.Hashtable;
  +import java.util.Enumeration;
  +
  +
  +
  +
  +
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.AntClassLoader;
  +import org.apache.tools.ant.taskdefs.Java;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Environment;
  +import org.apache.tools.ant.types.Commandline;
  +
   /**
    * Websphere deployment tool that augments the ejbjar task.
    * @author <mailto:msahu@interkeel.com>Maneesh Sahu</mailto>
  @@ -83,16 +95,16 @@
           }
       }
           
  -    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";
  -    protected static final String SCHEMA_DIR = "Schema/";
  +    protected final static String SCHEMA_DIR = "Schema/";
           
  -    protected static final String WAS_EXT = "ibm-ejb-jar-ext.xmi";
  -    protected static final String WAS_BND = "ibm-ejb-jar-bnd.xmi";
  -    protected static final String WAS_CMP_MAP = "Map.mapxmi";
  -    protected static final String WAS_CMP_SCHEMA = "Schema.dbxmi";
  +    protected final static String WAS_EXT = "ibm-ejb-jar-ext.xmi";
  +    protected final static String WAS_BND = "ibm-ejb-jar-bnd.xmi";
  +    protected final static String WAS_CMP_MAP = "Map.mapxmi";
  +    protected final static String WAS_CMP_SCHEMA = "Schema.dbxmi";
           
       /** Instance variable that stores the suffix for the websphere jarfile. */
       private String jarSuffix = ".jar";
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
  
  Index: Http.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Http.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Http.java	30 Nov 2001 12:05:27 -0000	1.1
  +++ Http.java	20 Jan 2002 20:45:57 -0000	1.2
  @@ -58,7 +58,7 @@
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.ProjectComponent;
   
  -import java.io.IOException;
  +
   import java.net.MalformedURLException;
   import java.net.HttpURLConnection;
   import java.net.URLConnection;
  
  
  
  1.8       +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
  
  Index: Os.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Os.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Os.java	25 Nov 2001 07:54:28 -0000	1.7
  +++ Os.java	20 Jan 2002 20:45:57 -0000	1.8
  @@ -63,16 +63,16 @@
    *
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    */
   public class Os implements Condition {
  -    private static final String osName =
  +    private final static String osName =
           System.getProperty("os.name").toLowerCase(Locale.US);
  -    private static final String osArch =
  +    private final static String osArch =
           System.getProperty("os.arch").toLowerCase(Locale.US);
  -    private static final String osVersion =
  +    private final static String osVersion =
           System.getProperty("os.version").toLowerCase(Locale.US);
  -    private static final String pathSep = System.getProperty("path.separator");
  +    private final static String pathSep = System.getProperty("path.separator");
   
       private String family;
       private String name;
  
  
  
  1.18      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/types/PatternSet.java
  
  Index: PatternSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/PatternSet.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- PatternSet.java	10 Jan 2002 11:21:20 -0000	1.17
  +++ PatternSet.java	20 Jan 2002 20:45:57 -0000	1.18
  @@ -55,7 +55,7 @@
   package org.apache.tools.ant.types;
   
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.ProjectHelper;
  +
   import org.apache.tools.ant.BuildException;
   
   import java.io.File;
  
  
  
  1.13      +1 -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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- PlainJUnitResultFormatter.java	10 Jan 2002 13:59:37 -0000	1.12
  +++ PlainJUnitResultFormatter.java	20 Jan 2002 20:45:57 -0000	1.13
  @@ -65,7 +65,7 @@
   
   import junit.framework.AssertionFailedError;
   import junit.framework.Test;
  -import junit.framework.TestCase;
  +
   
   /**
    * Prints plain text output of the test to a specified Writer.
  
  
  
  1.20      +3 -3      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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- XMLJUnitResultFormatter.java	14 Jan 2002 00:59:41 -0000	1.19
  +++ XMLJUnitResultFormatter.java	20 Jan 2002 20:45:57 -0000	1.20
  @@ -58,8 +58,8 @@
   import java.io.Writer;
   import java.io.OutputStreamWriter;
   import java.io.IOException;
  -import java.io.StringWriter;
  -import java.io.PrintWriter;
  +
  +
   
   
   import java.util.Properties;
  @@ -75,7 +75,7 @@
   
   import junit.framework.AssertionFailedError;
   import junit.framework.Test;
  -import junit.framework.TestCase;
  +
   
   /**
    * Prints XML output of the test to a specified Writer.
  
  
  
  1.9       +1 -1      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XMLResultAggregator.java	15 Dec 2001 00:28:47 -0000	1.8
  +++ XMLResultAggregator.java	20 Jan 2002 20:45:57 -0000	1.9
  @@ -58,7 +58,7 @@
   import java.io.OutputStream;
   import java.io.OutputStreamWriter;
   import java.io.PrintWriter;
  -import java.io.StringWriter;
  +
   import java.io.FileOutputStream;
   import java.util.Enumeration;
   import java.util.Vector;
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
  
  Index: ReplaceRegExp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ReplaceRegExp.java	8 Jan 2002 22:36:03 -0000	1.5
  +++ ReplaceRegExp.java	20 Jan 2002 20:45:57 -0000	1.6
  @@ -70,7 +70,7 @@
   import java.io.IOException;
   import java.io.LineNumberReader;
   import java.io.PrintWriter;
  -import java.util.Random;
  +
   import java.util.Vector;
   
   /***
  
  
  
  1.10      +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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TraXLiaison.java	10 Jan 2002 13:59:34 -0000	1.9
  +++ TraXLiaison.java	20 Jan 2002 20:45:57 -0000	1.10
  @@ -67,7 +67,7 @@
   import javax.xml.transform.Transformer;
   import javax.xml.transform.TransformerException;
   import javax.xml.transform.Templates;
  -import javax.xml.transform.Source;
  +
   import javax.xml.transform.ErrorListener;
   import javax.xml.transform.stream.StreamResult;
   import javax.xml.transform.stream.StreamSource;
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
  
  Index: StarTeamLabel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StarTeamLabel.java	16 Jan 2002 11:25:48 -0000	1.4
  +++ StarTeamLabel.java	20 Jan 2002 20:45:57 -0000	1.5
  @@ -98,7 +98,7 @@
        */
       private OLEDate lastBuild = null;
   
  -    private static final SimpleDateFormat DATE_FORMAT =
  +    private final static SimpleDateFormat DATE_FORMAT =
               new SimpleDateFormat("yyyyMMddHHmmss");
   
   
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java
  
  Index: StarTeamList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StarTeamList.java	16 Jan 2002 11:25:48 -0000	1.2
  +++ StarTeamList.java	20 Jan 2002 20:45:57 -0000	1.3
  @@ -192,7 +192,7 @@
           log(b.toString());
       }
   
  -    private static final String blankstr = blanks(30);
  +    private final static String blankstr = blanks(30);
   
       private static String blanks(int len) {
           StringBuffer b = new StringBuffer();
  
  
  
  1.4       +16 -5     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
  
  Index: Translate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Translate.java	10 Jan 2002 13:59:36 -0000	1.3
  +++ Translate.java	20 Jan 2002 20:45:57 -0000	1.4
  @@ -53,11 +53,22 @@
    */
   package org.apache.tools.ant.taskdefs.optional.i18n;
   
  -import java.io.*;
  -import java.util.*;
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.util.*;
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.IOException;
  +import java.io.BufferedReader;
  +import java.io.InputStreamReader;
  +import java.io.FileOutputStream;
  +import java.io.BufferedWriter;
  +import java.io.OutputStreamWriter;
  +import java.util.Vector;
  +import java.util.Hashtable;
  +import java.util.Locale;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.util.FileUtils;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   
   /**
  
  
  
  1.7       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
  
  Index: VAJAntToolGUI.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- VAJAntToolGUI.java	10 Jan 2002 13:59:36 -0000	1.6
  +++ VAJAntToolGUI.java	20 Jan 2002 20:45:57 -0000	1.7
  @@ -85,8 +85,8 @@
   import java.awt.event.ItemEvent;
   import java.awt.event.TextEvent;
   import java.awt.event.WindowEvent;
  -import java.io.StringWriter;
  -import java.io.PrintWriter;
  +
  +
   import java.beans.PropertyChangeListener;
   
   import org.apache.tools.ant.BuildException;
  
  
  
  1.6       +2 -2      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- VAJToolsServlet.java	10 Jan 2002 13:59:36 -0000	1.5
  +++ VAJToolsServlet.java	20 Jan 2002 20:45:58 -0000	1.6
  @@ -57,8 +57,8 @@
   
   
   import java.io.IOException;
  -import java.io.StringWriter;
  -import java.io.PrintWriter;
  +
  +
   
   import javax.servlet.http.HttpServlet;
   import javax.servlet.http.HttpServletRequest;
  
  
  

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