ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/zip AsiExtraField.java ZipOutputStream.java
Date Mon, 15 Apr 2002 14:56:35 GMT
conor       02/04/15 07:56:35

  Modified:    src/main/org/apache/tools/ant/taskdefs Available.java
                        BUnzip2.java Exec.java Execute.java FixCRLF.java
                        GUnzip.java Jar.java Javac.java Javadoc.java
                        Recorder.java Rmic.java SQLExec.java
                        StreamPumper.java Tar.java Tstamp.java WaitFor.java
                        Zip.java
               src/main/org/apache/tools/ant/taskdefs/compilers
                        Javac13.java
               src/main/org/apache/tools/ant/taskdefs/condition Os.java
               src/main/org/apache/tools/ant/taskdefs/cvslib
                        ChangeLogTask.java
               src/main/org/apache/tools/ant/taskdefs/email EmailTask.java
               src/main/org/apache/tools/ant/taskdefs/optional
                        IContract.java Javah.java NetRexxC.java
                        PropertyFile.java Test.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
               src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool
                        ConstantPoolEntry.java
               src/main/org/apache/tools/ant/taskdefs/optional/dotnet
                        CSharp.java Ilasm.java
               src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        BorlandDeploymentTool.java
                        BorlandGenerateClient.java DescriptorHandler.java
                        IPlanetDeploymentTool.java IPlanetEjbc.java
                        JbossDeploymentTool.java WLRun.java
                        WeblogicDeploymentTool.java
                        WeblogicTOPLinkDeploymentTool.java
                        WebsphereDeploymentTool.java
               src/main/org/apache/tools/ant/taskdefs/optional/ide
                        VAJAntTool.java VAJAntToolGUI.java
                        VAJExportServlet.java VAJLoadServlet.java
                        VAJToolsServlet.java VAJWorkspaceScanner.java
               src/main/org/apache/tools/ant/taskdefs/optional/j2ee
                        JonasHotDeploymentTool.java
               src/main/org/apache/tools/ant/taskdefs/optional/javacc
                        JJTree.java JavaCC.java
               src/main/org/apache/tools/ant/taskdefs/optional/jdepend
                        JDependTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/jlink
                        ClassNameReader.java
               src/main/org/apache/tools/ant/taskdefs/optional/jsp
                        JspC.java JspNameMangler.java
               src/main/org/apache/tools/ant/taskdefs/optional/junit
                        AggregateTransformer.java JUnitTestRunner.java
                        XMLResultAggregator.java
               src/main/org/apache/tools/ant/taskdefs/optional/metamata
                        MAudit.java MAuditParser.java
                        MMetricsStreamHandler.java
               src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
               src/main/org/apache/tools/ant/taskdefs/optional/pvcs
                        Pvcs.java
               src/main/org/apache/tools/ant/taskdefs/optional/scm
                        AntStarTeamCheckOut.java
               src/main/org/apache/tools/ant/taskdefs/optional/sitraka
                        Filters.java Triggers.java
               src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode
                        ClassPathLoader.java Utils.java
               src/main/org/apache/tools/ant/taskdefs/optional/starteam
                        StarTeamLabel.java StarTeamList.java
                        TreeBasedTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/vss
                        MSVSS.java MSVSSHISTORY.java MSVSSLABEL.java
               src/main/org/apache/tools/ant/taskdefs/rmic
                        DefaultRmicAdapter.java
               src/main/org/apache/tools/ant/types FilterSet.java
                        RegularExpression.java Substitution.java
               src/main/org/apache/tools/ant/util DateUtils.java
                        JavaEnvUtils.java StringUtils.java
               src/main/org/apache/tools/bzip2 CBZip2InputStream.java
                        CBZip2OutputStream.java
               src/main/org/apache/tools/mail MailMessage.java
               src/main/org/apache/tools/tar TarBuffer.java
                        TarOutputStream.java
               src/main/org/apache/tools/zip AsiExtraField.java
                        ZipOutputStream.java
  Log:
  Order of modifiers
  
  Revision  Changes    Path
  1.42      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java
  
  Index: Available.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -w -u -r1.41 -r1.42
  --- Available.java	12 Apr 2002 14:46:44 -0000	1.41
  +++ Available.java	15 Apr 2002 14:56:29 -0000	1.42
  @@ -422,7 +422,7 @@
   
       public static class FileDir extends EnumeratedAttribute {
   
  -        private final static String[] values = {"file", "dir"};
  +        private static final String[] values = {"file", "dir"};
   
           public String[] getValues() {
               return values;
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
  
  Index: BUnzip2.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -w -u -r1.7 -r1.8
  --- BUnzip2.java	12 Apr 2002 14:46:44 -0000	1.7
  +++ BUnzip2.java	15 Apr 2002 14:56:29 -0000	1.8
  @@ -76,7 +76,7 @@
   
   public class BUnzip2 extends Unpack {
   
  -    private final static String DEFAULT_EXTENSION = ".bz2";
  +    private static final String DEFAULT_EXTENSION = ".bz2";
   
       protected String getDefaultExtension() {
           return DEFAULT_EXTENSION;
  
  
  
  1.28      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java
  
  Index: Exec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -w -u -r1.27 -r1.28
  --- Exec.java	15 Apr 2002 13:36:17 -0000	1.27
  +++ Exec.java	15 Apr 2002 14:56:29 -0000	1.28
  @@ -86,7 +86,7 @@
       protected PrintWriter fos = null;
       private boolean failOnError = false;
   
  -    private final static int BUFFER_SIZE = 512;
  +    private static final int BUFFER_SIZE = 512;
   
       public Exec() {
           System.err.println("As of Ant 1.2 released in October 2000, the Exec class");
  
  
  
  1.41      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
  
  Index: Execute.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -w -u -r1.40 -r1.41
  --- Execute.java	15 Apr 2002 13:36:17 -0000	1.40
  +++ Execute.java	15 Apr 2002 14:56:29 -0000	1.41
  @@ -79,12 +79,12 @@
    *
    * @since Ant 1.2
    *
  - * @version $Revision: 1.40 $
  + * @version $Revision: 1.41 $
    */
   public class Execute {
   
       /** Invalid exit code. **/
  -    public final static int INVALID = Integer.MAX_VALUE;
  +    public static final int INVALID = Integer.MAX_VALUE;
   
       private String[] cmdl = null;
       private String[] env = null;
  
  
  
  1.36      +19 -19    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
  
  Index: FixCRLF.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -w -u -r1.35 -r1.36
  --- FixCRLF.java	15 Apr 2002 13:36:17 -0000	1.35
  +++ FixCRLF.java	15 Apr 2002 14:56:29 -0000	1.36
  @@ -116,7 +116,7 @@
    *
    * @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
    * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
  - * @version $Revision: 1.35 $ $Name:  $
  + * @version $Revision: 1.36 $ $Name:  $
    * @since Ant 1.1
    *
    * @ant.task category="filesystem"
  @@ -124,27 +124,27 @@
   
   public class FixCRLF extends MatchingTask {
   
  -    private final static int UNDEF = -1;
  -    private final static int NOTJAVA = 0;
  -    private final static int LOOKING = 1;
  -    private final static int IN_CHAR_CONST = 2;
  -    private final static int IN_STR_CONST = 3;
  -    private final static int IN_SINGLE_COMMENT = 4;
  -    private final static int IN_MULTI_COMMENT = 5;
  +    private static final int UNDEF = -1;
  +    private static final int NOTJAVA = 0;
  +    private static final int LOOKING = 1;
  +    private static final int IN_CHAR_CONST = 2;
  +    private static final int IN_STR_CONST = 3;
  +    private static final int IN_SINGLE_COMMENT = 4;
  +    private static final int IN_MULTI_COMMENT = 5;
   
  -    private final static int ASIS = 0;
  -    private final static int CR = 1;
  -    private final static int LF = 2;
  -    private final static int CRLF = 3;
  -    private final static int ADD = 1;
  -    private final static int REMOVE = -1;
  -    private final static int SPACES = -1;
  -    private final static int TABS = 1;
  +    private static final int ASIS = 0;
  +    private static final int CR = 1;
  +    private static final int LF = 2;
  +    private static final int CRLF = 3;
  +    private static final int ADD = 1;
  +    private static final int REMOVE = -1;
  +    private static final int SPACES = -1;
  +    private static final int TABS = 1;
   
  -    private final static int INBUFLEN = 8192;
  -    private final static int LINEBUFLEN = 200;
  +    private static final int INBUFLEN = 8192;
  +    private static final int LINEBUFLEN = 200;
   
  -    private final static char CTRLZ = '\u001A';
  +    private static final char CTRLZ = '\u001A';
   
       private int tablength = 8;
       private String spaces = "        ";
  
  
  
  1.14      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
  
  Index: GUnzip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GUnzip.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -w -u -r1.13 -r1.14
  --- GUnzip.java	14 Apr 2002 11:16:12 -0000	1.13
  +++ GUnzip.java	15 Apr 2002 14:56:29 -0000	1.14
  @@ -76,7 +76,7 @@
   
   public class GUnzip extends Unpack {
   
  -    private final static String DEFAULT_EXTENSION = ".gz";
  +    private static final String DEFAULT_EXTENSION = ".gz";
   
       protected String getDefaultExtension() {
           return DEFAULT_EXTENSION;
  
  
  
  1.50      +1 -1      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.49
  retrieving revision 1.50
  diff -u -w -u -r1.49 -r1.50
  --- Jar.java	15 Apr 2002 13:36:17 -0000	1.49
  +++ Jar.java	15 Apr 2002 14:56:29 -0000	1.50
  @@ -86,7 +86,7 @@
    */
   public class Jar extends Zip {
       /** The index file name. */
  -    private final static String INDEX_NAME = "META-INF/INDEX.LIST";
  +    private static final String INDEX_NAME = "META-INF/INDEX.LIST";
   
       /** merged manifests added through addConfiguredManifest */
       private Manifest configuredManifest;
  
  
  
  1.97      +4 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -w -u -r1.96 -r1.97
  --- Javac.java	15 Apr 2002 12:32:12 -0000	1.96
  +++ Javac.java	15 Apr 2002 14:56:29 -0000	1.97
  @@ -104,7 +104,7 @@
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    * @author <a href="mailto:jayglanville@home.com">J D Glanville</a>
    *
  - * @version $Revision: 1.96 $
  + * @version $Revision: 1.97 $
    *
    * @since Ant 1.1
    *
  @@ -113,7 +113,7 @@
   
   public class Javac extends MatchingTask {
   
  -    private final static String FAIL_MSG
  +    private static final String FAIL_MSG
           = "Compile failed; see the compiler error output for details.";
   
       private Path src;
  @@ -721,8 +721,7 @@
                       Project.MSG_WARN);
                   facade.setImplementation("extJavac");
                   compilerImpl = "extJavac";
  -            }
  -            else {
  +            } else {
                   log("Since compiler setting isn't classic or modern,"
                       + "ignoring fork setting.", Project.MSG_WARN);
               }
  @@ -769,8 +768,7 @@
                   + (destDir != null ? " to " + destDir : ""));
   
               if (listFiles) {
  -                for (int i = 0 ; i < compileList.length ; i++)
  -                {
  +                for (int i = 0 ; i < compileList.length ; i++) {
                     String filename = compileList[i].getAbsolutePath();
                     log(filename) ;
                   }
  
  
  
  1.90      +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.89
  retrieving revision 1.90
  diff -u -w -u -r1.89 -r1.90
  --- Javadoc.java	15 Apr 2002 13:36:17 -0000	1.89
  +++ Javadoc.java	15 Apr 2002 14:56:29 -0000	1.90
  @@ -130,7 +130,7 @@
           }
       }
   
  -    static public class ExtensionInfo extends ProjectComponent {
  +    public static class ExtensionInfo extends ProjectComponent {
           private String name;
           private Path path;
           public void setName(String name) {
  
  
  
  1.12      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Recorder.java
  
  Index: Recorder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Recorder.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -w -u -r1.11 -r1.12
  --- Recorder.java	14 Apr 2002 11:16:13 -0000	1.11
  +++ Recorder.java	15 Apr 2002 14:56:29 -0000	1.12
  @@ -192,7 +192,7 @@
        * Possible values include: start and stop.
        */
       public static class ActionChoices extends EnumeratedAttribute {
  -        private final static String[] values = {"start", "stop"};
  +        private static final String[] values = {"start", "stop"};
   
   
           public String[] getValues() {
  @@ -206,7 +206,7 @@
        * Possible values include: error, warn, info, verbose, debug.
        */
       public static class VerbosityLevelChoices extends EnumeratedAttribute {
  -        private final static String[] values = {"error", "warn", "info",
  +        private static final String[] values = {"error", "warn", "info",
               "verbose", "debug"};
   
   
  
  
  
  1.36      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java
  
  Index: Rmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -w -u -r1.35 -r1.36
  --- Rmic.java	15 Apr 2002 13:20:25 -0000	1.35
  +++ Rmic.java	15 Apr 2002 14:56:29 -0000	1.36
  @@ -109,7 +109,7 @@
   
   public class Rmic extends MatchingTask {
   
  -    private final static String FAIL_MSG 
  +    private static final String FAIL_MSG 
           = "Rmic failed; see the compiler error output for details.";
   
       private File baseDir;
  
  
  
  1.41      +2 -2      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.40
  retrieving revision 1.41
  diff -u -w -u -r1.40 -r1.41
  --- SQLExec.java	15 Apr 2002 13:36:17 -0000	1.40
  +++ SQLExec.java	15 Apr 2002 14:56:29 -0000	1.41
  @@ -107,8 +107,8 @@
   public class SQLExec extends Task {
   
       public static class DelimiterType extends EnumeratedAttribute {
  -        public final static String NORMAL = "normal";
  -        public final static String ROW = "row";
  +        public static final String NORMAL = "normal";
  +        public static final String ROW = "row";
           public String[] getValues() {
               return new String[] {NORMAL, ROW};
           }
  
  
  
  1.7       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
  
  Index: StreamPumper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -u -r1.6 -r1.7
  --- StreamPumper.java	15 Apr 2002 13:36:17 -0000	1.6
  +++ StreamPumper.java	15 Apr 2002 14:56:29 -0000	1.7
  @@ -69,8 +69,8 @@
       // TODO: make SIZE and SLEEP instance variables.
       // TODO: add a status flag to note if an error occured in run.
   
  -    private final static int SLEEP = 5;
  -    private final static int SIZE = 128;
  +    private static final int SLEEP = 5;
  +    private static final int SIZE = 128;
       private InputStream is;
       private OutputStream os;
       private boolean finished;
  
  
  
  1.30      +10 -10    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java
  
  Index: Tar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -w -u -r1.29 -r1.30
  --- Tar.java	15 Apr 2002 13:36:17 -0000	1.29
  +++ Tar.java	15 Apr 2002 14:56:29 -0000	1.30
  @@ -89,27 +89,27 @@
        * @deprecated Tar.WARN is deprecated and is replaced with
        *             Tar.TarLongFileMode.WARN
        */
  -    public final static String WARN = "warn";
  +    public static final String WARN = "warn";
       /**
        * @deprecated Tar.FAIL is deprecated and is replaced with
        *             Tar.TarLongFileMode.FAIL
        */
  -    public final static String FAIL = "fail";
  +    public static final String FAIL = "fail";
       /**
        * @deprecated Tar.TRUNCATE is deprecated and is replaced with
        *             Tar.TarLongFileMode.TRUNCATE
        */
  -    public final static String TRUNCATE = "truncate";
  +    public static final String TRUNCATE = "truncate";
       /**
        * @deprecated Tar.GNU is deprecated and is replaced with
        *             Tar.TarLongFileMode.GNU
        */
  -    public final static String GNU = "gnu";
  +    public static final String GNU = "gnu";
       /**
        * @deprecated Tar.OMIT is deprecated and is replaced with
        *             Tar.TarLongFileMode.OMIT
        */
  -    public final static String OMIT = "omit";
  +    public static final String OMIT = "omit";
   
       File tarFile;
       File baseDir;
  @@ -491,11 +491,11 @@
       public static class TarLongFileMode extends EnumeratedAttribute {
   
           // permissable values for longfile attribute
  -        public final static String WARN = "warn";
  -        public final static String FAIL = "fail";
  -        public final static String TRUNCATE = "truncate";
  -        public final static String GNU = "gnu";
  -        public final static String OMIT = "omit";
  +        public static final String WARN = "warn";
  +        public static final String FAIL = "fail";
  +        public static final String TRUNCATE = "truncate";
  +        public static final String GNU = "gnu";
  +        public static final String OMIT = "omit";
   
           private final String[] validModes = {WARN, FAIL, TRUNCATE, GNU, OMIT};
   
  
  
  
  1.26      +9 -9      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.25
  retrieving revision 1.26
  diff -u -w -u -r1.25 -r1.26
  --- Tstamp.java	15 Apr 2002 13:36:17 -0000	1.25
  +++ Tstamp.java	15 Apr 2002 14:56:29 -0000	1.26
  @@ -236,16 +236,16 @@
   
       public static class Unit extends EnumeratedAttribute {
   
  -        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 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[] units = {
  +        private static final String[] units = {
                                                   MILLISECOND,
                                                   SECOND,
                                                   MINUTE,
  
  
  
  1.11      +7 -7      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.10
  retrieving revision 1.11
  diff -u -w -u -r1.10 -r1.11
  --- WaitFor.java	12 Apr 2002 14:10:19 -0000	1.10
  +++ WaitFor.java	15 Apr 2002 14:56:29 -0000	1.11
  @@ -174,14 +174,14 @@
   
       public static class Unit extends EnumeratedAttribute {
   
  -        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 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[] units = {
  +        private static final String[] units = {
               MILLISECOND, SECOND, MINUTE, HOUR, DAY, WEEK
           };
   
  
  
  
  1.77      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
  
  Index: Zip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -w -u -r1.76 -r1.77
  --- Zip.java	15 Apr 2002 13:36:17 -0000	1.76
  +++ Zip.java	15 Apr 2002 14:56:29 -0000	1.77
  @@ -110,7 +110,7 @@
       protected String archiveType = "zip";
   
       // For directories:
  -    private final static long EMPTY_CRC = new CRC32 ().getValue ();
  +    private static final long EMPTY_CRC = new CRC32 ().getValue ();
       protected String emptyBehavior = "skip";
       private Vector filesets = new Vector ();
       protected Hashtable addedDirs = new Hashtable();
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
  
  Index: Javac13.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -u -r1.6 -r1.7
  --- Javac13.java	11 Apr 2002 15:20:33 -0000	1.6
  +++ Javac13.java	15 Apr 2002 14:56:30 -0000	1.7
  @@ -79,7 +79,7 @@
       /**
        * Integer returned by the "Modern" jdk1.3 compiler to indicate success.
        */
  -    private final static int MODERN_COMPILER_SUCCESS = 0;
  +    private static final int MODERN_COMPILER_SUCCESS = 0;
   
       public boolean execute() throws BuildException {
           attributes.log("Using modern compiler", Project.MSG_VERBOSE);
  
  
  
  1.15      +5 -5      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.14
  retrieving revision 1.15
  diff -u -w -u -r1.14 -r1.15
  --- Os.java	14 Apr 2002 11:16:15 -0000	1.14
  +++ Os.java	15 Apr 2002 14:56:30 -0000	1.15
  @@ -64,16 +64,16 @@
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
    * @since Ant 1.4
  - * @version $Revision: 1.14 $
  + * @version $Revision: 1.15 $
    */
   public class Os implements Condition {
  -    private final static String osName =
  +    private static final String osName =
           System.getProperty("os.name").toLowerCase(Locale.US);
  -    private final static String osArch =
  +    private static final String osArch =
           System.getProperty("os.arch").toLowerCase(Locale.US);
  -    private final static String osVersion =
  +    private static final String osVersion =
           System.getProperty("os.version").toLowerCase(Locale.US);
  -    private final static String pathSep = System.getProperty("path.separator");
  +    private static final String pathSep = System.getProperty("path.separator");
   
       private String family;
       private String name;
  
  
  
  1.12      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
  
  Index: ChangeLogTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -w -u -r1.11 -r1.12
  --- ChangeLogTask.java	15 Apr 2002 12:20:51 -0000	1.11
  +++ ChangeLogTask.java	15 Apr 2002 14:56:30 -0000	1.12
  @@ -100,7 +100,7 @@
    *
    * @author <a href="mailto:jeff.martin@synamic.co.uk">Jeff Martin</a>
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.11 $ $Date: 2002/04/15 12:20:51 $
  + * @version $Revision: 1.12 $ $Date: 2002/04/15 14:56:30 $
    * @since Ant 1.5
    * @ant.task name="changelog"
    */
  @@ -396,8 +396,7 @@
           for (int i = 0; i < entrySet.length; i++ ) {
   	    
               final CVSEntry entry = entrySet[ i ];
  -            if (userList.containsKey(entry.getAuthor()))
  -            {
  +            if (userList.containsKey(entry.getAuthor())) {
                   entry.setAuthor(userList.getProperty(entry.getAuthor()));
               }
           }
  
  
  
  1.12      +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
  
  Index: EmailTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -w -u -r1.11 -r1.12
  --- EmailTask.java	14 Apr 2002 11:16:15 -0000	1.11
  +++ EmailTask.java	15 Apr 2002 14:56:30 -0000	1.12
  @@ -82,13 +82,13 @@
   public class EmailTask
        extends Task {
       /** Constant to show that the best available mailer should be used.  */
  -    public final static String AUTO = "auto";
  +    public static final String AUTO = "auto";
       /** Constant to allow the Mime mailer to be requested  */
  -    public final static String MIME = "mime";
  +    public static final String MIME = "mime";
       /** Constant to allow the UU mailer to be requested  */
  -    public final static String UU = "uu";
  +    public static final String UU = "uu";
       /** Constant to allow the plaintext mailer to be requested  */
  -    public final static String PLAIN = "plain";
  +    public static final String PLAIN = "plain";
   
   
       /**
  
  
  
  1.9       +3 -3      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.8
  retrieving revision 1.9
  diff -u -w -u -r1.8 -r1.9
  --- IContract.java	14 Apr 2002 11:16:15 -0000	1.8
  +++ IContract.java	15 Apr 2002 14:56:30 -0000	1.9
  @@ -223,14 +223,14 @@
    */
   public class IContract extends MatchingTask {
   
  -    private final static String ICONTROL_PROPERTIES_HEADER =
  +    private static final String ICONTROL_PROPERTIES_HEADER =
           " You might want to set classRoot to point to your normal compilation class root directory.";
   
  -    private final static String ICONTROL_PROPERTIES_MESSAGE =
  +    private static final String ICONTROL_PROPERTIES_MESSAGE =
           "You should probably modify icontrol.properties' classRoot to where comiled (uninstrumented) classes go.";
   
       /** \ on windows, / on linux/unix */
  -    private final static String ps = System.getProperty("path.separator");
  +    private static final String ps = System.getProperty("path.separator");
   
       /** compiler to use for instrumenation */
       private String icCompiler = "javac";
  
  
  
  1.12      +1 -1      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.11
  retrieving revision 1.12
  diff -u -w -u -r1.11 -r1.12
  --- Javah.java	15 Apr 2002 13:36:19 -0000	1.11
  +++ Javah.java	15 Apr 2002 14:56:30 -0000	1.12
  @@ -103,7 +103,7 @@
   
   public class Javah extends Task {
   
  -    private final static String FAIL_MSG = "Compile failed, messages should have been provided.";
  +    private static final String FAIL_MSG = "Compile failed, messages should have been provided.";
   
       private Vector classes = new Vector(2);
       private String cls;
  
  
  
  1.19      +5 -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.18
  retrieving revision 1.19
  diff -u -w -u -r1.18 -r1.19
  --- NetRexxC.java	14 Apr 2002 11:16:15 -0000	1.18
  +++ NetRexxC.java	15 Apr 2002 14:56:30 -0000	1.19
  @@ -164,11 +164,11 @@
       private boolean suppressDeprecation = false;
   
       // constants for the messages to suppress by flags and their corresponding properties
  -    final static String MSG_METHOD_ARGUMENT_NOT_USED = "Warning: Method argument is not used";
  -    final static String MSG_PRIVATE_PROPERTY_NOT_USED = "Warning: Private property is defined but not used";
  -    final static String MSG_VARIABLE_NOT_USED = "Warning: Variable is set but not used";
  -    final static String MSG_EXCEPTION_NOT_SIGNALLED = "is in SIGNALS list but is not signalled within the method";
  -    final static String MSG_DEPRECATION = "has been deprecated";
  +    static final String MSG_METHOD_ARGUMENT_NOT_USED = "Warning: Method argument is not used";
  +    static final String MSG_PRIVATE_PROPERTY_NOT_USED = "Warning: Private property is defined but not used";
  +    static final String MSG_VARIABLE_NOT_USED = "Warning: Variable is set but not used";
  +    static final String MSG_EXCEPTION_NOT_SIGNALLED = "is in SIGNALS list but is not signalled within the method";
  +    static final String MSG_DEPRECATION = "has been deprecated";
   
       // other implementation variables
       private Vector compileList = new Vector();
  
  
  
  1.21      +19 -19    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.20
  retrieving revision 1.21
  diff -u -w -u -r1.20 -r1.21
  --- PropertyFile.java	15 Apr 2002 13:36:19 -0000	1.20
  +++ PropertyFile.java	15 Apr 2002 14:56:30 -0000	1.21
  @@ -153,7 +153,7 @@
       * Static variables.
       */
   
  -    private final static String NEWLINE = System.getProperty("line.separator");
  +    private static final String NEWLINE = System.getProperty("line.separator");
   
   
       /* ========================================================================
  @@ -296,9 +296,9 @@
        * a task propertyfile.
        */
       public static class Entry {
  -        private final static int DEFAULT_INT_VALUE = 0;
  -        private final static String DEFAULT_DATE_VALUE = "now";
  -        private final static String DEFAULT_STRING_VALUE = "";
  +        private static final int DEFAULT_INT_VALUE = 0;
  +        private static final String DEFAULT_DATE_VALUE = "now";
  +        private static final String DEFAULT_STRING_VALUE = "";
   
           private String              key = null;
           private int                 type = Type.STRING_TYPE;
  @@ -551,9 +551,9 @@
           public static class Operation extends EnumeratedAttribute {
   
               // Property type operations
  -            public final static int INCREMENT_OPER =   0;
  -            public final static int DECREMENT_OPER =   1;
  -            public final static int EQUALS_OPER =      2;
  +            public static final int INCREMENT_OPER =   0;
  +            public static final int DECREMENT_OPER =   1;
  +            public static final int EQUALS_OPER =      2;
   
               public String[] getValues() {
                   return new String[] {"+", "-", "="};
  @@ -575,9 +575,9 @@
           public static class Type extends EnumeratedAttribute {
   
               // Property types
  -            public final static int INTEGER_TYPE =     0;
  -            public final static int DATE_TYPE =        1;
  -            public final static int STRING_TYPE =      2;
  +            public static final int INTEGER_TYPE =     0;
  +            public static final int DATE_TYPE =        1;
  +            public static final int STRING_TYPE =      2;
   
               public String[] getValues() {
                   return new String[] {"int", "date", "string"};
  @@ -601,16 +601,16 @@
        */
       public static class Unit extends EnumeratedAttribute {
   
  -        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 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[] units = {
  +        private static final String[] units = {
                                                   MILLISECOND,
                                                   SECOND,
                                                   MINUTE,
  
  
  
  1.8       +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.7
  retrieving revision 1.8
  diff -u -w -u -r1.7 -r1.8
  --- Test.java	15 Apr 2002 06:01:37 -0000	1.7
  +++ Test.java	15 Apr 2002 14:56:30 -0000	1.8
  @@ -65,7 +65,7 @@
       protected Vector m_tests = new Vector();
   
   
  -    protected final static class TestletEntry {
  +    protected static final class TestletEntry {
   
           protected String m_testname = "";
   
  
  
  
  1.4       +2 -2      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.3
  retrieving revision 1.4
  diff -u -w -u -r1.3 -r1.4
  --- CCMCheck.java	8 Jan 2002 23:12:44 -0000	1.3
  +++ CCMCheck.java	15 Apr 2002 14:56:31 -0000	1.4
  @@ -174,11 +174,11 @@
       /**
        * -comment flag -- comment to attach to the file
        */
  -    public final static String FLAG_COMMENT = "/comment";
  +    public static final String FLAG_COMMENT = "/comment";
   
       /**
        *  -task flag -- associate checckout task with task
        */
  -    public final static String FLAG_TASK = "/task";
  +    public static final String FLAG_TASK = "/task";
   }
   
  
  
  
  1.7       +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.6
  retrieving revision 1.7
  diff -u -w -u -r1.6 -r1.7
  --- CCMCheckinDefault.java	4 Mar 2002 08:49:35 -0000	1.6
  +++ CCMCheckinDefault.java	15 Apr 2002 14:56:31 -0000	1.7
  @@ -68,6 +68,6 @@
           setTask(DEFAULT_TASK);
       }
   
  -    public final static String DEFAULT_TASK = "default";
  +    public static final String DEFAULT_TASK = "default";
   }
   
  
  
  
  1.8       +6 -6      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.7
  retrieving revision 1.8
  diff -u -w -u -r1.7 -r1.8
  --- CCMCreateTask.java	15 Apr 2002 13:36:19 -0000	1.7
  +++ CCMCreateTask.java	15 Apr 2002 14:56:31 -0000	1.8
  @@ -264,32 +264,32 @@
       /**
        * /comment -- comments associated to the task
        */
  -    public final static String FLAG_COMMENT = "/synopsis";
  +    public static final String FLAG_COMMENT = "/synopsis";
   
       /**
        *  /platform flag -- target platform
        */
  -    public final static String FLAG_PLATFORM = "/plat";
  +    public static final String FLAG_PLATFORM = "/plat";
   
       /**
        * /resolver flag
        */
  -    public final static String FLAG_RESOLVER = "/resolver";
  +    public static final String FLAG_RESOLVER = "/resolver";
   
       /**
        * /release flag
        */
  -    public final static String FLAG_RELEASE = "/release";
  +    public static final String FLAG_RELEASE = "/release";
   
       /**
        * /release flag
        */
  -    public final static String FLAG_SUBSYSTEM = "/subsystem";
  +    public static final String FLAG_SUBSYSTEM = "/subsystem";
   
       /**
        *  -task flag -- associate checckout task with task
        */
  -    public final static String FLAG_TASK = "/task";
  +    public static final String FLAG_TASK = "/task";
   
   
       // implementation of org.apache.tools.ant.taskdefs.ExecuteStreamHandler interface
  
  
  
  1.4       +3 -3      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.3
  retrieving revision 1.4
  diff -u -w -u -r1.3 -r1.4
  --- CCMReconfigure.java	8 Jan 2002 23:12:44 -0000	1.3
  +++ CCMReconfigure.java	15 Apr 2002 14:56:31 -0000	1.4
  @@ -177,18 +177,18 @@
       /**
        * /recurse --
        */
  -    public final static String FLAG_RECURSE = "/recurse";
  +    public static final String FLAG_RECURSE = "/recurse";
   
       /**
        * /recurse --
        */
  -    public final static String FLAG_VERBOSE = "/verbose";
  +    public static final String FLAG_VERBOSE = "/verbose";
   
   
       /**
        *  /project flag -- target project
        */
  -    public final static String FLAG_PROJECT = "/project";
  +    public static final String FLAG_PROJECT = "/project";
   
   }
   
  
  
  
  1.6       +6 -6      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.5
  retrieving revision 1.6
  diff -u -w -u -r1.5 -r1.6
  --- Continuus.java	25 Feb 2002 17:38:15 -0000	1.5
  +++ Continuus.java	15 Apr 2002 14:56:31 -0000	1.6
  @@ -139,29 +139,29 @@
       /**
        * Constant for the thing to execute
        */
  -    private final static String CCM_EXE = "ccm";
  +    private static final String CCM_EXE = "ccm";
   
       /**
        * The 'CreateTask' command
        */
  -    public final static String COMMAND_CREATE_TASK = "create_task";
  +    public static final String COMMAND_CREATE_TASK = "create_task";
       /**
        * The 'Checkout' command
        */
  -    public final static String COMMAND_CHECKOUT = "co";
  +    public static final String COMMAND_CHECKOUT = "co";
       /**
        * The 'Checkin' command
        */
  -    public final static String COMMAND_CHECKIN = "ci";
  +    public static final String COMMAND_CHECKIN = "ci";
       /**
        * The 'Reconfigure' command
        */
  -    public final static String COMMAND_RECONFIGURE = "reconfigure";
  +    public static final String COMMAND_RECONFIGURE = "reconfigure";
   
       /**
        * The 'Reconfigure' command
        */
  -    public final static String COMMAND_DEFAULT_TASK = "default_task";
  +    public static final String COMMAND_DEFAULT_TASK = "default_task";
   
   
   }
  
  
  
  1.5       +7 -7      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.4
  retrieving revision 1.5
  diff -u -w -u -r1.4 -r1.5
  --- CCCheckin.java	15 Apr 2002 06:01:37 -0000	1.4
  +++ CCCheckin.java	15 Apr 2002 14:56:31 -0000	1.5
  @@ -342,31 +342,31 @@
           /**
        * -c flag -- comment to attach to the file
        */
  -    public final static String FLAG_COMMENT = "-c";
  +    public static final String FLAG_COMMENT = "-c";
           /**
        * -cfile flag -- file containing a comment to attach to the file
        */
  -    public final static String FLAG_COMMENTFILE = "-cfile";
  +    public static final String FLAG_COMMENTFILE = "-cfile";
           /**
        * -nc flag -- no comment is specified
        */
  -    public final static String FLAG_NOCOMMENT = "-nc";
  +    public static final String FLAG_NOCOMMENT = "-nc";
           /**
        * -nwarn flag -- suppresses warning messages
        */
  -    public final static String FLAG_NOWARN = "-nwarn";
  +    public static final String FLAG_NOWARN = "-nwarn";
           /**
        * -ptime flag -- preserves the modification time
        */
  -    public final static String FLAG_PRESERVETIME = "-ptime";
  +    public static final String FLAG_PRESERVETIME = "-ptime";
           /**
        * -keep flag -- keeps a copy of the file with a .keep extension
        */
  -    public final static String FLAG_KEEPCOPY = "-keep";
  +    public static final String FLAG_KEEPCOPY = "-keep";
           /**
        * -identical flag -- allows the file to be checked in even if it is identical to the original
        */
  -    public final static String FLAG_IDENTICAL = "-identical";
  +    public static final String FLAG_IDENTICAL = "-identical";
   
   }
   
  
  
  
  1.5       +10 -10    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.4
  retrieving revision 1.5
  diff -u -w -u -r1.4 -r1.5
  --- CCCheckout.java	15 Apr 2002 06:01:37 -0000	1.4
  +++ CCCheckout.java	15 Apr 2002 14:56:31 -0000	1.5
  @@ -442,43 +442,43 @@
           /**
        *  -reserved flag -- check out the file as reserved
        */
  -    public final static String FLAG_RESERVED = "-reserved";
  +    public static final String FLAG_RESERVED = "-reserved";
           /**
        *  -reserved flag -- check out the file as unreserved
        */
  -    public final static String FLAG_UNRESERVED = "-unreserved";
  +    public static final String FLAG_UNRESERVED = "-unreserved";
           /**
        * -out flag -- create a writable file under a different filename
        */
  -    public final static String FLAG_OUT = "-out";
  +    public static final String FLAG_OUT = "-out";
           /**
        * -ndata flag -- checks out the file but does not create an editable file containing its data
        */
  -    public final static String FLAG_NODATA = "-ndata";
  +    public static final String FLAG_NODATA = "-ndata";
           /**
        * -branch flag -- checks out the file on a specified branch
        */
  -    public final static String FLAG_BRANCH = "-branch";
  +    public static final String FLAG_BRANCH = "-branch";
           /**
        * -version flag -- allows checkout of a version that is not main latest
        */
  -    public final static String FLAG_VERSION = "-version";
  +    public static final String FLAG_VERSION = "-version";
           /**
        * -nwarn flag -- suppresses warning messages
        */
  -    public final static String FLAG_NOWARN = "-nwarn";
  +    public static final String FLAG_NOWARN = "-nwarn";
           /**
        * -c flag -- comment to attach to the file
        */
  -    public final static String FLAG_COMMENT = "-c";
  +    public static final String FLAG_COMMENT = "-c";
           /**
        * -cfile flag -- file containing a comment to attach to the file
        */
  -    public final static String FLAG_COMMENTFILE = "-cfile";
  +    public static final String FLAG_COMMENTFILE = "-cfile";
           /**
        * -nc flag -- no comment is specified
        */
  -    public final static String FLAG_NOCOMMENT = "-nc";
  +    public static final String FLAG_NOCOMMENT = "-nc";
   
   }
   
  
  
  
  1.5       +2 -2      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.4
  retrieving revision 1.5
  diff -u -w -u -r1.4 -r1.5
  --- CCUnCheckout.java	15 Apr 2002 06:01:37 -0000	1.4
  +++ CCUnCheckout.java	15 Apr 2002 14:56:31 -0000	1.5
  @@ -159,11 +159,11 @@
           /**
        *  -keep flag -- keep a copy of the file with .keep extension
        */
  -    public final static String FLAG_KEEPCOPY = "-keep";
  +    public static final String FLAG_KEEPCOPY = "-keep";
           /**
        *  -rm flag -- remove the copy of the file
        */
  -    public final static String FLAG_RM = "-rm";
  +    public static final String FLAG_RM = "-rm";
   
   }
   
  
  
  
  1.5       +7 -7      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.4
  retrieving revision 1.5
  diff -u -w -u -r1.4 -r1.5
  --- CCUpdate.java	15 Apr 2002 06:01:37 -0000	1.4
  +++ CCUpdate.java	15 Apr 2002 14:56:31 -0000	1.5
  @@ -326,31 +326,31 @@
           /**
        *  -graphical flag -- display graphical dialog during update operation
        */
  -    public final static String FLAG_GRAPHICAL = "-graphical";
  +    public static final String FLAG_GRAPHICAL = "-graphical";
           /**
        * -log flag -- file to log status to
        */
  -    public final static String FLAG_LOG = "-log";
  +    public static final String FLAG_LOG = "-log";
           /**
        * -overwrite flag -- overwrite hijacked files
        */
  -    public final static String FLAG_OVERWRITE = "-overwrite";
  +    public static final String FLAG_OVERWRITE = "-overwrite";
           /**
        * -noverwrite flag -- do not overwrite hijacked files
        */
  -    public final static String FLAG_NOVERWRITE = "-noverwrite";
  +    public static final String FLAG_NOVERWRITE = "-noverwrite";
           /**
        * -rename flag -- rename hijacked files with .keep extension
        */
  -    public final static String FLAG_RENAME = "-rename";
  +    public static final String FLAG_RENAME = "-rename";
           /**
        * -ctime flag -- modified time is written as the current time
        */
  -    public final static String FLAG_CURRENTTIME = "-ctime";
  +    public static final String FLAG_CURRENTTIME = "-ctime";
           /**
        * -ptime flag -- modified time is written as the VOB time
        */
  -    public final static String FLAG_PRESERVETIME = "-ptime";
  +    public static final String FLAG_PRESERVETIME = "-ptime";
   
   }
   
  
  
  
  1.6       +5 -5      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.5
  retrieving revision 1.6
  diff -u -w -u -r1.5 -r1.6
  --- ClearCase.java	15 Apr 2002 13:36:19 -0000	1.5
  +++ ClearCase.java	15 Apr 2002 14:56:31 -0000	1.6
  @@ -141,24 +141,24 @@
       /**
        * Constant for the thing to execute
        */
  -    private final static String CLEARTOOL_EXE = "cleartool";
  +    private static final String CLEARTOOL_EXE = "cleartool";
   
       /**
        * The 'Update' command
        */
  -    public final static String COMMAND_UPDATE = "update";
  +    public static final String COMMAND_UPDATE = "update";
       /**
        * The 'Checkout' command
        */
  -    public final static String COMMAND_CHECKOUT = "checkout";
  +    public static final String COMMAND_CHECKOUT = "checkout";
       /**
        * The 'Checkin' command
        */
  -    public final static String COMMAND_CHECKIN = "checkin";
  +    public static final String COMMAND_CHECKIN = "checkin";
       /**
        * The 'UndoCheckout' command
        */
  -    public final static String COMMAND_UNCHECKOUT = "uncheckout";
  +    public static final String COMMAND_UNCHECKOUT = "uncheckout";
   
   }
   
  
  
  
  1.9       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java
  
  Index: ClassFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -w -u -r1.8 -r1.9
  --- ClassFile.java	14 Apr 2002 11:16:16 -0000	1.8
  +++ ClassFile.java	15 Apr 2002 14:56:31 -0000	1.9
  @@ -73,7 +73,7 @@
   public class ClassFile {
   
       /** The Magic Value that marks the start of a Java class file  */
  -    private final static int CLASS_MAGIC = 0xCAFEBABE;
  +    private static final int CLASS_MAGIC = 0xCAFEBABE;
   
       /** This class' constant pool.  */
       private ConstantPool constantPool;
  
  
  
  1.7       +11 -11    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.6
  retrieving revision 1.7
  diff -u -w -u -r1.6 -r1.7
  --- ConstantPoolEntry.java	3 Feb 2002 21:53:05 -0000	1.6
  +++ ConstantPoolEntry.java	15 Apr 2002 14:56:31 -0000	1.7
  @@ -67,37 +67,37 @@
   public abstract class ConstantPoolEntry {
   
       /** Tag value for UTF8 entries. */
  -    public final static int CONSTANT_UTF8 = 1;
  +    public static final int CONSTANT_UTF8 = 1;
   
       /** Tag value for Integer entries. */
  -    public final static int CONSTANT_INTEGER = 3;
  +    public static final int CONSTANT_INTEGER = 3;
   
       /** Tag value for Float entries. */
  -    public final static int CONSTANT_FLOAT = 4;
  +    public static final int CONSTANT_FLOAT = 4;
   
       /** Tag value for Long entries. */
  -    public final static int CONSTANT_LONG = 5;
  +    public static final int CONSTANT_LONG = 5;
   
       /** Tag value for Double entries. */
  -    public final static int CONSTANT_DOUBLE = 6;
  +    public static final int CONSTANT_DOUBLE = 6;
   
       /** Tag value for Class entries. */
  -    public final static int CONSTANT_CLASS = 7;
  +    public static final int CONSTANT_CLASS = 7;
   
       /** Tag value for String entries. */
  -    public final static int CONSTANT_STRING = 8;
  +    public static final int CONSTANT_STRING = 8;
   
       /** Tag value for Field Reference entries. */
  -    public final static int CONSTANT_FIELDREF = 9;
  +    public static final int CONSTANT_FIELDREF = 9;
   
       /** Tag value for Method Reference entries. */
  -    public final static int CONSTANT_METHODREF = 10;
  +    public static final int CONSTANT_METHODREF = 10;
   
       /** Tag value for Interface Method Reference entries. */
  -    public final static int CONSTANT_INTERFACEMETHODREF = 11;
  +    public static final int CONSTANT_INTERFACEMETHODREF = 11;
   
       /** Tag value for Name and Type entries. */
  -    public final static int CONSTANT_NAMEANDTYPE = 12;
  +    public static final int CONSTANT_NAMEANDTYPE = 12;
   
       /**
        * This entry's tag which identifies the type of this constant pool
  
  
  
  1.23      +4 -4      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.22
  retrieving revision 1.23
  diff -u -w -u -r1.22 -r1.23
  --- CSharp.java	14 Apr 2002 11:16:17 -0000	1.22
  +++ CSharp.java	15 Apr 2002 14:56:31 -0000	1.23
  @@ -164,17 +164,17 @@
        *  Name of the executable. The .exe suffix is deliberately not included in
        *  anticipation of the unix version
        */
  -    private final static String csc_exe_name = "csc";
  +    private static final String csc_exe_name = "csc";
   
       /**
        *  what is the file extension we search on?
        */
  -    private final static String csc_file_ext = "cs";
  +    private static final String csc_file_ext = "cs";
   
       /**
        *  derive the search pattern from the extension
        */
  -    private final static String csc_file_pattern = "**/*." + csc_file_ext;
  +    private static final String csc_file_pattern = "**/*." + csc_file_ext;
   
       /**
        *  list of reference classes. (pretty much a classpath equivalent)
  @@ -257,7 +257,7 @@
        *  need to reference mscorlib.dll, cos it is always there
        */
   
  -    protected final static String DEFAULT_REFERENCE_LIST =
  +    protected static final String DEFAULT_REFERENCE_LIST =
               "Accessibility.dll;" +
               "cscompmgd.dll;" +
               "CustomMarshalers.dll;" +
  
  
  
  1.18      +4 -4      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.17
  retrieving revision 1.18
  diff -u -w -u -r1.17 -r1.18
  --- Ilasm.java	12 Apr 2002 13:26:51 -0000	1.17
  +++ Ilasm.java	15 Apr 2002 14:56:31 -0000	1.18
  @@ -108,22 +108,22 @@
        *  Name of the executable. The .exe suffix is deliberately not included in
        *  anticipation of the unix version
        */
  -    protected final static String exe_name = "ilasm";
  +    protected static final String exe_name = "ilasm";
   
       /**
        *  what is the file extension we search on?
        */
  -    protected final static String file_ext = "il";
  +    protected static final String file_ext = "il";
   
       /**
        *  and now derive the search pattern from the extension
        */
  -    protected final static String file_pattern = "**/*." + file_ext;
  +    protected static final String file_pattern = "**/*." + file_ext;
   
       /**
        *  title of task for external presentation
        */
  -    protected final static String exe_title = "ilasm";
  +    protected static final String exe_title = "ilasm";
   
       /**
        *  source directory upon which the search pattern is applied
  
  
  
  1.15      +6 -6      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.14
  retrieving revision 1.15
  diff -u -w -u -r1.14 -r1.15
  --- BorlandDeploymentTool.java	15 Apr 2002 13:36:19 -0000	1.14
  +++ BorlandDeploymentTool.java	15 Apr 2002 14:56:31 -0000	1.15
  @@ -109,22 +109,22 @@
    */
   public class BorlandDeploymentTool extends GenericDeploymentTool  implements ExecuteStreamHandler 
   {
  -    public final static String PUBLICID_BORLAND_EJB
  +    public static final String PUBLICID_BORLAND_EJB
       = "-//Inprise Corporation//DTD Enterprise JavaBeans 1.1//EN";
   
  -    protected final static String DEFAULT_BAS45_EJB11_DTD_LOCATION 
  +    protected static final String DEFAULT_BAS45_EJB11_DTD_LOCATION 
       = "/com/inprise/j2ee/xml/dtds/ejb-jar.dtd";
       
  -    protected final static String DEFAULT_BAS_DTD_LOCATION 
  +    protected static final String DEFAULT_BAS_DTD_LOCATION 
       = "/com/inprise/j2ee/xml/dtds/ejb-inprise.dtd";       
       
  -    protected final static String BAS_DD = "ejb-inprise.xml";    
  +    protected static final String BAS_DD = "ejb-inprise.xml";    
   
       /** Java2iiop executable **/
  -    protected final static String JAVA2IIOP = "java2iiop";
  +    protected static final String JAVA2IIOP = "java2iiop";
   
       /** Verify class */
  -    protected final static String VERIFY = "com.inprise.ejb.util.Verify";
  +    protected static final String VERIFY = "com.inprise.ejb.util.Verify";
   
       /** Instance variable that stores the suffix for the borland jarfile. */
       private String jarSuffix = "-ejb.jar";
  
  
  
  1.9       +2 -2      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.8
  retrieving revision 1.9
  diff -u -w -u -r1.8 -r1.9
  --- BorlandGenerateClient.java	15 Apr 2002 13:36:19 -0000	1.8
  +++ BorlandGenerateClient.java	15 Apr 2002 14:56:31 -0000	1.9
  @@ -81,8 +81,8 @@
    * @ant.task name="blgenclient" category="ejb"
    */
   public class BorlandGenerateClient extends Task {
  -    final static String JAVA_MODE = "java";
  -    final static String FORK_MODE = "fork";
  +    static final String JAVA_MODE = "java";
  +    static final String FORK_MODE = "fork";
   
       /** debug the generateclient task */
       boolean debug = false;
  
  
  
  1.23      +19 -19    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.22
  retrieving revision 1.23
  diff -u -w -u -r1.22 -r1.23
  --- DescriptorHandler.java	15 Apr 2002 13:36:19 -0000	1.22
  +++ DescriptorHandler.java	15 Apr 2002 14:56:31 -0000	1.23
  @@ -78,12 +78,12 @@
    * list can then be accessed through the getFiles() method.
    */
   public class DescriptorHandler extends org.xml.sax.HandlerBase {
  -    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 static final int STATE_LOOKING_EJBJAR = 1;
  +    private static final int STATE_IN_EJBJAR = 2;
  +    private static final int STATE_IN_BEANS = 3;
  +    private static final int STATE_IN_SESSION = 4;
  +    private static final int STATE_IN_ENTITY = 5;
  +    private static final int STATE_IN_MESSAGE = 6;
   
       private Task owningTask;
   
  @@ -93,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 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";
  +    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";
   
       /**
        * The state of the parsing
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -w -u -r1.5 -r1.6
  --- IPlanetDeploymentTool.java	10 Jan 2002 13:59:35 -0000	1.5
  +++ IPlanetDeploymentTool.java	15 Apr 2002 14:56:31 -0000	1.6
  @@ -150,7 +150,7 @@
        * written in the completed JAR file as "ias-ejb-jar.xml".  This is the
        * naming convention implemented by iAS.
        */
  -    private final static String IAS_DD = "ias-ejb-jar.xml";    
  +    private static final String IAS_DD = "ias-ejb-jar.xml";    
   
       /**
        * Setter method used to store the "home" directory of the user's iAS
  
  
  
  1.9       +3 -3      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.8
  retrieving revision 1.9
  diff -u -w -u -r1.8 -r1.9
  --- IPlanetEjbc.java	15 Apr 2002 13:36:19 -0000	1.8
  +++ IPlanetEjbc.java	15 Apr 2002 14:56:31 -0000	1.9
  @@ -106,9 +106,9 @@
   public class IPlanetEjbc {
   
       /* Constants used for the "beantype" attribute */
  -    private final static String ENTITY_BEAN       = "entity";
  -    private final static String STATELESS_SESSION = "stateless";
  -    private final static String STATEFUL_SESSION  = "stateful";
  +    private static final String ENTITY_BEAN       = "entity";
  +    private static final String STATELESS_SESSION = "stateless";
  +    private static final String STATEFUL_SESSION  = "stateful";
   
       /* Filenames of the standard EJB descriptor and the iAS-specific descriptor */
       private File        stdDescriptor;
  
  
  
  1.6       +2 -2      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.5
  retrieving revision 1.6
  diff -u -w -u -r1.5 -r1.6
  --- JbossDeploymentTool.java	10 Jan 2002 13:59:35 -0000	1.5
  +++ JbossDeploymentTool.java	15 Apr 2002 14:56:31 -0000	1.6
  @@ -67,8 +67,8 @@
    * @see EjbJar#createJboss
    */
   public class JbossDeploymentTool extends GenericDeploymentTool {
  -    protected final static String JBOSS_DD = "jboss.xml";
  -    protected final static String JBOSS_CMPD = "jaws.xml";
  +    protected static final String JBOSS_DD = "jboss.xml";
  +    protected static final String JBOSS_CMPD = "jaws.xml";
   
       /** Instance variable that stores the suffix for the jboss jarfile. */
       private String jarSuffix = ".jar";
  
  
  
  1.19      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
  
  Index: WLRun.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -w -u -r1.18 -r1.19
  --- WLRun.java	14 Apr 2002 11:16:18 -0000	1.18
  +++ WLRun.java	15 Apr 2002 14:56:31 -0000	1.19
  @@ -69,9 +69,9 @@
    * @author Conor MacNeill, Cortex ebusiness Pty Limited
    */
   public class WLRun extends Task {
  -    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";
  +    protected static final String DEFAULT_WL51_POLICY_FILE = "weblogic.policy";
  +    protected static final String DEFAULT_WL60_POLICY_FILE = "lib/weblogic.policy";
  +    protected static final String DEFAULT_PROPERTIES_FILE = "weblogic.properties";
   
       /**
        * The classpath to be used when running the Java VM. It must contain the weblogic
  
  
  
  1.37      +15 -15    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.36
  retrieving revision 1.37
  diff -u -w -u -r1.36 -r1.37
  --- WeblogicDeploymentTool.java	15 Apr 2002 06:01:37 -0000	1.36
  +++ WeblogicDeploymentTool.java	15 Apr 2002 14:56:31 -0000	1.37
  @@ -77,36 +77,36 @@
   import org.apache.tools.ant.util.FileUtils;
   
   public class WeblogicDeploymentTool extends GenericDeploymentTool {
  -    public final static String PUBLICID_EJB11
  +    public static final String PUBLICID_EJB11
            = "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN";
  -    public final static String PUBLICID_EJB20
  +    public static final String PUBLICID_EJB20
            = "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN";
  -    public final static String PUBLICID_WEBLOGIC_EJB510
  +    public static final String PUBLICID_WEBLOGIC_EJB510
            = "-//BEA Systems, Inc.//DTD WebLogic 5.1.0 EJB//EN";
  -    public final static String PUBLICID_WEBLOGIC_EJB600
  +    public static final String PUBLICID_WEBLOGIC_EJB600
            = "-//BEA Systems, Inc.//DTD WebLogic 6.0.0 EJB//EN";
   
  -    protected final static String DEFAULT_WL51_EJB11_DTD_LOCATION
  +    protected static final String DEFAULT_WL51_EJB11_DTD_LOCATION
            = "/weblogic/ejb/deployment/xml/ejb-jar.dtd";
  -    protected final static String DEFAULT_WL60_EJB11_DTD_LOCATION
  +    protected static final String DEFAULT_WL60_EJB11_DTD_LOCATION
            = "/weblogic/ejb20/dd/xml/ejb11-jar.dtd";
  -    protected final static String DEFAULT_WL60_EJB20_DTD_LOCATION
  +    protected static final String DEFAULT_WL60_EJB20_DTD_LOCATION
            = "/weblogic/ejb20/dd/xml/ejb20-jar.dtd";
   
  -    protected final static String DEFAULT_WL51_DTD_LOCATION
  +    protected static final String DEFAULT_WL51_DTD_LOCATION
            = "/weblogic/ejb/deployment/xml/weblogic-ejb-jar.dtd";
  -    protected final static String DEFAULT_WL60_51_DTD_LOCATION
  +    protected static final String DEFAULT_WL60_51_DTD_LOCATION
            = "/weblogic/ejb20/dd/xml/weblogic510-ejb-jar.dtd";
  -    protected final static String DEFAULT_WL60_DTD_LOCATION
  +    protected static final String DEFAULT_WL60_DTD_LOCATION
            = "/weblogic/ejb20/dd/xml/weblogic600-ejb-jar.dtd";
   
  -    protected final static String DEFAULT_COMPILER = "default";
  +    protected static final String DEFAULT_COMPILER = "default";
   
  -    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 WL_DD = "weblogic-ejb-jar.xml";
  +    protected static final String WL_CMP_DD = "weblogic-cmp-rdbms-jar.xml";
   
  -    protected final static String COMPILER_EJB11 = "weblogic.ejbc";
  -    protected final static String COMPILER_EJB20 = "weblogic.ejbc20";
  +    protected static final String COMPILER_EJB11 = "weblogic.ejbc";
  +    protected static final String COMPILER_EJB20 = "weblogic.ejbc20";
   
       /** Instance variable that stores the suffix for the weblogic jarfile. */
       private String jarSuffix = ".jar";
  
  
  
  1.13      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java
  
  Index: WeblogicTOPLinkDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -w -u -r1.12 -r1.13
  --- WeblogicTOPLinkDeploymentTool.java	15 Apr 2002 13:36:19 -0000	1.12
  +++ WeblogicTOPLinkDeploymentTool.java	15 Apr 2002 14:56:31 -0000	1.13
  @@ -62,7 +62,7 @@
   
   public class WeblogicTOPLinkDeploymentTool extends WeblogicDeploymentTool {
   
  -    private final static String TL_DTD_LOC = "http://www.objectpeople.com/tlwl/dtd/toplink-cmp_2_5_1.dtd";
  +    private static final String TL_DTD_LOC = "http://www.objectpeople.com/tlwl/dtd/toplink-cmp_2_5_1.dtd";
   
       private String toplinkDescriptor;
       private String toplinkDTD;
  
  
  
  1.11      +7 -7      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.10
  retrieving revision 1.11
  diff -u -w -u -r1.10 -r1.11
  --- WebsphereDeploymentTool.java	14 Apr 2002 11:16:18 -0000	1.10
  +++ WebsphereDeploymentTool.java	15 Apr 2002 14:56:31 -0000	1.11
  @@ -107,16 +107,16 @@
       }
   
   
  -    public final static String PUBLICID_EJB11
  +    public static final String PUBLICID_EJB11
            = "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN";
  -    public final static String PUBLICID_EJB20
  +    public static final String PUBLICID_EJB20
            = "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN";
  -    protected final static String SCHEMA_DIR = "Schema/";
  +    protected static final String SCHEMA_DIR = "Schema/";
   
  -    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";
  +    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";
   
       /** Instance variable that stores the suffix for the websphere jarfile. */
       private String jarSuffix = ".jar";
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java
  
  Index: VAJAntTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -u -r1.9 -r1.10
  --- VAJAntTool.java	15 Apr 2002 13:36:19 -0000	1.9
  +++ VAJAntTool.java	15 Apr 2002 14:56:32 -0000	1.10
  @@ -71,7 +71,7 @@
    * @author Wolf Siberski
    */
   public class VAJAntTool {
  -    private final static String TOOL_DATA_KEY = "AntTool";
  +    private static final String TOOL_DATA_KEY = "AntTool";
   
   
       /**
  
  
  
  1.14      +1 -1      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.13
  retrieving revision 1.14
  diff -u -w -u -r1.13 -r1.14
  --- VAJAntToolGUI.java	15 Apr 2002 13:36:20 -0000	1.13
  +++ VAJAntToolGUI.java	15 Apr 2002 14:56:32 -0000	1.14
  @@ -115,7 +115,7 @@
        * Members
        */
       private VAJBuildLogger logger = new VAJBuildLogger();
  -    private final static String lineSeparator = "\r\n";
  +    private static final String lineSeparator = "\r\n";
       private PrivateEventHandler iEventHandler = new PrivateEventHandler();
   
       /**
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -w -u -r1.5 -r1.6
  --- VAJExportServlet.java	15 Apr 2002 06:01:37 -0000	1.5
  +++ VAJExportServlet.java	15 Apr 2002 14:56:32 -0000	1.6
  @@ -150,8 +150,8 @@
    */
   public class VAJExportServlet extends VAJToolsServlet {
       // constants for servlet param names
  -    public final static String WITH_DEBUG_INFO = "deb";
  -    public final static String OVERWRITE_PARAM = "owr";
  +    public static final String WITH_DEBUG_INFO = "deb";
  +    public static final String OVERWRITE_PARAM = "owr";
   
       /**
        * Respond to a request to export packages from the Workbench.
  
  
  
  1.4       +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.3
  retrieving revision 1.4
  diff -u -w -u -r1.3 -r1.4
  --- VAJLoadServlet.java	10 Jan 2002 13:59:36 -0000	1.3
  +++ VAJLoadServlet.java	15 Apr 2002 14:56:32 -0000	1.4
  @@ -83,7 +83,7 @@
   public class VAJLoadServlet extends VAJToolsServlet {
   
       // constants for servlet param names
  -    public final static String VERSION_PARAM = "version";
  +    public static final String VERSION_PARAM = "version";
   
       /**
        * Respond to a request to load a project from the Repository
  
  
  
  1.9       +8 -8      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.8
  retrieving revision 1.9
  diff -u -w -u -r1.8 -r1.9
  --- VAJToolsServlet.java	15 Apr 2002 06:01:37 -0000	1.8
  +++ VAJToolsServlet.java	15 Apr 2002 14:56:32 -0000	1.9
  @@ -102,14 +102,14 @@
       }
   
       // constants for servlet param names
  -    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";
  +    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";
   
   
       // current request
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java
  
  Index: VAJWorkspaceScanner.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -u -r1.9 -r1.10
  --- VAJWorkspaceScanner.java	14 Apr 2002 11:16:18 -0000	1.9
  +++ VAJWorkspaceScanner.java	15 Apr 2002 14:56:32 -0000	1.10
  @@ -88,7 +88,7 @@
   class VAJWorkspaceScanner extends DirectoryScanner {
   
       // Patterns that should be excluded by default.
  -    private final static String[] DEFAULTEXCLUDES =
  +    private static final String[] DEFAULTEXCLUDES =
       {
           "IBM*/**",
           "Java class libraries/**",
  
  
  
  1.5       +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
  
  Index: JonasHotDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -u -r1.4 -r1.5
  --- JonasHotDeploymentTool.java	15 Apr 2002 13:36:20 -0000	1.4
  +++ JonasHotDeploymentTool.java	15 Apr 2002 14:56:32 -0000	1.5
  @@ -81,17 +81,17 @@
       /**
        *  Description of the Field
        */
  -    protected final static String DEFAULT_ORB = "RMI";
  +    protected static final String DEFAULT_ORB = "RMI";
   
       /**
        *  The classname of the tool to run *
        */
  -    private final static String JONAS_DEPLOY_CLASS_NAME = "org.objectweb.jonas.adm.JonasAdmin";
  +    private static final String JONAS_DEPLOY_CLASS_NAME = "org.objectweb.jonas.adm.JonasAdmin";
   
       /**
        *  All the valid actions that weblogic.deploy permits *
        */
  -    private final static String[] VALID_ACTIONS =
  +    private static final String[] VALID_ACTIONS =
               {ACTION_DELETE, ACTION_DEPLOY, ACTION_LIST, ACTION_UNDEPLOY, ACTION_UPDATE};
   
       /**
  
  
  
  1.12      +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.11
  retrieving revision 1.12
  diff -u -w -u -r1.11 -r1.12
  --- JJTree.java	15 Apr 2002 13:36:20 -0000	1.11
  +++ JJTree.java	15 Apr 2002 14:56:32 -0000	1.12
  @@ -77,18 +77,18 @@
   public class JJTree extends Task {
   
       // keys to optional attributes
  -    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 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 NODE_PACKAGE      = "NODE_PACKAGE";
  -    private final static String VISITOR_EXCEPTION = "VISITOR_EXCEPTION";
  -    private final static String NODE_PREFIX       = "NODE_PREFIX";
  +    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 Hashtable optionalAttrs = new Hashtable();
   
  
  
  
  1.16      +20 -20    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.15
  retrieving revision 1.16
  diff -u -w -u -r1.15 -r1.16
  --- JavaCC.java	15 Apr 2002 13:36:20 -0000	1.15
  +++ JavaCC.java	15 Apr 2002 14:56:32 -0000	1.16
  @@ -77,27 +77,27 @@
   public class JavaCC extends Task {
   
       // keys to optional attributes
  -    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 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 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 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 Hashtable optionalAttrs = new Hashtable();
   
  
  
  
  1.11      +2 -2      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.10
  retrieving revision 1.11
  diff -u -w -u -r1.10 -r1.11
  --- JDependTask.java	15 Apr 2002 13:36:20 -0000	1.10
  +++ JDependTask.java	15 Apr 2002 14:56:32 -0000	1.11
  @@ -244,11 +244,11 @@
       /**
        * No problems with this test.
        */
  -    private final static int SUCCESS = 0;
  +    private static final int SUCCESS = 0;
       /**
        * An error occured.
        */
  -    private final static int ERRORS = 1;
  +    private static final int ERRORS = 1;
   
       public void execute() throws BuildException {
   
  
  
  
  1.8       +1 -1      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.7
  retrieving revision 1.8
  diff -u -w -u -r1.7 -r1.8
  --- ClassNameReader.java	15 Apr 2002 13:36:20 -0000	1.7
  +++ ClassNameReader.java	15 Apr 2002 14:56:32 -0000	1.8
  @@ -67,7 +67,7 @@
    */
   class ConstantPool {
   
  -    final static 
  +    static final 
           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.16      +1 -1      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.15
  retrieving revision 1.16
  diff -u -w -u -r1.15 -r1.16
  --- JspC.java	15 Apr 2002 13:36:20 -0000	1.15
  +++ JspC.java	15 Apr 2002 14:56:33 -0000	1.16
  @@ -164,7 +164,7 @@
   
   
           
  -    private final static String FAIL_MSG
  +    private static final String FAIL_MSG
           = "Compile failed, messages should have been provided.";
       /* ------------------------------------------------------------ */
       /**
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
  
  Index: JspNameMangler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -u -r1.6 -r1.7
  --- JspNameMangler.java	15 Apr 2002 13:36:20 -0000	1.6
  +++ JspNameMangler.java	15 Apr 2002 14:56:33 -0000	1.7
  @@ -161,7 +161,7 @@
        * @param ch char to mangle
        * @return mangled string; 5 digit hex value 
        */
  -    private final static String mangleChar(char ch) {
  +    private static final String mangleChar(char ch) {
   
           if (ch == File.separatorChar) {
               ch = '/';
  
  
  
  1.16      +2 -2      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.15
  retrieving revision 1.16
  diff -u -w -u -r1.15 -r1.16
  --- AggregateTransformer.java	15 Apr 2002 12:11:48 -0000	1.15
  +++ AggregateTransformer.java	15 Apr 2002 14:56:33 -0000	1.16
  @@ -84,9 +84,9 @@
    */
   public class AggregateTransformer {
   
  -    public final static String FRAMES = "frames";
  +    public static final String FRAMES = "frames";
   
  -    public final static String NOFRAMES = "noframes";
  +    public static final String NOFRAMES = "noframes";
   
       public static class Format extends EnumeratedAttribute {
           public String[] getValues(){
  
  
  
  1.22      +4 -4      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.21
  retrieving revision 1.22
  diff -u -w -u -r1.21 -r1.22
  --- JUnitTestRunner.java	15 Apr 2002 12:11:48 -0000	1.21
  +++ JUnitTestRunner.java	15 Apr 2002 14:56:33 -0000	1.22
  @@ -104,17 +104,17 @@
       /**
        * No problems with this test.
        */
  -    public final static int SUCCESS = 0;
  +    public static final int SUCCESS = 0;
   
       /**
        * Some tests failed.
        */
  -    public final static int FAILURES = 1;
  +    public static final int FAILURES = 1;
   
       /**
        * An error occured.
        */
  -    public final static int ERRORS = 2;
  +    public static final int ERRORS = 2;
   
       /**
        * Holds the registered formatters.
  @@ -131,7 +131,7 @@
        */
       private static boolean filtertrace = true;
       
  -    private final static String[] DEFAULT_TRACE_FILTERS = new String[] {
  +    private static final String[] DEFAULT_TRACE_FILTERS = new String[] {
                   "junit.framework.TestCase",
                   "junit.framework.TestResult",
                   "junit.framework.TestSuite",
  
  
  
  1.17      +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.16
  retrieving revision 1.17
  diff -u -w -u -r1.16 -r1.17
  --- XMLResultAggregator.java	15 Apr 2002 12:11:48 -0000	1.16
  +++ XMLResultAggregator.java	15 Apr 2002 14:56:33 -0000	1.17
  @@ -108,10 +108,10 @@
       protected Vector transformers = new Vector();
   
       /** The default directory: <tt>&#046;</tt>. It is resolved from the project directory */
  -    public final static String DEFAULT_DIR = ".";
  +    public static final String DEFAULT_DIR = ".";
   
       /** the default file name: <tt>TESTS-TestSuites.xml</tt> */
  -    public final static String DEFAULT_FILENAME = "TESTS-TestSuites.xml";
  +    public static final String DEFAULT_FILENAME = "TESTS-TestSuites.xml";
   
   
       public AggregateTransformer createReport(){
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
  
  Index: MAudit.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -u -r1.5 -r1.6
  --- MAudit.java	9 Feb 2002 00:47:43 -0000	1.5
  +++ MAudit.java	15 Apr 2002 14:56:33 -0000	1.6
  @@ -115,7 +115,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).*)
  -    final static String AUDIT_PATTERN = "(?:file:)?(.+):(\\d+)\\s*:\\s+(.*)";
  +    static final String AUDIT_PATTERN = "(?:file:)?(.+):(\\d+)\\s*:\\s+(.*)";
   
       private File outFile = null;
   
  
  
  
  1.2       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java
  
  Index: MAuditParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -u -r1.1 -r1.2
  --- MAuditParser.java	9 Feb 2002 00:48:11 -0000	1.1
  +++ MAuditParser.java	15 Apr 2002 14:56:33 -0000	1.2
  @@ -78,7 +78,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).*)
  -    private final static String AUDIT_PATTERN = "(?:file:)?(.+):(\\d+)\\s*:\\s+(.*)";
  +    private static final String AUDIT_PATTERN = "(?:file:)?(.+):(\\d+)\\s*:\\s+(.*)";
   
       /** matcher that will be used to extract the info from the line */
       private final RegexpMatcher matcher;
  @@ -117,7 +117,7 @@
       }
   
       /** the inner class used to report violation information */
  -    final static class Violation {
  +    static final class Violation {
           String file;
           String line;
           String error;
  
  
  
  1.8       +8 -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.7
  retrieving revision 1.8
  diff -u -w -u -r1.7 -r1.8
  --- MMetricsStreamHandler.java	14 Feb 2002 09:30:30 -0000	1.7
  +++ MMetricsStreamHandler.java	15 Apr 2002 14:56:33 -0000	1.8
  @@ -99,18 +99,18 @@
   public class MMetricsStreamHandler implements ExecuteStreamHandler {
   
       /** CLASS construct, it should be named something like 'MyClass' */
  -    private final static String CLASS = "class";
  +    private static final String CLASS = "class";
   
       /** package construct, it should be look like 'com.mycompany.something' */
  -    private final static String PACKAGE = "package";
  +    private static final String PACKAGE = "package";
   
       /** FILE construct, it should look like something 'MyClass.java' or 'MyClass.class' */
  -    private final static String FILE = "file";
  +    private static final String FILE = "file";
   
       /** METHOD construct, it should looke like something 'doSomething(...)' or 'doSomething()' */
  -    private final static String METHOD = "method";
  +    private static final String METHOD = "method";
   
  -    private final static String[] ATTRIBUTES = {
  +    private static final String[] ATTRIBUTES = {
           "name", "vg", "loc", "dit", "noa", "nrm", "nlm", "wmc",
           "rfc", "dac", "fanout", "cbo", "lcom", "nocl"};
   
  @@ -339,7 +339,7 @@
        * helper class to keep track of elements via its type and indent
        * that's all we need to guess a type.
        */
  -    private final static class ElementEntry {
  +    private static final class ElementEntry {
           private String type;
           private int indent;
   
  @@ -360,9 +360,9 @@
   
   class MetricsElement {
   
  -    private final static NumberFormat METAMATA_NF;
  +    private static final NumberFormat METAMATA_NF;
   
  -    private final static NumberFormat NEUTRAL_NF;
  +    private static final NumberFormat NEUTRAL_NF;
   
       static {
           METAMATA_NF = NumberFormat.getInstance();
  
  
  
  1.21      +9 -9      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
  
  Index: FTP.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -w -u -r1.20 -r1.21
  --- FTP.java	15 Apr 2002 12:11:49 -0000	1.20
  +++ FTP.java	15 Apr 2002 14:56:33 -0000	1.21
  @@ -104,12 +104,12 @@
    */
   public class FTP
        extends Task {
  -    protected final static int SEND_FILES = 0;
  -    protected final static int GET_FILES = 1;
  -    protected final static int DEL_FILES = 2;
  -    protected final static int LIST_FILES = 3;
  -    protected final static int MK_DIR = 4;
  -    protected final static int CHMOD = 5;
  +    protected static final int SEND_FILES = 0;
  +    protected static final int GET_FILES = 1;
  +    protected static final int DEL_FILES = 2;
  +    protected static final int LIST_FILES = 3;
  +    protected static final int MK_DIR = 4;
  +    protected static final int CHMOD = 5;
   
       private String remotedir;
       private String server;
  @@ -133,7 +133,7 @@
       private String umask = null;
       private FileUtils fileUtils = FileUtils.newFileUtils();
   
  -    protected final static String[] ACTION_STRS = {
  +    protected static final String[] ACTION_STRS = {
           "sending",
           "getting",
           "deleting",
  @@ -142,7 +142,7 @@
           "chmod"
           };
   
  -    protected final static String[] COMPLETED_ACTION_STRS = {
  +    protected static final String[] COMPLETED_ACTION_STRS = {
           "sent",
           "retrieved",
           "deleted",
  @@ -991,7 +991,7 @@
   
       public static class Action extends EnumeratedAttribute {
   
  -        private final static String[] validActions = {
  +        private static final String[] validActions = {
               "send", "put", "recv", "get", "del", "delete", "list", "mkdir",
               "chmod"
               };
  
  
  
  1.13      +3 -3      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.12
  retrieving revision 1.13
  diff -u -w -u -r1.12 -r1.13
  --- Pvcs.java	15 Apr 2002 13:36:21 -0000	1.12
  +++ Pvcs.java	15 Apr 2002 14:56:33 -0000	1.13
  @@ -110,17 +110,17 @@
       /**
        * Constant for the thing to execute
        */
  -    private final static String PCLI_EXE = "pcli";
  +    private static final String PCLI_EXE = "pcli";
   
       /**
        * Constant for the PCLI listversionedfiles recursive i a format "get" understands
        */
  -    private final static String PCLI_LVF_ARGS = "lvf -z -aw";
  +    private static final String PCLI_LVF_ARGS = "lvf -z -aw";
   
       /**
        * Constant for the thing to execute
        */
  -    private final static String GET_EXE = "get";
  +    private static final String GET_EXE = "get";
   
   
       protected int runCmd(Commandline cmd, ExecuteStreamHandler out) {
  
  
  
  1.17      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
  
  Index: AntStarTeamCheckOut.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -w -u -r1.16 -r1.17
  --- AntStarTeamCheckOut.java	15 Apr 2002 12:11:49 -0000	1.16
  +++ AntStarTeamCheckOut.java	15 Apr 2002 14:56:33 -0000	1.17
  @@ -122,7 +122,7 @@
        * @see #getIncludes()
        * @see #setIncludes(String includes)
        */
  -    public final static String DEFAULT_INCLUDESETTING = "*";
  +    public static final String DEFAULT_INCLUDESETTING = "*";
   
       /**
        * This disables the exclude filter by default. In other words, no files
  @@ -132,7 +132,7 @@
        * @see #getExcludes()
        * @see #setExcludes(String excludes)
        */
  -    public final static String DEFAULT_EXCLUDESETTING = null;
  +    public static final String DEFAULT_EXCLUDESETTING = null;
   
       /**
        * The default folder to search; the root folder. Since
  @@ -142,7 +142,7 @@
        * @see #getFolderName()
        * @see #setFolderName(String folderName)
        */
  -    public final static String DEFAULT_FOLDERSETTING = null;
  +    public static final String DEFAULT_FOLDERSETTING = null;
   
       /**
        * This is used when formatting the output. The directory name is
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -w -u -r1.5 -r1.6
  --- Filters.java	26 Jan 2002 20:36:50 -0000	1.5
  +++ Filters.java	15 Apr 2002 14:56:33 -0000	1.6
  @@ -64,7 +64,7 @@
   public class Filters {
   
       /** default regexp to exclude everything */
  -    public final static String DEFAULT_EXCLUDE = "*.*():E";
  +    public static final String DEFAULT_EXCLUDE = "*.*():E";
   
       /** say whether we should use the default excludes or not */
       protected boolean defaultExclude = true;
  
  
  
  1.5       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java
  
  Index: Triggers.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -u -r1.4 -r1.5
  --- Triggers.java	10 Jan 2002 13:59:38 -0000	1.4
  +++ Triggers.java	15 Apr 2002 14:56:33 -0000	1.5
  @@ -132,10 +132,10 @@
       }
   
       /** mapping of actions to cryptic command line mnemonics */
  -    private final static Hashtable actionMap = new Hashtable(3);
  +    private static final Hashtable actionMap = new Hashtable(3);
   
       /** mapping of events to cryptic command line mnemonics */
  -    private final static Hashtable eventMap = new Hashtable(3);
  +    private static final Hashtable eventMap = new Hashtable(3);
   
       static {
           actionMap.put("enter", "E");
  
  
  
  1.12      +3 -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.11
  retrieving revision 1.12
  diff -u -w -u -r1.11 -r1.12
  --- ClassPathLoader.java	26 Feb 2002 10:17:31 -0000	1.11
  +++ ClassPathLoader.java	15 Apr 2002 14:56:33 -0000	1.12
  @@ -76,7 +76,7 @@
    */
   public class ClassPathLoader {
   
  -    public final static FileLoader NULL_LOADER = new NullLoader();
  +    public static final FileLoader NULL_LOADER = new NullLoader();
   
       /** the list of files to look for */
       private File[] files;
  @@ -275,8 +275,8 @@
    */
   final class DirectoryLoader implements ClassPathLoader.FileLoader {
       private File directory;
  -    private final static FilenameFilter DIRECTORY_FILTER = new DirectoryFilter();
  -    private final static FilenameFilter CLASS_FILTER = new ClassFilter();
  +    private static final FilenameFilter DIRECTORY_FILTER = new DirectoryFilter();
  +    private static final FilenameFilter CLASS_FILTER = new ClassFilter();
   
       DirectoryLoader(File dir) {
           directory = dir;
  
  
  
  1.5       +13 -13    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.4
  retrieving revision 1.5
  diff -u -w -u -r1.4 -r1.5
  --- Utils.java	8 Jan 2002 23:57:47 -0000	1.4
  +++ Utils.java	15 Apr 2002 14:56:33 -0000	1.5
  @@ -66,31 +66,31 @@
    */
   public class Utils {
       /** public access flag */
  -    public final static short ACC_PUBLIC = 1;
  +    public static final short ACC_PUBLIC = 1;
       /** private access flag */
  -    public final static short ACC_PRIVATE = 2;
  +    public static final short ACC_PRIVATE = 2;
       /** protected access flag */
  -    public final static short ACC_PROTECTED = 4;
  +    public static final short ACC_PROTECTED = 4;
       /** static access flag */
  -    public final static short ACC_STATIC = 8;
  +    public static final short ACC_STATIC = 8;
       /** final access flag */
  -    public final static short ACC_FINAL = 16;
  +    public static final short ACC_FINAL = 16;
       /** super access flag */
  -    public final static short ACC_SUPER = 32;
  +    public static final short ACC_SUPER = 32;
       /** synchronized access flag */
  -    public final static short ACC_SYNCHRONIZED = 32;
  +    public static final short ACC_SYNCHRONIZED = 32;
       /** volatile access flag */
  -    public final static short ACC_VOLATILE = 64;
  +    public static final short ACC_VOLATILE = 64;
       /** transient access flag */
  -    public final static short ACC_TRANSIENT = 128;
  +    public static final short ACC_TRANSIENT = 128;
       /** native access flag */
  -    public final static short ACC_NATIVE = 256;
  +    public static final short ACC_NATIVE = 256;
       /** interface access flag */
  -    public final static short ACC_INTERFACE = 512;
  +    public static final short ACC_INTERFACE = 512;
       /** abstract access flag */
  -    public final static short ACC_ABSTRACT = 1024;
  +    public static final short ACC_ABSTRACT = 1024;
       /** strict access flag */
  -    public final static short ACC_STRICT = 2048;
  +    public static final short ACC_STRICT = 2048;
   
       /** private constructor */
       private Utils() {
  
  
  
  1.9       +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.8
  retrieving revision 1.9
  diff -u -w -u -r1.8 -r1.9
  --- StarTeamLabel.java	12 Apr 2002 13:26:53 -0000	1.8
  +++ StarTeamLabel.java	15 Apr 2002 14:56:34 -0000	1.9
  @@ -101,7 +101,7 @@
        */
       private OLEDate lastBuild = null;
   
  -    private final static SimpleDateFormat DATE_FORMAT =
  +    private static final SimpleDateFormat DATE_FORMAT =
               new SimpleDateFormat("yyyyMMddHHmmss");
   
   
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -w -u -r1.5 -r1.6
  --- StarTeamList.java	12 Apr 2002 13:26:53 -0000	1.5
  +++ StarTeamList.java	15 Apr 2002 14:56:34 -0000	1.6
  @@ -193,7 +193,7 @@
           log(b.toString());
       }
   
  -    private final static String blankstr = blanks(30);
  +    private static final String blankstr = blanks(30);
   
       private static String blanks(int len) {
           StringBuffer b = new StringBuffer();
  
  
  
  1.8       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
  
  Index: TreeBasedTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -w -u -r1.7 -r1.8
  --- TreeBasedTask.java	12 Apr 2002 13:26:53 -0000	1.7
  +++ TreeBasedTask.java	15 Apr 2002 14:56:34 -0000	1.8
  @@ -95,7 +95,7 @@
        * @see #getIncludes()
        * @see #setIncludes(String includes)
        */
  -    public final static String DEFAULT_INCLUDESETTING = "*";
  +    public static final String DEFAULT_INCLUDESETTING = "*";
   
       /**
        * This disables the exclude filter by default. In other words, no files
  @@ -105,7 +105,7 @@
        * @see #getExcludes()
        * @see #setExcludes(String excludes)
        */
  -    public final static String DEFAULT_EXCLUDESETTING = null;
  +    public static final String DEFAULT_EXCLUDESETTING = null;
   
       //ATTRIBUTES settable from ant.
   
  
  
  
  1.19      +22 -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.18
  retrieving revision 1.19
  diff -u -w -u -r1.18 -r1.19
  --- MSVSS.java	15 Apr 2002 12:11:49 -0000	1.18
  +++ MSVSS.java	15 Apr 2002 14:56:34 -0000	1.19
  @@ -195,38 +195,38 @@
       /**
        * Constant for the thing to execute
        */
  -    private final static String SS_EXE = "ss";
  +    private static final String SS_EXE = "ss";
       /** */
  -    public final static String PROJECT_PREFIX = "$";
  +    public static final String PROJECT_PREFIX = "$";
   
       /**
        * The 'CP' command
        */
  -    public final static String COMMAND_CP = "CP";
  +    public static final String COMMAND_CP = "CP";
       /**
        * The 'Add' command
        */
  -    public final static String COMMAND_ADD = "Add";
  +    public static final String COMMAND_ADD = "Add";
       /**
        * The 'Get' command
        */
  -    public final static String COMMAND_GET = "Get";
  +    public static final String COMMAND_GET = "Get";
       /**
        * The 'Checkout' command
        */
  -    public final static String COMMAND_CHECKOUT = "Checkout";
  +    public static final String COMMAND_CHECKOUT = "Checkout";
       /**
        * The 'Checkin' command
        */
  -    public final static String COMMAND_CHECKIN = "Checkin";
  +    public static final String COMMAND_CHECKIN = "Checkin";
       /**
        * The 'Label' command
        */
  -    public final static String COMMAND_LABEL = "Label";
  +    public static final String COMMAND_LABEL = "Label";
       /**
        * The 'History' command
        */
  -    public final static String COMMAND_HISTORY = "History";
  +    public static final String COMMAND_HISTORY = "History";
       /** 
        * The 'Create' command 
        */
  @@ -234,30 +234,30 @@
   
   
       /** */
  -    public final static String FLAG_LOGIN = "-Y";
  +    public static final String FLAG_LOGIN = "-Y";
       /** */
  -    public final static String FLAG_OVERRIDE_WORKING_DIR = "-GL";
  +    public static final String FLAG_OVERRIDE_WORKING_DIR = "-GL";
       /** */
  -    public final static String FLAG_AUTORESPONSE_DEF = "-I-";
  +    public static final String FLAG_AUTORESPONSE_DEF = "-I-";
       /** */
  -    public final static String FLAG_AUTORESPONSE_YES = "-I-Y";
  +    public static final String FLAG_AUTORESPONSE_YES = "-I-Y";
       /** */
  -    public final static String FLAG_AUTORESPONSE_NO = "-I-N";
  +    public static final String FLAG_AUTORESPONSE_NO = "-I-N";
       /** */
  -    public final static String FLAG_RECURSION = "-R";
  +    public static final String FLAG_RECURSION = "-R";
       /** */
  -    public final static String FLAG_VERSION = "-V";
  +    public static final String FLAG_VERSION = "-V";
       /** */
  -    public final static String FLAG_VERSION_DATE = "-Vd";
  +    public static final String FLAG_VERSION_DATE = "-Vd";
       /** */
  -    public final static String FLAG_VERSION_LABEL = "-VL";
  +    public static final String FLAG_VERSION_LABEL = "-VL";
       /** */
  -    public final static String FLAG_WRITABLE = "-W";
  +    public static final String FLAG_WRITABLE = "-W";
       /** */
  -    public final static String VALUE_NO = "-N";
  +    public static final String VALUE_NO = "-N";
       /** */
  -    public final static String VALUE_YES = "-Y";
  +    public static final String VALUE_YES = "-Y";
       /** */
  -    public final static String FLAG_QUIET = "-O-";
  +    public static final String FLAG_QUIET = "-O-";
   }
   
  
  
  
  1.9       +4 -4      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.8
  retrieving revision 1.9
  diff -u -w -u -r1.8 -r1.9
  --- MSVSSHISTORY.java	15 Apr 2002 12:11:49 -0000	1.8
  +++ MSVSSHISTORY.java	15 Apr 2002 14:56:34 -0000	1.9
  @@ -88,11 +88,11 @@
       private String m_Style = "";
       private boolean m_Recursive = false;
       
  -    public final static String VALUE_FROMDATE = "~d";
  -    public final static String VALUE_FROMLABEL = "~L";
  +    public static final String VALUE_FROMDATE = "~d";
  +    public static final String VALUE_FROMLABEL = "~L";
   
  -    public final static String FLAG_OUTPUT = "-O";
  -    public final static String FLAG_USER = "-U";
  +    public static final String FLAG_OUTPUT = "-O";
  +    public static final String FLAG_USER = "-U";
   
       /**
        * Executes the task.
  
  
  
  1.11      +1 -1      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.10
  retrieving revision 1.11
  diff -u -w -u -r1.10 -r1.11
  --- MSVSSLABEL.java	15 Apr 2002 13:36:21 -0000	1.10
  +++ MSVSSLABEL.java	15 Apr 2002 14:56:34 -0000	1.11
  @@ -117,7 +117,7 @@
       private String m_Version = null;
       private String m_Comment = "-";
   
  -    public final static String FLAG_LABEL = "-L";
  +    public static final String FLAG_LABEL = "-L";
   
       /**
        * Executes the task.
  
  
  
  1.18      +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.17
  retrieving revision 1.18
  diff -u -w -u -r1.17 -r1.18
  --- DefaultRmicAdapter.java	15 Apr 2002 13:20:25 -0000	1.17
  +++ DefaultRmicAdapter.java	15 Apr 2002 14:56:34 -0000	1.18
  @@ -81,7 +81,7 @@
   
       private Rmic attributes;
       private FileNameMapper mapper;
  -    private final static Random rand = new Random();
  +    private static final Random rand = new Random();
   
       public DefaultRmicAdapter() {
       }
  
  
  
  1.13      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/types/FilterSet.java
  
  Index: FilterSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/FilterSet.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -w -u -r1.12 -r1.13
  --- FilterSet.java	15 Apr 2002 13:36:21 -0000	1.12
  +++ FilterSet.java	15 Apr 2002 14:56:34 -0000	1.13
  @@ -168,10 +168,10 @@
       }
       
       /** The default token start string */
  -    public final static String DEFAULT_TOKEN_START = "@";
  +    public static final String DEFAULT_TOKEN_START = "@";
       
       /** The default token end string */
  -    public final static String DEFAULT_TOKEN_END = "@";
  +    public static final String DEFAULT_TOKEN_END = "@";
       
       private String startOfToken = DEFAULT_TOKEN_START;
       private String endOfToken = DEFAULT_TOKEN_END;
  
  
  
  1.11      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/types/RegularExpression.java
  
  Index: RegularExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/RegularExpression.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -w -u -r1.10 -r1.11
  --- RegularExpression.java	15 Apr 2002 13:36:21 -0000	1.10
  +++ RegularExpression.java	15 Apr 2002 14:56:34 -0000	1.11
  @@ -97,10 +97,10 @@
    * @ant.datatype name="regexp"
    */
   public class RegularExpression extends DataType {
  -    public final static String DATA_TYPE_NAME = "regexp";
  +    public static final String DATA_TYPE_NAME = "regexp";
   
       // The regular expression factory
  -    private final static RegexpFactory factory = new RegexpFactory();
  +    private static final RegexpFactory factory = new RegexpFactory();
   
       private Regexp regexp;
   
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/types/Substitution.java
  
  Index: Substitution.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/Substitution.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -u -r1.9 -r1.10
  --- Substitution.java	15 Apr 2002 13:36:21 -0000	1.9
  +++ Substitution.java	15 Apr 2002 14:56:34 -0000	1.10
  @@ -71,7 +71,7 @@
    * @author Matthew Inger <a href="mailto:mattinger@mindless.com">mattinger@mindless.com</a>
    */
   public class Substitution extends DataType {
  -    public final static String DATA_TYPE_NAME = "substitition";
  +    public static final String DATA_TYPE_NAME = "substitition";
   
       private String expression;
   
  
  
  
  1.5       +10 -10    jakarta-ant/src/main/org/apache/tools/ant/util/DateUtils.java
  
  Index: DateUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/DateUtils.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -u -r1.4 -r1.5
  --- DateUtils.java	15 Apr 2002 12:22:31 -0000	1.4
  +++ DateUtils.java	15 Apr 2002 14:56:34 -0000	1.5
  @@ -71,7 +71,7 @@
    *
    * @since Ant 1.5
    * 
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public final class DateUtils {
   
  @@ -79,38 +79,38 @@
        * ISO8601-like pattern for date-time. It does not support timezone.
        *  <tt>yyyy-MM-ddTHH:mm:ss</tt>
        */
  -    public final static String ISO8601_DATETIME_PATTERN
  +    public static final String ISO8601_DATETIME_PATTERN
               = "yyyy-MM-dd'T'HH:mm:ss";
   
       /**
        * ISO8601-like pattern for date. <tt>yyyy-MM-dd</tt>
        */
  -    public final static String ISO8601_DATE_PATTERN
  +    public static final String ISO8601_DATE_PATTERN
               = "yyyy-MM-dd";
   
       /**
        * ISO8601-like pattern for time.  <tt>HH:mm:ss</tt>
        */
  -    public final static String ISO8601_TIME_PATTERN
  +    public static final String ISO8601_TIME_PATTERN
               = "HH:mm:ss";
   
   
   // code from Magesh moved from DefaultLogger and slightly modified
  -    private final static MessageFormat MINUTE_SECONDS
  +    private static final MessageFormat MINUTE_SECONDS
               = new MessageFormat("{0}{1}");
   
  -    private final static double[] LIMITS = {0, 1, 2};
  +    private static final double[] LIMITS = {0, 1, 2};
   
  -    private final static String[] MINUTES_PART =
  +    private static final String[] MINUTES_PART =
               {"", "1 minute ", "{0,number} minutes "};
   
  -    private final static String[] SECONDS_PART =
  +    private static final String[] SECONDS_PART =
               {"0 seconds", "1 second", "{1,number} seconds"};
   
  -    private final static ChoiceFormat MINUTES_FORMAT =
  +    private static final ChoiceFormat MINUTES_FORMAT =
               new ChoiceFormat(LIMITS, MINUTES_PART);
   
  -    private final static ChoiceFormat SECONDS_FORMAT =
  +    private static final ChoiceFormat SECONDS_FORMAT =
               new ChoiceFormat(LIMITS, SECONDS_PART);
   
       static {
  
  
  
  1.2       +5 -5      jakarta-ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
  
  Index: JavaEnvUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -u -r1.1 -r1.2
  --- JavaEnvUtils.java	28 Mar 2002 12:15:27 -0000	1.1
  +++ JavaEnvUtils.java	15 Apr 2002 14:56:34 -0000	1.2
  @@ -83,15 +83,15 @@
       private static String javaVersion;
   
       /** Version constant for Java 1.0 */
  -    public final static String JAVA_1_0 = "1.0";
  +    public static final String JAVA_1_0 = "1.0";
       /** Version constant for Java 1.1 */
  -    public final static String JAVA_1_1 = "1.1";
  +    public static final String JAVA_1_1 = "1.1";
       /** Version constant for Java 1.2 */
  -    public final static String JAVA_1_2 = "1.2";
  +    public static final String JAVA_1_2 = "1.2";
       /** Version constant for Java 1.3 */
  -    public final static String JAVA_1_3 = "1.3";
  +    public static final String JAVA_1_3 = "1.3";
       /** Version constant for Java 1.4 */
  -    public final static String JAVA_1_4 = "1.4";
  +    public static final String JAVA_1_4 = "1.4";
   
       static {
   
  
  
  
  1.4       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/util/StringUtils.java
  
  Index: StringUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/StringUtils.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -u -r1.3 -r1.4
  --- StringUtils.java	15 Apr 2002 12:11:51 -0000	1.3
  +++ StringUtils.java	15 Apr 2002 14:56:34 -0000	1.4
  @@ -65,7 +65,7 @@
   public final class StringUtils {
   
       /** the line separator for this OS */
  -    public final static String LINE_SEP = System.getProperty("line.separator");
  +    public static final String LINE_SEP = System.getProperty("line.separator");
   
       /**
        * Splits up a string into a list of lines. It is equivalent
  
  
  
  1.10      +7 -7      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.9
  retrieving revision 1.10
  diff -u -w -u -r1.9 -r1.10
  --- CBZip2InputStream.java	15 Apr 2002 12:11:51 -0000	1.9
  +++ CBZip2InputStream.java	15 Apr 2002 14:56:34 -0000	1.10
  @@ -152,13 +152,13 @@
   
       private int currentChar = -1;
   
  -    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 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 int currentState = START_BLOCK_STATE;
   
  
  
  
  1.12      +7 -7      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.11
  retrieving revision 1.12
  diff -u -w -u -r1.11 -r1.12
  --- CBZip2OutputStream.java	15 Apr 2002 13:36:22 -0000	1.11
  +++ CBZip2OutputStream.java	15 Apr 2002 14:56:34 -0000	1.12
  @@ -72,12 +72,12 @@
    * TODO:    Update to BZip2 1.0.1
    */
   public class CBZip2OutputStream extends OutputStream implements BZip2Constants {
  -    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;
  +    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;
   
       /*
         If you are ever unlucky/improbable enough
  @@ -87,7 +87,7 @@
         stack go above 27 elems, so the following
         limit seems very generous.
       */
  -    protected final static int QSORT_STACK_SIZE = 1000;
  +    protected static final int QSORT_STACK_SIZE = 1000;
   
       private static void panic() {
           System.out.println("panic");
  
  
  
  1.11      +1 -1      jakarta-ant/src/main/org/apache/tools/mail/MailMessage.java
  
  Index: MailMessage.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/mail/MailMessage.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -w -u -r1.10 -r1.11
  --- MailMessage.java	15 Apr 2002 13:36:22 -0000	1.10
  +++ MailMessage.java	15 Apr 2002 14:56:34 -0000	1.11
  @@ -132,7 +132,7 @@
   public class MailMessage {
   
       /** default port for SMTP: 25 */
  -    public final static int DEFAULT_PORT = 25;
  +    public static final int DEFAULT_PORT = 25;
   
       /** host name for the mail server */
       private String host;
  
  
  
  1.5       +2 -2      jakarta-ant/src/main/org/apache/tools/tar/TarBuffer.java
  
  Index: TarBuffer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/tar/TarBuffer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -u -r1.4 -r1.5
  --- TarBuffer.java	10 Jan 2002 10:40:48 -0000	1.4
  +++ TarBuffer.java	15 Apr 2002 14:56:34 -0000	1.5
  @@ -79,8 +79,8 @@
    
   public class TarBuffer {
           
  -    public final static int DEFAULT_RCDSIZE = (512);
  -    public final static int DEFAULT_BLKSIZE = (DEFAULT_RCDSIZE * 20);
  +    public static final int DEFAULT_RCDSIZE = (512);
  +    public static final int DEFAULT_BLKSIZE = (DEFAULT_RCDSIZE * 20);
       
       private InputStream     inStream;
       private OutputStream    outStream;
  
  
  
  1.8       +3 -3      jakarta-ant/src/main/org/apache/tools/tar/TarOutputStream.java
  
  Index: TarOutputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/tar/TarOutputStream.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -w -u -r1.7 -r1.8
  --- TarOutputStream.java	15 Apr 2002 13:36:22 -0000	1.7
  +++ TarOutputStream.java	15 Apr 2002 14:56:34 -0000	1.8
  @@ -71,9 +71,9 @@
    * @author Timothy Gerard Endres <a href="mailto:time@ice.com">time@ice.com</a>
    */
   public class TarOutputStream extends FilterOutputStream {
  -    public final static int LONGFILE_ERROR = 0;
  -    public final static int LONGFILE_TRUNCATE = 1;
  -    public final static int LONGFILE_GNU = 2;
  +    public static final int LONGFILE_ERROR = 0;
  +    public static final int LONGFILE_TRUNCATE = 1;
  +    public static final int LONGFILE_GNU = 2;
       
       protected boolean   debug;
       protected int       currSize;
  
  
  
  1.3       +2 -2      jakarta-ant/src/main/org/apache/tools/zip/AsiExtraField.java
  
  Index: AsiExtraField.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/zip/AsiExtraField.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -u -r1.2 -r1.3
  --- AsiExtraField.java	15 Apr 2002 12:11:52 -0000	1.2
  +++ AsiExtraField.java	15 Apr 2002 14:56:34 -0000	1.3
  @@ -82,11 +82,11 @@
    * word order, device numbers are currently not supported.</p>
    *
    * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class AsiExtraField implements ZipExtraField, UnixStat, Cloneable {
   
  -    private final static ZipShort HEADER_ID = new ZipShort(0x756E);
  +    private static final ZipShort HEADER_ID = new ZipShort(0x756E);
   
       /**
        * Standard Unix stat(2) file mode.
  
  
  
  1.7       +10 -10    jakarta-ant/src/main/org/apache/tools/zip/ZipOutputStream.java
  
  Index: ZipOutputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/zip/ZipOutputStream.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -u -r1.6 -r1.7
  --- ZipOutputStream.java	15 Apr 2002 12:11:52 -0000	1.6
  +++ ZipOutputStream.java	15 Apr 2002 14:56:34 -0000	1.7
  @@ -80,7 +80,7 @@
    * will be called.</p>
    *
    * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public class ZipOutputStream extends DeflaterOutputStream {
   
  @@ -167,14 +167,14 @@
        *
        * @since 1.1
        */
  -    private final static byte[] ZERO = {0, 0};
  +    private static final byte[] ZERO = {0, 0};
   
       /**
        * Helper, a 0 as ZipLong.
        *
        * @since 1.1
        */
  -    private final static byte[] LZERO = {0, 0, 0, 0};
  +    private static final byte[] LZERO = {0, 0, 0, 0};
   
       /**
        * Holds the offsets of the LFH starts for each entry
  @@ -199,14 +199,14 @@
        *
        * @since 1.1
        */
  -    public final static int DEFLATED = ZipEntry.DEFLATED;
  +    public static final int DEFLATED = ZipEntry.DEFLATED;
   
       /**
        * Compression method for deflated entries.
        *
        * @since 1.1
        */
  -    public final static int STORED = ZipEntry.STORED;
  +    public static final int STORED = ZipEntry.STORED;
   
       /**
        * Creates a new ZIP OutputStream filtering the underlying stream.
  @@ -404,25 +404,25 @@
        *
        * @since 1.1
        */
  -    protected final static ZipLong LFH_SIG = new ZipLong(0X04034B50L);
  +    protected static final ZipLong LFH_SIG = new ZipLong(0X04034B50L);
       /**
        * data descriptor signature
        *
        * @since 1.1
        */
  -    protected final static ZipLong DD_SIG = new ZipLong(0X08074B50L);
  +    protected static final ZipLong DD_SIG = new ZipLong(0X08074B50L);
       /**
        * central file header signature
        *
        * @since 1.1
        */
  -    protected final static ZipLong CFH_SIG = new ZipLong(0X02014B50L);
  +    protected static final ZipLong CFH_SIG = new ZipLong(0X02014B50L);
       /**
        * end of central dir signature
        *
        * @since 1.1
        */
  -    protected final static ZipLong EOCD_SIG = new ZipLong(0X06054B50L);
  +    protected static final ZipLong EOCD_SIG = new ZipLong(0X06054B50L);
   
       /**
        * Writes the local file header entry
  @@ -633,7 +633,7 @@
        *
        * @since 1.1
        */
  -    private final static ZipLong DOS_TIME_MIN = new ZipLong(0x00002100L);
  +    private static final ZipLong DOS_TIME_MIN = new ZipLong(0x00002100L);
   
       /**
        * Convert a Date object to a DOS date/time field.
  
  
  

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