diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java
index 8c042db83..1e71e312f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Available.java
@@ -422,7 +422,7 @@ public class Available extends Task implements Condition {
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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java b/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
index 104bb1970..47074840e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
+++ b/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
@@ -76,7 +76,7 @@ import org.apache.tools.bzip2.CBZip2InputStream;
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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/Exec.java b/src/main/org/apache/tools/ant/taskdefs/Exec.java
index 55326d8a0..3f6231389 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Exec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Exec.java
@@ -86,7 +86,7 @@ public class Exec extends Task {
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");
diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java
index 7d06aa00a..24e21d8c3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Execute.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java
@@ -84,7 +84,7 @@ import java.util.Vector;
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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
index b296919dc..abee927af 100644
--- a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
+++ b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
@@ -124,27 +124,27 @@ import java.util.NoSuchElementException;
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 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 final static int INBUFLEN = 8192;
- private final static int LINEBUFLEN = 200;
-
- private final static char CTRLZ = '\u001A';
+ 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 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 static final int INBUFLEN = 8192;
+ private static final int LINEBUFLEN = 200;
+
+ private static final char CTRLZ = '\u001A';
private int tablength = 8;
private String spaces = " ";
diff --git a/src/main/org/apache/tools/ant/taskdefs/GUnzip.java b/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
index f5a6a8d3b..1725a07b4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
@@ -76,7 +76,7 @@ import java.util.zip.GZIPInputStream;
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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java
index b3ebe1ca8..76a68eec9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -86,7 +86,7 @@ import java.util.Enumeration;
*/
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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java
index 3eef7c604..683cb1635 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -113,7 +113,7 @@ import java.util.Vector;
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 @@ public class Javac extends MatchingTask {
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 @@ public class Javac extends MatchingTask {
+ (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) ;
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index 123c82257..c8700e0d6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -130,7 +130,7 @@ public class Javadoc extends Task {
}
}
- static public class ExtensionInfo extends ProjectComponent {
+ public static class ExtensionInfo extends ProjectComponent {
private String name;
private Path path;
public void setName(String name) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Recorder.java b/src/main/org/apache/tools/ant/taskdefs/Recorder.java
index 7d969eb61..46fc8f5d9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Recorder.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Recorder.java
@@ -192,7 +192,7 @@ public class Recorder extends Task {
* 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 @@ public class Recorder extends Task {
* 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"};
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index ca2074201..814f4c9ad 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -109,7 +109,7 @@ import java.util.Vector;
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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
index 36d5a10d0..87a109ffc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
@@ -107,8 +107,8 @@ import java.sql.ResultSetMetaData;
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};
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java b/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
index 1c5443816..618e0ebe3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
+++ b/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
@@ -69,8 +69,8 @@ public class StreamPumper implements Runnable {
// 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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/Tar.java b/src/main/org/apache/tools/ant/taskdefs/Tar.java
index 9fd21fc8b..c6b71da67 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Tar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tar.java
@@ -89,27 +89,27 @@ public class Tar extends MatchingTask {
* @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 class Tar extends MatchingTask {
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};
diff --git a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
index 769b8ec5e..915661540 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
@@ -236,16 +236,16 @@ public class Tstamp extends Task {
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 final static String[] units = {
+ 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 static final String[] units = {
MILLISECOND,
SECOND,
MINUTE,
diff --git a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
index b7483d7ce..629ef55a0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
+++ b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
@@ -174,14 +174,14 @@ public class WaitFor extends ConditionBase {
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[] units = {
+ 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[] units = {
MILLISECOND, SECOND, MINUTE, HOUR, DAY, WEEK
};
diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java
index fe8d5a749..0b368ff86 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -110,7 +110,7 @@ public class Zip extends MatchingTask {
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();
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
index 965c9b115..c8c4cfaa4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
@@ -79,7 +79,7 @@ public class Javac13 extends DefaultCompilerAdapter {
/**
* 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);
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
index 81c35d8c0..7e6d2548e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
@@ -67,13 +67,13 @@ import java.util.Locale;
* @version $Revision$
*/
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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
index 25accfb55..16d333980 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
@@ -396,8 +396,7 @@ public class ChangeLogTask extends Task {
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()));
}
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
index aebc04f54..3c912fa45 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
@@ -82,13 +82,13 @@ import org.apache.tools.ant.types.FileSet;
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";
/**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java b/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
index 9058b0542..0de4c5f67 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
@@ -223,14 +223,14 @@ import org.apache.tools.ant.types.Reference;
*/
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";
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
index c2a50b72e..1ef3265d2 100755
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
@@ -103,7 +103,7 @@ import java.util.Enumeration;
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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
index e750e915f..7d35ea72b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
@@ -164,11 +164,11 @@ public class NetRexxC extends MatchingTask {
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();
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
index 95a26f179..d26702728 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
@@ -153,7 +153,7 @@ public class PropertyFile extends Task {
* Static variables.
*/
- private final static String NEWLINE = System.getProperty("line.separator");
+ private static final String NEWLINE = System.getProperty("line.separator");
/* ========================================================================
@@ -296,9 +296,9 @@ public class PropertyFile extends Task {
* 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 class PropertyFile extends Task {
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 class PropertyFile extends Task {
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 class PropertyFile extends Task {
*/
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,
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Test.java b/src/main/org/apache/tools/ant/taskdefs/optional/Test.java
index c6f550513..2469f90a4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Test.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Test.java
@@ -65,7 +65,7 @@ public class Test extends Java {
protected Vector m_tests = new Vector();
- protected final static class TestletEntry {
+ protected static final class TestletEntry {
protected String m_testname = "";
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java
index 1b9c02eee..b9874708b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java
@@ -174,11 +174,11 @@ public class CCMCheck extends Continuus {
/**
* -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";
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java
index a4e17d7a5..98deb82c6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java
@@ -68,6 +68,6 @@ public class CCMCheckinDefault extends CCMCheck {
setTask(DEFAULT_TASK);
}
- public final static String DEFAULT_TASK = "default";
+ public static final String DEFAULT_TASK = "default";
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
index 97d6f04b3..f06112214 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
@@ -264,32 +264,32 @@ public class CCMCreateTask extends Continuus implements ExecuteStreamHandler {
/**
* /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
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java
index 5740a3cb9..b4be9ce36 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java
@@ -177,18 +177,18 @@ public class CCMReconfigure extends Continuus {
/**
* /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";
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
index bcc60c977..edfef503f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
@@ -139,29 +139,29 @@ public abstract class Continuus extends Task {
/**
* 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";
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java
index d4e28548a..437d2b3b4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java
@@ -342,31 +342,31 @@ public class CCCheckin extends ClearCase {
/**
* -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";
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
index 09e28deeb..8467a488a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
@@ -442,43 +442,43 @@ public class CCCheckout extends ClearCase {
/**
* -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";
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java
index 30cca6e14..37e448a2a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java
@@ -159,11 +159,11 @@ public class CCUnCheckout extends ClearCase {
/**
* -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";
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java
index 04f28d6bd..bb98e5877 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java
@@ -326,31 +326,31 @@ public class CCUpdate extends ClearCase {
/**
* -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";
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
index 00665ae11..1ce374345 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
@@ -141,24 +141,24 @@ public abstract class ClearCase extends Task {
/**
* 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";
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java
index 1a19db525..48397a95a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java
@@ -73,7 +73,7 @@ import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPoolEn
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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
index e2a455d92..121bdc003 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
@@ -67,37 +67,37 @@ import java.io.IOException;
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
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
index c45c47188..7a0996a58 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
@@ -164,17 +164,17 @@ public class CSharp
* 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 @@ public class CSharp
* 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;" +
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
index 838ce57aa..b24753de0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
@@ -108,22 +108,22 @@ public class Ilasm
* 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
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
index c32c6dc8f..e7e6c9f77 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
@@ -109,22 +109,22 @@ import org.apache.tools.ant.types.Path;
*/
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";
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
index ed765cc37..bb3a0f258 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
@@ -81,8 +81,8 @@ import org.apache.tools.ant.types.Reference;
* @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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
index cbd312f8d..d7c400b0b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
@@ -78,12 +78,12 @@ import org.apache.tools.ant.Project;
* 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 @@ public class DescriptorHandler extends org.xml.sax.HandlerBase {
* 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
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
index 984a240af..bc7782bc6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
@@ -150,7 +150,7 @@ public class IPlanetDeploymentTool extends GenericDeploymentTool {
* 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
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
index 8436d8d21..7fd6d9fbf 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
@@ -106,9 +106,9 @@ import org.xml.sax.AttributeList;
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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java
index 5dc8a046e..9fc769870 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java
@@ -67,8 +67,8 @@ import org.apache.tools.ant.Project;
* @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";
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
index 93275c736..b6fddc88f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
@@ -69,9 +69,9 @@ import java.io.File;
* @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
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
index e887868a7..a0336b24b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
@@ -77,36 +77,36 @@ import org.apache.tools.ant.taskdefs.Java;
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";
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java
index a6e3ff449..87ece8cc6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java
@@ -62,7 +62,7 @@ import org.apache.tools.ant.Project;
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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
index ff2121a22..1d1987643 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
@@ -107,16 +107,16 @@ public class WebsphereDeploymentTool 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";
- 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";
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java
index 3f1c7e223..dc09ca050 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java
@@ -71,7 +71,7 @@ import org.apache.tools.ant.BuildException;
* @author Wolf Siberski
*/
public class VAJAntTool {
- private final static String TOOL_DATA_KEY = "AntTool";
+ private static final String TOOL_DATA_KEY = "AntTool";
/**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
index b8edd35d6..d871e7fcb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
@@ -115,7 +115,7 @@ public class VAJAntToolGUI extends Frame {
* 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();
/**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java
index 2d871d0c6..8166d98bb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java
@@ -150,8 +150,8 @@ import java.io.File;
*/
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.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java
index 953f946b7..b1d031cba 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java
@@ -83,7 +83,7 @@ import java.util.Vector;
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
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java
index 4546282cd..0b34cb633 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java
@@ -102,14 +102,14 @@ public abstract class VAJToolsServlet extends HttpServlet {
}
// 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
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java
index 717bd836a..17e49296a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java
@@ -88,7 +88,7 @@ import org.apache.tools.ant.DirectoryScanner;
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/**",
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
index 38e566ca5..471d4c97b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
@@ -81,17 +81,17 @@ public class JonasHotDeploymentTool extends GenericHotDeploymentTool implements
/**
* 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};
/**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
index e8488246d..d2c5206d5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
@@ -77,18 +77,18 @@ import java.util.Enumeration;
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 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 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 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();
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
index 2c363a955..dc1435ee1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
@@ -77,27 +77,27 @@ import java.util.Enumeration;
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 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 LOOKAHEAD = "LOOKAHEAD";
+ private static final String CHOICE_AMBIGUITY_CHECK = "CHOICE_AMBIGUITY_CHECK";
+ private static final String OTHER_AMBIGUITY_CHECK = "OTHER_AMBIGUITY_CHECK";
+
+ private static final String STATIC = "STATIC";
+ private static final String DEBUG_PARSER = "DEBUG_PARSER";
+ private static final String DEBUG_LOOKAHEAD = "DEBUG_LOOKAHEAD";
+ private static final String DEBUG_TOKEN_MANAGER = "DEBUG_TOKEN_MANAGER";
+ private static final String OPTIMIZE_TOKEN_MANAGER = "OPTIMIZE_TOKEN_MANAGER";
+ private static final String ERROR_REPORTING = "ERROR_REPORTING";
+ private static final String JAVA_UNICODE_ESCAPE = "JAVA_UNICODE_ESCAPE";
+ private static final String UNICODE_INPUT = "UNICODE_INPUT";
+ private static final String IGNORE_CASE = "IGNORE_CASE";
+ private static final String COMMON_TOKEN_ACTION = "COMMON_TOKEN_ACTION";
+ private static final String USER_TOKEN_MANAGER = "USER_TOKEN_MANAGER";
+ private static final String USER_CHAR_STREAM = "USER_CHAR_STREAM";
+ private static final String BUILD_PARSER = "BUILD_PARSER";
+ private static final String BUILD_TOKEN_MANAGER = "BUILD_TOKEN_MANAGER";
+ private static final String SANITY_CHECK = "SANITY_CHECK";
+ private static final String FORCE_LA_CHECK = "FORCE_LA_CHECK";
+ private static final String CACHE_TOKENS = "CACHE_TOKENS";
private final Hashtable optionalAttrs = new Hashtable();
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
index 2ad065229..1bd8ff282 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
@@ -244,11 +244,11 @@ public class JDependTask extends Task {
/**
* 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 {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java
index c0e3c773d..7bc24e57a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java
@@ -67,7 +67,7 @@ import java.io.DataInputStream;
*/
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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
index 122f44b5c..78668ed8c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
@@ -164,7 +164,7 @@ public class JspC extends MatchingTask {
- private final static String FAIL_MSG
+ private static final String FAIL_MSG
= "Compile failed, messages should have been provided.";
/* ------------------------------------------------------------ */
/**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
index e1562d06a..d511cf7b9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
@@ -161,7 +161,7 @@ public class JspNameMangler implements JspMangler {
* @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 = '/';
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
index fbd2ce395..2d85bfced 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
@@ -84,9 +84,9 @@ import org.w3c.dom.Document;
*/
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(){
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
index 299e20c2b..e67ad57f3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
@@ -104,17 +104,17 @@ public class JUnitTestRunner implements TestListener {
/**
* 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 @@ public class JUnitTestRunner implements TestListener {
*/
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",
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
index 276792f78..9c3f32f4c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
@@ -108,10 +108,10 @@ public class XMLResultAggregator extends Task implements XMLConstants {
protected Vector transformers = new Vector();
/** The default directory: .. It is resolved from the project directory */
- public final static String DEFAULT_DIR = ".";
+ public static final String DEFAULT_DIR = ".";
/** the default file name: TESTS-TestSuites.xml */
- public final static String DEFAULT_FILENAME = "TESTS-TestSuites.xml";
+ public static final String DEFAULT_FILENAME = "TESTS-TestSuites.xml";
public AggregateTransformer createReport(){
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
index f057f96dc..9a6252683 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
@@ -115,7 +115,7 @@ public class MAudit extends AbstractMetamataTask {
/** 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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java
index b131e5cc3..aca6ff94b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java
@@ -78,7 +78,7 @@ final class MAuditParser {
/** 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 @@ final class MAuditParser {
}
/** the inner class used to report violation information */
- final static class Violation {
+ static final class Violation {
String file;
String line;
String error;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java
index 6b01cdf52..09378f7e6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java
@@ -99,18 +99,18 @@ import org.apache.tools.ant.util.DateUtils;
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 @@ public class MMetricsStreamHandler implements ExecuteStreamHandler {
* 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 @@ public class MMetricsStreamHandler implements ExecuteStreamHandler {
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();
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index c0ab9392b..6d4f63c17 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -104,12 +104,12 @@ import java.util.Vector;
*/
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 @@ public class FTP
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 @@ public class FTP
"chmod"
};
- protected final static String[] COMPLETED_ACTION_STRS = {
+ protected static final String[] COMPLETED_ACTION_STRS = {
"sent",
"retrieved",
"deleted",
@@ -991,7 +991,7 @@ public class FTP
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"
};
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
index 8a34c4e16..1006cee5f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
@@ -110,17 +110,17 @@ public class Pvcs extends org.apache.tools.ant.Task {
/**
* 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) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java b/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
index 772a42aaf..40e7bb402 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
@@ -122,7 +122,7 @@ public class AntStarTeamCheckOut extends org.apache.tools.ant.Task {
* @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 @@ public class AntStarTeamCheckOut extends org.apache.tools.ant.Task {
* @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 @@ public class AntStarTeamCheckOut extends org.apache.tools.ant.Task {
* @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
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java
index d6bf6bd99..9ad93f603 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java
@@ -64,7 +64,7 @@ import java.util.Vector;
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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java
index 1d7298280..03203bb00 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java
@@ -132,10 +132,10 @@ public class Triggers {
}
/** 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");
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java
index 981d00565..e3cd5bd2b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java
@@ -76,7 +76,7 @@ import java.util.zip.ZipFile;
*/
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 JarLoader implements ClassPathLoader.FileLoader {
*/
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;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java
index 9d428901a..12e587e5c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java
@@ -66,31 +66,31 @@ import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
*/
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() {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
index 23c52c2c2..6e11a5968 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
@@ -101,7 +101,7 @@ public class StarTeamLabel extends StarTeamTask {
*/
private OLEDate lastBuild = null;
- private final static SimpleDateFormat DATE_FORMAT =
+ private static final SimpleDateFormat DATE_FORMAT =
new SimpleDateFormat("yyyyMMddHHmmss");
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java
index e8a940be1..f7f3910da 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java
@@ -193,7 +193,7 @@ public class StarTeamList extends TreeBasedTask {
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();
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
index 7922872dd..8d7851e32 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
@@ -95,7 +95,7 @@ public abstract class TreeBasedTask extends StarTeamTask {
* @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 @@ public abstract class TreeBasedTask extends StarTeamTask {
* @see #getExcludes()
* @see #setExcludes(String excludes)
*/
- public final static String DEFAULT_EXCLUDESETTING = null;
+ public static final String DEFAULT_EXCLUDESETTING = null;
//ATTRIBUTES settable from ant.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
index 72d49f6c1..670aee252 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
@@ -195,38 +195,38 @@ public abstract class MSVSS extends Task {
/**
* 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 abstract class MSVSS extends Task {
/** */
- 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-";
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
index 4d2176f94..123faacef 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
@@ -88,11 +88,11 @@ public class MSVSSHISTORY extends MSVSS {
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.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java
index b66f6dd47..f6ca9095d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java
@@ -117,7 +117,7 @@ public class MSVSSLABEL extends MSVSS {
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.
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
index 333a69e6d..265539ce8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
@@ -81,7 +81,7 @@ public abstract class DefaultRmicAdapter implements RmicAdapter {
private Rmic attributes;
private FileNameMapper mapper;
- private final static Random rand = new Random();
+ private static final Random rand = new Random();
public DefaultRmicAdapter() {
}
diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java
index de28028e1..75beed3d7 100644
--- a/src/main/org/apache/tools/ant/types/FilterSet.java
+++ b/src/main/org/apache/tools/ant/types/FilterSet.java
@@ -168,10 +168,10 @@ public class FilterSet extends DataType implements Cloneable {
}
/** 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;
diff --git a/src/main/org/apache/tools/ant/types/RegularExpression.java b/src/main/org/apache/tools/ant/types/RegularExpression.java
index e7a81940b..afa891079 100644
--- a/src/main/org/apache/tools/ant/types/RegularExpression.java
+++ b/src/main/org/apache/tools/ant/types/RegularExpression.java
@@ -97,10 +97,10 @@ import org.apache.tools.ant.util.regexp.RegexpFactory;
* @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;
diff --git a/src/main/org/apache/tools/ant/types/Substitution.java b/src/main/org/apache/tools/ant/types/Substitution.java
index 62a862e07..7c701e113 100644
--- a/src/main/org/apache/tools/ant/types/Substitution.java
+++ b/src/main/org/apache/tools/ant/types/Substitution.java
@@ -71,7 +71,7 @@ import org.apache.tools.ant.Project;
* @author Matthew Inger mattinger@mindless.com
*/
public class Substitution extends DataType {
- public final static String DATA_TYPE_NAME = "substitition";
+ public static final String DATA_TYPE_NAME = "substitition";
private String expression;
diff --git a/src/main/org/apache/tools/ant/util/DateUtils.java b/src/main/org/apache/tools/ant/util/DateUtils.java
index 507324af9..128b9502f 100644
--- a/src/main/org/apache/tools/ant/util/DateUtils.java
+++ b/src/main/org/apache/tools/ant/util/DateUtils.java
@@ -79,38 +79,38 @@ public final class DateUtils {
* ISO8601-like pattern for date-time. It does not support timezone.
* yyyy-MM-ddTHH:mm:ss
*/
- 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. yyyy-MM-dd
*/
- public final static String ISO8601_DATE_PATTERN
+ public static final String ISO8601_DATE_PATTERN
= "yyyy-MM-dd";
/**
* ISO8601-like pattern for time. HH:mm:ss
*/
- 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 {
diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
index 2431016a8..915c92003 100644
--- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
+++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
@@ -83,15 +83,15 @@ public class JavaEnvUtils {
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 {
diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java
index d1e903035..1e4bc56fb 100644
--- a/src/main/org/apache/tools/ant/util/StringUtils.java
+++ b/src/main/org/apache/tools/ant/util/StringUtils.java
@@ -65,7 +65,7 @@ import java.util.Vector;
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
diff --git a/src/main/org/apache/tools/bzip2/CBZip2InputStream.java b/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
index d2806a07f..9691bdb53 100644
--- a/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
+++ b/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
@@ -152,13 +152,13 @@ public class CBZip2InputStream extends InputStream implements BZip2Constants {
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;
diff --git a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
index 6253f6284..39a2a5fa6 100644
--- a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
+++ b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
@@ -72,12 +72,12 @@ import java.io.IOException;
* 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 @@ public class CBZip2OutputStream extends OutputStream implements BZip2Constants {
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");
diff --git a/src/main/org/apache/tools/mail/MailMessage.java b/src/main/org/apache/tools/mail/MailMessage.java
index 849547252..92098d349 100644
--- a/src/main/org/apache/tools/mail/MailMessage.java
+++ b/src/main/org/apache/tools/mail/MailMessage.java
@@ -132,7 +132,7 @@ import java.util.Enumeration;
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;
diff --git a/src/main/org/apache/tools/tar/TarBuffer.java b/src/main/org/apache/tools/tar/TarBuffer.java
index 4822273fa..15a2597ac 100644
--- a/src/main/org/apache/tools/tar/TarBuffer.java
+++ b/src/main/org/apache/tools/tar/TarBuffer.java
@@ -79,8 +79,8 @@ import java.io.IOException;
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;
diff --git a/src/main/org/apache/tools/tar/TarOutputStream.java b/src/main/org/apache/tools/tar/TarOutputStream.java
index 0a0940853..e7cb8bb52 100644
--- a/src/main/org/apache/tools/tar/TarOutputStream.java
+++ b/src/main/org/apache/tools/tar/TarOutputStream.java
@@ -71,9 +71,9 @@ import java.io.IOException;
* @author Timothy Gerard Endres time@ice.com
*/
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;
diff --git a/src/main/org/apache/tools/zip/AsiExtraField.java b/src/main/org/apache/tools/zip/AsiExtraField.java
index 02bb0126d..17056d338 100644
--- a/src/main/org/apache/tools/zip/AsiExtraField.java
+++ b/src/main/org/apache/tools/zip/AsiExtraField.java
@@ -86,7 +86,7 @@ import java.util.zip.ZipException;
*/
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.
diff --git a/src/main/org/apache/tools/zip/ZipOutputStream.java b/src/main/org/apache/tools/zip/ZipOutputStream.java
index 184c2b3ee..4348c5683 100644
--- a/src/main/org/apache/tools/zip/ZipOutputStream.java
+++ b/src/main/org/apache/tools/zip/ZipOutputStream.java
@@ -167,14 +167,14 @@ public class ZipOutputStream extends DeflaterOutputStream {
*
* @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 @@ public class ZipOutputStream extends DeflaterOutputStream {
*
* @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 @@ public class ZipOutputStream extends DeflaterOutputStream {
*
* @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 @@ public class ZipOutputStream extends DeflaterOutputStream {
*
* @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.