You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@apache.org on 2002/05/06 11:29:46 UTC
cvs commit: jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/regexp RegexpMatcherFactory.java
donaldp 02/05/06 02:29:46
Modified: antlib/src/java/org/apache/antlib/cvslib
ChangeLogParser.java
antlib/src/java/org/apache/antlib/extensions
JarLibDisplayTask.java JarLibManifestTask.java
antlib/src/test/org/apache/antlib/core/test IfTestCase.java
PropertyTestCase.java
aut/src/test/org/apache/aut/vfs/test
AbstractFileSystemTestCase.java
buildtools/src/java/org/apache/myrmidon/build
AntDocSubTask.java
container/src/java/org/apache/myrmidon/components/property
DefaultPropertyStore.java
container/src/test/org/apache/myrmidon/components/builder/test
DefaultProjectBuilderTestCase.java
container/src/test/org/apache/myrmidon/components/configurer/test
DefaultConfigurerTestCase.java
container/src/test/org/apache/myrmidon/components/role/test
DefaultRoleManagerTestCase.java
container/src/test/org/apache/myrmidon/components/service/test
InstantiatingServiceManagerTestCase.java
LifecycleValidator.java
container/src/test/org/apache/myrmidon/interfaces/type/test
TypeFactoryTestCase.java
framework/src/todo/org/apache/tools/todo/taskdefs Entry.java
FileDir.java IContract.java Javah.java SQLExec.java
Tstamp.java WaitFor.java
framework/src/todo/org/apache/tools/todo/taskdefs/archive
Jar.java TarLongFileMode.java Zip.java
framework/src/todo/org/apache/tools/todo/taskdefs/javac
Javac.java Javac13.java
framework/src/todo/org/apache/tools/todo/taskdefs/javacc
JJTree.java JavaCC.java
framework/src/todo/org/apache/tools/todo/taskdefs/jsp
JspC.java
framework/src/todo/org/apache/tools/todo/taskdefs/junit
AggregateTransformer.java JUnitTestRunner.java
XMLResultAggregator.java
framework/src/todo/org/apache/tools/todo/taskdefs/manifest
ManifestUtil.java
framework/src/todo/org/apache/tools/todo/taskdefs/net
Action.java FTP.java
framework/src/todo/org/apache/tools/todo/taskdefs/rmic
DefaultRmicAdapter.java Rmic.java
framework/src/todo/org/apache/tools/todo/taskdefs/text
FixCRLF.java RegularExpression.java
framework/src/todo/org/apache/tools/todo/taskdefs/vss
MSVSS.java MSVSSHISTORY.java MSVSSLABEL.java
framework/src/todo/org/apache/tools/todo/types
ScannerUtil.java
framework/src/todo/org/apache/tools/todo/util/regexp
RegexpMatcherFactory.java
Log:
final static --> static final to conform with JLS.
Revision Changes Path
1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/cvslib/ChangeLogParser.java
Index: ChangeLogParser.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/cvslib/ChangeLogParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLogParser.java 14 Apr 2002 10:56:02 -0000 1.1
+++ ChangeLogParser.java 6 May 2002 09:29:43 -0000 1.2
@@ -21,12 +21,12 @@
* A class used to parse the output of the CVS log command.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.1 $ $Date: 2002/04/14 10:56:02 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/06 09:29:43 $
*/
class ChangeLogParser
implements ExecOutputHandler
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( ChangeLogParser.class );
//private static final int GET_ENTRY = 0;
1.2 +1 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/extensions/JarLibDisplayTask.java
Index: JarLibDisplayTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/extensions/JarLibDisplayTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JarLibDisplayTask.java 14 Apr 2002 10:55:07 -0000 1.1
+++ JarLibDisplayTask.java 6 May 2002 09:29:43 -0000 1.2
@@ -35,7 +35,7 @@
public class JarLibDisplayTask
extends AbstractTask
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( JarLibDisplayTask.class );
/**
1.3 +1 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/extensions/JarLibManifestTask.java
Index: JarLibManifestTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/extensions/JarLibManifestTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JarLibManifestTask.java 17 Apr 2002 07:16:21 -0000 1.2
+++ JarLibManifestTask.java 6 May 2002 09:29:43 -0000 1.3
@@ -41,7 +41,7 @@
public final class JarLibManifestTask
extends AbstractTask
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( JarLibManifestTask.class );
/**
1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/IfTestCase.java
Index: IfTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/IfTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IfTestCase.java 14 Apr 2002 10:48:03 -0000 1.1
+++ IfTestCase.java 6 May 2002 09:29:43 -0000 1.2
@@ -16,12 +16,12 @@
* Test cases for the <if> task.
*
* @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/04/14 10:48:03 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/06 09:29:43 $
*/
public class IfTestCase
extends AbstractProjectTest
{
- private final static Resources REZ = getResourcesForTested( IfTestCase.class );
+ private static final Resources REZ = getResourcesForTested( IfTestCase.class );
public IfTestCase( String name )
{
1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/PropertyTestCase.java
Index: PropertyTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/PropertyTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertyTestCase.java 14 Apr 2002 10:48:03 -0000 1.1
+++ PropertyTestCase.java 6 May 2002 09:29:43 -0000 1.2
@@ -19,12 +19,12 @@
* Test cases for <property> task.
*
* @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/04/14 10:48:03 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/06 09:29:43 $
*/
public class PropertyTestCase
extends AbstractProjectTest
{
- private final static Resources REZ = getResourcesForTested( PropertyTestCase.class );
+ private static final Resources REZ = getResourcesForTested( PropertyTestCase.class );
public PropertyTestCase( final String name )
{
1.7 +2 -2 jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/test/AbstractFileSystemTestCase.java
Index: AbstractFileSystemTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/test/AbstractFileSystemTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractFileSystemTestCase.java 22 Apr 2002 07:23:52 -0000 1.6
+++ AbstractFileSystemTestCase.java 6 May 2002 09:29:44 -0000 1.7
@@ -35,12 +35,12 @@
* that base folder.
*
* @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
- * @version $Revision: 1.6 $ $Date: 2002/04/22 07:23:52 $
+ * @version $Revision: 1.7 $ $Date: 2002/05/06 09:29:44 $
*/
public abstract class AbstractFileSystemTestCase
extends AbstractAutTestCase
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( AbstractFileObject.class );
protected FileObject m_baseFolder;
1.3 +2 -2 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntDocSubTask.java
Index: AntDocSubTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntDocSubTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AntDocSubTask.java 2 May 2002 09:54:01 -0000 1.2
+++ AntDocSubTask.java 6 May 2002 09:29:44 -0000 1.3
@@ -17,12 +17,12 @@
* Generates the XML Documentation for Ant types (including tasks and DataTypes).
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.2 $ $Date: 2002/05/02 09:54:01 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/06 09:29:44 $
*/
public class AntDocSubTask
extends TemplateSubTask
{
- public final static String SUBTASK_NAME = "antdoc";
+ public static final String SUBTASK_NAME = "antdoc";
private static final String GENERATED_FILE_NAME = "{0}.xml";
private static final String DEFAULT_TEMPLATE_FILE =
1.6 +2 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/DefaultPropertyStore.java
Index: DefaultPropertyStore.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/DefaultPropertyStore.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultPropertyStore.java 2 May 2002 10:52:19 -0000 1.5
+++ DefaultPropertyStore.java 6 May 2002 09:29:44 -0000 1.6
@@ -27,13 +27,13 @@
* </ul>
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.5 $ $Date: 2002/05/02 10:52:19 $
+ * @version $Revision: 1.6 $ $Date: 2002/05/06 09:29:44 $
* @see org.apache.myrmidon.interfaces.property.PropertyStore
*/
public class DefaultPropertyStore
implements PropertyStore
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( DefaultPropertyStore.class );
/**
1.4 +2 -2 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/builder/test/DefaultProjectBuilderTestCase.java
Index: DefaultProjectBuilderTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/builder/test/DefaultProjectBuilderTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultProjectBuilderTestCase.java 28 Apr 2002 05:04:49 -0000 1.3
+++ DefaultProjectBuilderTestCase.java 6 May 2002 09:29:44 -0000 1.4
@@ -21,12 +21,12 @@
* Test cases for {@link org.apache.myrmidon.components.builder.DefaultProjectBuilder}.
*
* @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
- * @version $Revision: 1.3 $ $Date: 2002/04/28 05:04:49 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/06 09:29:44 $
*/
public class DefaultProjectBuilderTestCase
extends AbstractContainerTestCase
{
- private final static Resources REZ = getResourcesForTested( DefaultProjectBuilderTestCase.class );
+ private static final Resources REZ = getResourcesForTested( DefaultProjectBuilderTestCase.class );
private DefaultProjectBuilder m_builder;
1.15 +1 -1 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/DefaultConfigurerTestCase.java
Index: DefaultConfigurerTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/DefaultConfigurerTestCase.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultConfigurerTestCase.java 26 Apr 2002 03:12:50 -0000 1.14
+++ DefaultConfigurerTestCase.java 6 May 2002 09:29:44 -0000 1.15
@@ -49,7 +49,7 @@
public class DefaultConfigurerTestCase
extends AbstractComponentTest
{
- private final static Resources REZ =
+ private static final Resources REZ =
getResourcesForTested( DefaultConfigurerTestCase.class );
private Configurer m_configurer;
1.5 +2 -2 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/role/test/DefaultRoleManagerTestCase.java
Index: DefaultRoleManagerTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/role/test/DefaultRoleManagerTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultRoleManagerTestCase.java 25 Apr 2002 01:41:50 -0000 1.4
+++ DefaultRoleManagerTestCase.java 6 May 2002 09:29:44 -0000 1.5
@@ -19,12 +19,12 @@
* Test cases for the DefaultRoleManager.
*
* @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
- * @version $Revision: 1.4 $ $Date: 2002/04/25 01:41:50 $
+ * @version $Revision: 1.5 $ $Date: 2002/05/06 09:29:44 $
*/
public class DefaultRoleManagerTestCase
extends AbstractContainerTestCase
{
- private final static Resources REZ = getResourcesForTested( DefaultRoleManagerTestCase.class );
+ private static final Resources REZ = getResourcesForTested( DefaultRoleManagerTestCase.class );
private DefaultRoleManager m_roleManager;
1.5 +2 -2 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/service/test/InstantiatingServiceManagerTestCase.java
Index: InstantiatingServiceManagerTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/service/test/InstantiatingServiceManagerTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InstantiatingServiceManagerTestCase.java 25 Apr 2002 01:41:50 -0000 1.4
+++ InstantiatingServiceManagerTestCase.java 6 May 2002 09:29:44 -0000 1.5
@@ -23,12 +23,12 @@
* Test cases for the default service manager.
*
* @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
- * @version $Revision: 1.4 $ $Date: 2002/04/25 01:41:50 $
+ * @version $Revision: 1.5 $ $Date: 2002/05/06 09:29:44 $
*/
public class InstantiatingServiceManagerTestCase
extends AbstractComponentTest
{
- private final static Resources REZ = getResourcesForTested( InstantiatingServiceManagerTestCase.class );
+ private static final Resources REZ = getResourcesForTested( InstantiatingServiceManagerTestCase.class );
private InstantiatingServiceManager m_serviceManager;
1.3 +8 -8 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/service/test/LifecycleValidator.java
Index: LifecycleValidator.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/service/test/LifecycleValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LifecycleValidator.java 9 Apr 2002 07:21:13 -0000 1.2
+++ LifecycleValidator.java 6 May 2002 09:29:44 -0000 1.3
@@ -26,7 +26,7 @@
* A basic class that asserts that the object is correctly set-up.
*
* @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
- * @version $Revision: 1.2 $ $Date: 2002/04/09 07:21:13 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/06 09:29:44 $
*/
public class LifecycleValidator
extends Assert
@@ -34,13 +34,13 @@
{
private String m_state = STATE_NOT_INIT;
- private final static String STATE_NOT_INIT = "not-prepared";
- private final static String STATE_LOG_ENABLED = "log-enabled";
- private final static String STATE_SERVICED = "serviced";
- private final static String STATE_PARAMETERISED = "parameterised";
- private final static String STATE_INITIALISED = "initialised";
- private final static String STATE_CONTEXTUALISED = "contextualised";
- private final static String STATE_DISPOSED = "disposed";
+ private static final String STATE_NOT_INIT = "not-prepared";
+ private static final String STATE_LOG_ENABLED = "log-enabled";
+ private static final String STATE_SERVICED = "serviced";
+ private static final String STATE_PARAMETERISED = "parameterised";
+ private static final String STATE_INITIALISED = "initialised";
+ private static final String STATE_CONTEXTUALISED = "contextualised";
+ private static final String STATE_DISPOSED = "disposed";
public void enableLogging( final Logger logger )
{
1.3 +7 -7 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/interfaces/type/test/TypeFactoryTestCase.java
Index: TypeFactoryTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/interfaces/type/test/TypeFactoryTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TypeFactoryTestCase.java 18 Apr 2002 12:53:15 -0000 1.2
+++ TypeFactoryTestCase.java 6 May 2002 09:29:44 -0000 1.3
@@ -18,17 +18,17 @@
* These are unit tests that test the basic operation of TypeFactories.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.2 $ $Date: 2002/04/18 12:53:15 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/06 09:29:44 $
*/
public class TypeFactoryTestCase
extends AbstractContainerTestCase
{
- private final static String TYPE_NAME1 = "my-type1";
- private final static String TYPE_NAME2 = "my-type2";
- private final static Class TYPE_CLASS1 = MyType1.class;
- private final static Class TYPE_CLASS2 = MyType2.class;
- private final static String TYPE_CLASSNAME1 = TYPE_CLASS1.getName();
- private final static String TYPE_CLASSNAME2 = TYPE_CLASS2.getName();
+ private static final String TYPE_NAME1 = "my-type1";
+ private static final String TYPE_NAME2 = "my-type2";
+ private static final Class TYPE_CLASS1 = MyType1.class;
+ private static final Class TYPE_CLASS2 = MyType2.class;
+ private static final String TYPE_CLASSNAME1 = TYPE_CLASS1.getName();
+ private static final String TYPE_CLASSNAME2 = TYPE_CLASS2.getName();
public TypeFactoryTestCase( final String name )
{
1.2 +12 -12 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/Entry.java
Index: Entry.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/Entry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Entry.java 14 Apr 2002 09:31:48 -0000 1.1
+++ Entry.java 6 May 2002 09:29:44 -0000 1.2
@@ -23,11 +23,11 @@
*/
public class Entry
{
- final static String NOW_VALUE_ = "now";
- final static String NULL_VALUE_ = "never";
+ static final String NOW_VALUE_ = "now";
+ static final String NULL_VALUE_ = "never";
- private final static int DEFAULT_INT_VALUE = 1;
- private final static GregorianCalendar
+ private static final int DEFAULT_INT_VALUE = 1;
+ private static final GregorianCalendar
DEFAULT_DATE_VALUE = new GregorianCalendar();
private String m_key;
@@ -419,13 +419,13 @@
{
// 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;
// Special values
- public final static int NOW_VALUE = 3;
- public final static int NULL_VALUE = 4;
+ public static final int NOW_VALUE = 3;
+ public static final int NULL_VALUE = 4;
public static int toOperation( String oper )
{
@@ -463,9 +463,9 @@
{
// 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 static int toType( String type )
{
1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/FileDir.java
Index: FileDir.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/FileDir.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileDir.java 14 Apr 2002 09:31:48 -0000 1.1
+++ FileDir.java 6 May 2002 09:29:44 -0000 1.2
@@ -12,7 +12,7 @@
public class FileDir
extends EnumeratedAttribute
{
- private final static String[] values = {"file", "dir"};
+ private static final String[] values = {"file", "dir"};
public String[] getValues()
{
1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/IContract.java
Index: IContract.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/IContract.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IContract.java 14 Apr 2002 09:31:48 -0000 1.1
+++ IContract.java 6 May 2002 09:29:44 -0000 1.2
@@ -351,7 +351,7 @@
*/
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.";
/**
1.3 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/Javah.java
Index: Javah.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/Javah.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Javah.java 20 Apr 2002 12:53:38 -0000 1.2
+++ Javah.java 6 May 2002 09:29:44 -0000 1.3
@@ -55,7 +55,7 @@
public class Javah
extends AbstractTask
{
- 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 ArrayList m_classes = new ArrayList( 2 );
private Path m_classpath;
1.2 +2 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java
Index: SQLExec.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SQLExec.java 14 Apr 2002 09:31:48 -0000 1.1
+++ SQLExec.java 6 May 2002 09:29:44 -0000 1.2
@@ -768,8 +768,8 @@
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()
{
1.2 +9 -9 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/Tstamp.java
Index: Tstamp.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/Tstamp.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Tstamp.java 14 Apr 2002 09:31:48 -0000 1.1
+++ Tstamp.java 6 May 2002 09:29:44 -0000 1.2
@@ -91,16 +91,16 @@
public static class Unit extends EnumeratedAttribute
{
- private final static String MILLISECOND = "millisecond";
- private final static String SECOND = "second";
- private final static String MINUTE = "minute";
- private final static String HOUR = "hour";
- private final static String DAY = "day";
- private final static String WEEK = "week";
- private final static String MONTH = "month";
- private final static String YEAR = "year";
+ private static final String MILLISECOND = "millisecond";
+ private static final String SECOND = "second";
+ private static final String MINUTE = "minute";
+ private static final String HOUR = "hour";
+ private static final String DAY = "day";
+ private static final String WEEK = "week";
+ private static final String MONTH = "month";
+ private static final String YEAR = "year";
- private final static String[] units = {
+ private static final String[] units = {
MILLISECOND,
SECOND,
MINUTE,
1.2 +7 -7 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/WaitFor.java
Index: WaitFor.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/WaitFor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WaitFor.java 14 Apr 2002 09:31:48 -0000 1.1
+++ WaitFor.java 6 May 2002 09:29:44 -0000 1.2
@@ -143,14 +143,14 @@
public static class Unit extends EnumeratedAttribute
{
- private final static String MILLISECOND = "millisecond";
- private final static String SECOND = "second";
- private final static String MINUTE = "minute";
- private final static String HOUR = "hour";
- private final static String DAY = "day";
- private final static String WEEK = "week";
+ private static final String MILLISECOND = "millisecond";
+ private static final String SECOND = "second";
+ private static final String MINUTE = "minute";
+ private static final String HOUR = "hour";
+ private static final String DAY = "day";
+ private static final String WEEK = "week";
- private final static String[] units = {
+ private static final String[] units = {
MILLISECOND, SECOND, MINUTE, HOUR, DAY, WEEK
};
1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java
Index: Jar.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Jar.java 14 Apr 2002 09:31:48 -0000 1.1
+++ Jar.java 6 May 2002 09:29:44 -0000 1.2
@@ -37,7 +37,7 @@
/**
* The index file name.
*/
- private final static String INDEX_NAME = "META-INF/INDEX.LIST";
+ private static final String INDEX_NAME = "META-INF/INDEX.LIST";
/**
* true if a manifest has been specified in the task
1.2 +5 -5 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/archive/TarLongFileMode.java
Index: TarLongFileMode.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/archive/TarLongFileMode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TarLongFileMode.java 14 Apr 2002 09:31:48 -0000 1.1
+++ TarLongFileMode.java 6 May 2002 09:29:45 -0000 1.2
@@ -19,11 +19,11 @@
extends EnumeratedAttribute
{
// permissable values for longfile attribute
- public final static String WARN = "warn";
- public final static String FAIL = "fail";
- public final static String TRUNCATE = "truncate";
- public final static String GNU = "gnu";
- public final static String OMIT = "omit";
+ public static final String WARN = "warn";
+ public static final String FAIL = "fail";
+ public static final String TRUNCATE = "truncate";
+ public static final String GNU = "gnu";
+ public static final String OMIT = "omit";
private final String[] validModes = {WARN, FAIL, TRUNCATE, GNU, OMIT};
1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java
Index: Zip.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Zip.java 14 Apr 2002 09:31:48 -0000 1.1
+++ Zip.java 6 May 2002 09:29:45 -0000 1.2
@@ -43,7 +43,7 @@
extends MatchingTask
{
// For directories:
- private final static long EMPTY_CRC = new CRC32().getValue();
+ private static final long EMPTY_CRC = new CRC32().getValue();
private boolean m_compress = true;
private boolean m_update;
private boolean m_filesonly;
1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java
Index: Javac.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Javac.java 14 Apr 2002 09:31:49 -0000 1.1
+++ Javac.java 6 May 2002 09:29:45 -0000 1.2
@@ -55,7 +55,7 @@
public class Javac
extends MatchingTask
{
- private final static String FAIL_MSG
+ private static final String FAIL_MSG
= "Compile failed, messages should have been provided.";
private boolean m_debug;
1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Javac13.java
Index: Javac13.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Javac13.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Javac13.java 14 Apr 2002 09:31:49 -0000 1.1
+++ Javac13.java 6 May 2002 09:29:45 -0000 1.2
@@ -30,7 +30,7 @@
/**
* Integer returned by the "Modern" jdk1.3 compiler to indicate success.
*/
- private final static int MODERN_COMPILER_SUCCESS = 0;
+ private static final int MODERN_COMPILER_SUCCESS = 0;
public boolean execute()
throws TaskException
1.2 +11 -11 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javacc/JJTree.java
Index: JJTree.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javacc/JJTree.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JJTree.java 14 Apr 2002 09:31:49 -0000 1.1
+++ JJTree.java 6 May 2002 09:29:45 -0000 1.2
@@ -26,18 +26,18 @@
extends AbstractTask
{
// keys to optional attributes
- private final static String BUILD_NODE_FILES = "BUILD_NODE_FILES";
- private final static String MULTI = "MULTI";
- private final static String NODE_DEFAULT_VOID = "NODE_DEFAULT_VOID";
- private final static String NODE_FACTORY = "NODE_FACTORY";
- private final static String NODE_SCOPE_HOOK = "NODE_SCOPE_HOOK";
- private final static String NODE_USES_PARSER = "NODE_USES_PARSER";
- private final static String STATIC = "STATIC";
- private final static String VISITOR = "VISITOR";
+ private static final String BUILD_NODE_FILES = "BUILD_NODE_FILES";
+ private static final String MULTI = "MULTI";
+ private static final String NODE_DEFAULT_VOID = "NODE_DEFAULT_VOID";
+ private static final String NODE_FACTORY = "NODE_FACTORY";
+ private static final String NODE_SCOPE_HOOK = "NODE_SCOPE_HOOK";
+ private static final String NODE_USES_PARSER = "NODE_USES_PARSER";
+ private static final String STATIC = "STATIC";
+ private static final String VISITOR = "VISITOR";
- private final static String NODE_PACKAGE = "NODE_PACKAGE";
- private final static String VISITOR_EXCEPTION = "VISITOR_EXCEPTION";
- private final static String NODE_PREFIX = "NODE_PREFIX";
+ private static final String NODE_PACKAGE = "NODE_PACKAGE";
+ private static final String VISITOR_EXCEPTION = "VISITOR_EXCEPTION";
+ private static final String NODE_PREFIX = "NODE_PREFIX";
private final Hashtable optionalAttrs = new Hashtable();
1.2 +20 -20 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javacc/JavaCC.java
Index: JavaCC.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javacc/JavaCC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaCC.java 14 Apr 2002 09:31:49 -0000 1.1
+++ JavaCC.java 6 May 2002 09:29:45 -0000 1.2
@@ -27,27 +27,27 @@
{
// keys to optional attributes
- private final static String LOOKAHEAD = "LOOKAHEAD";
- private final static String CHOICE_AMBIGUITY_CHECK = "CHOICE_AMBIGUITY_CHECK";
- private final static String OTHER_AMBIGUITY_CHECK = "OTHER_AMBIGUITY_CHECK";
+ private static final String LOOKAHEAD = "LOOKAHEAD";
+ private static final String CHOICE_AMBIGUITY_CHECK = "CHOICE_AMBIGUITY_CHECK";
+ private static final String OTHER_AMBIGUITY_CHECK = "OTHER_AMBIGUITY_CHECK";
- private final static String STATIC = "STATIC";
- private final static String DEBUG_PARSER = "DEBUG_PARSER";
- private final static String DEBUG_LOOKAHEAD = "DEBUG_LOOKAHEAD";
- private final static String DEBUG_TOKEN_MANAGER = "DEBUG_TOKEN_MANAGER";
- private final static String OPTIMIZE_TOKEN_MANAGER = "OPTIMIZE_TOKEN_MANAGER";
- private final static String ERROR_REPORTING = "ERROR_REPORTING";
- private final static String JAVA_UNICODE_ESCAPE = "JAVA_UNICODE_ESCAPE";
- private final static String UNICODE_INPUT = "UNICODE_INPUT";
- private final static String IGNORE_CASE = "IGNORE_CASE";
- private final static String COMMON_TOKEN_ACTION = "COMMON_TOKEN_ACTION";
- private final static String USER_TOKEN_MANAGER = "USER_TOKEN_MANAGER";
- private final static String USER_CHAR_STREAM = "USER_CHAR_STREAM";
- private final static String BUILD_PARSER = "BUILD_PARSER";
- private final static String BUILD_TOKEN_MANAGER = "BUILD_TOKEN_MANAGER";
- private final static String SANITY_CHECK = "SANITY_CHECK";
- private final static String FORCE_LA_CHECK = "FORCE_LA_CHECK";
- private final static String CACHE_TOKENS = "CACHE_TOKENS";
+ private static final String STATIC = "STATIC";
+ private static final String DEBUG_PARSER = "DEBUG_PARSER";
+ private static final String DEBUG_LOOKAHEAD = "DEBUG_LOOKAHEAD";
+ private static final String DEBUG_TOKEN_MANAGER = "DEBUG_TOKEN_MANAGER";
+ private static final String OPTIMIZE_TOKEN_MANAGER = "OPTIMIZE_TOKEN_MANAGER";
+ private static final String ERROR_REPORTING = "ERROR_REPORTING";
+ private static final String JAVA_UNICODE_ESCAPE = "JAVA_UNICODE_ESCAPE";
+ private static final String UNICODE_INPUT = "UNICODE_INPUT";
+ private static final String IGNORE_CASE = "IGNORE_CASE";
+ private static final String COMMON_TOKEN_ACTION = "COMMON_TOKEN_ACTION";
+ private static final String USER_TOKEN_MANAGER = "USER_TOKEN_MANAGER";
+ private static final String USER_CHAR_STREAM = "USER_CHAR_STREAM";
+ private static final String BUILD_PARSER = "BUILD_PARSER";
+ private static final String BUILD_TOKEN_MANAGER = "BUILD_TOKEN_MANAGER";
+ private static final String SANITY_CHECK = "SANITY_CHECK";
+ private static final String FORCE_LA_CHECK = "FORCE_LA_CHECK";
+ private static final String CACHE_TOKENS = "CACHE_TOKENS";
private final Hashtable optionalAttrs = new Hashtable();
1.2 +2 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/jsp/JspC.java
Index: JspC.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/jsp/JspC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspC.java 14 Apr 2002 09:31:50 -0000 1.1
+++ JspC.java 6 May 2002 09:29:45 -0000 1.2
@@ -56,12 +56,12 @@
* </a>
* @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
* @author <a href="mailto:jayglanville@home.com">J D Glanville</a>
- * @version $Revision: 1.1 $ $Date: 2002/04/14 09:31:50 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/06 09:29:45 $
*/
public class JspC extends MatchingTask
{
- private final static String FAIL_MSG
+ private static final String FAIL_MSG
= "Compile failed, messages should have been provided.";
private int verbose = 0;
protected ArrayList compileList = new ArrayList();
1.2 +3 -3 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/junit/AggregateTransformer.java
Index: AggregateTransformer.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/junit/AggregateTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AggregateTransformer.java 14 Apr 2002 09:31:50 -0000 1.1
+++ AggregateTransformer.java 6 May 2002 09:29:45 -0000 1.2
@@ -32,14 +32,14 @@
*/
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";
/**
* XML Parser factory
*/
- private final static DocumentBuilderFactory c_dbfactory = DocumentBuilderFactory.newInstance();
+ private static final DocumentBuilderFactory c_dbfactory = DocumentBuilderFactory.newInstance();
/**
* the xml document to process
1.2 +4 -4 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/junit/JUnitTestRunner.java
Index: JUnitTestRunner.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/junit/JUnitTestRunner.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JUnitTestRunner.java 14 Apr 2002 09:31:50 -0000 1.1
+++ JUnitTestRunner.java 6 May 2002 09:29:45 -0000 1.2
@@ -51,24 +51,24 @@
/**
* 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;
/**
* Do we filter junit.*.* stack frames out of failure and error exceptions.
*/
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",
1.2 +2 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/junit/XMLResultAggregator.java
Index: XMLResultAggregator.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/junit/XMLResultAggregator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLResultAggregator.java 14 Apr 2002 09:31:50 -0000 1.1
+++ XMLResultAggregator.java 6 May 2002 09:29:45 -0000 1.2
@@ -51,12 +51,12 @@
* the default directory: <tt>.</tt> . It is resolved from the project
* directory
*/
- public final static String DEFAULT_DIR = ".";
+ public static final String DEFAULT_DIR = ".";
/**
* the default file name: <tt>TESTS-TestSuites.xml</tt>
*/
- public final static String DEFAULT_FILENAME = "TESTS-TestSuites.xml";
+ public static final String DEFAULT_FILENAME = "TESTS-TestSuites.xml";
/**
* the list of all filesets, that should contains the xml to aggregate
1.2 +6 -6 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestUtil.java
Index: ManifestUtil.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ManifestUtil.java 14 Apr 2002 09:31:51 -0000 1.1
+++ ManifestUtil.java 6 May 2002 09:29:45 -0000 1.2
@@ -25,30 +25,30 @@
* @author Conor MacNeill
* @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.1 $ $Date: 2002/04/14 09:31:51 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/06 09:29:45 $
*/
public final class ManifestUtil
{
/**
* The Name Attribute is the first in a named section
*/
- public final static String ATTRIBUTE_NAME = "Name";
+ public static final String ATTRIBUTE_NAME = "Name";
/**
* The From Header is disallowed in a Manifest
*/
- public final static String ATTRIBUTE_FROM = "From";
+ public static final String ATTRIBUTE_FROM = "From";
/**
* The Class-Path Header is special - it can be duplicated
*/
- public final static String ATTRIBUTE_CLASSPATH = Attributes.Name.CLASS_PATH.toString();
+ public static final String ATTRIBUTE_CLASSPATH = Attributes.Name.CLASS_PATH.toString();
/**
* Default Manifest version if one is not specified
*/
- public final static String DEFAULT_MANIFEST_VERSION = "1.0";
+ public static final String DEFAULT_MANIFEST_VERSION = "1.0";
/**
* The max length of a line in a Manifest
*/
- public final static int MAX_LINE_LENGTH = 70;
+ public static final int MAX_LINE_LENGTH = 70;
public static Attribute buildAttribute( final String line )
throws ManifestException
1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/net/Action.java
Index: Action.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/net/Action.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Action.java 14 Apr 2002 09:31:51 -0000 1.1
+++ Action.java 6 May 2002 09:29:45 -0000 1.2
@@ -13,7 +13,7 @@
public class Action
extends EnumeratedAttribute
{
- private final static String[] validActions = new String[]
+ private static final String[] validActions = new String[]
{
"send", "put", "recv", "get", "del", "delete", "list", "mkdir"
};
1.2 +7 -7 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/net/FTP.java
Index: FTP.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/net/FTP.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FTP.java 14 Apr 2002 09:31:51 -0000 1.1
+++ FTP.java 6 May 2002 09:29:45 -0000 1.2
@@ -54,13 +54,13 @@
public class FTP
extends AbstractTask
{
- 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 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 final static String[] ACTION_STRS = new String[]
+ protected static final String[] ACTION_STRS = new String[]
{
"sending",
"getting",
@@ -69,7 +69,7 @@
"making directory"
};
- protected final static String[] COMPLETED_ACTION_STRS = new String[]
+ protected static final String[] COMPLETED_ACTION_STRS = new String[]
{
"sent",
"retrieved",
1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java
Index: DefaultRmicAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultRmicAdapter.java 14 Apr 2002 09:31:51 -0000 1.1
+++ DefaultRmicAdapter.java 6 May 2002 09:29:45 -0000 1.2
@@ -33,7 +33,7 @@
implements RmicAdapter
{
- private final static Random rand = new Random();
+ private static final Random rand = new Random();
private Rmic attributes;
private FileNameMapper mapper;
1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java
Index: Rmic.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Rmic.java 14 Apr 2002 09:31:51 -0000 1.1
+++ Rmic.java 6 May 2002 09:29:45 -0000 1.2
@@ -57,7 +57,7 @@
public class Rmic extends MatchingTask
{
- private final static String FAIL_MSG
+ private static final String FAIL_MSG
= "Rmic failed, messages should have been provided.";
private boolean verify;
1.2 +18 -18 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/text/FixCRLF.java
Index: FixCRLF.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/text/FixCRLF.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FixCRLF.java 14 Apr 2002 09:31:52 -0000 1.1
+++ FixCRLF.java 6 May 2002 09:29:45 -0000 1.2
@@ -70,32 +70,32 @@
*
* @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
* @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
- * @version $Revision: 1.1 $ $Name: $
+ * @version $Revision: 1.2 $ $Name: $
*/
public class FixCRLF
extends MatchingTask
{
- private final static int UNDEF = -1;
- private final static int NOTJAVA = 0;
- private final static int LOOKING = 1;
- private final static int IN_CHAR_CONST = 2;
- private final static int IN_STR_CONST = 3;
- private final static int IN_SINGLE_COMMENT = 4;
- private final static int IN_MULTI_COMMENT = 5;
+ private static final int UNDEF = -1;
+ private static final int NOTJAVA = 0;
+ private static final int LOOKING = 1;
+ private static final int IN_CHAR_CONST = 2;
+ private static final int IN_STR_CONST = 3;
+ private static final int IN_SINGLE_COMMENT = 4;
+ private static final int IN_MULTI_COMMENT = 5;
- private final static int ASIS = 0;
- private final static int CR = 1;
- private final static int LF = 2;
- private final static int CRLF = 3;
- private final static int ADD = 1;
- private final static int REMOVE = -1;
- private final static int SPACES = -1;
- private final static int TABS = 1;
+ private static final int ASIS = 0;
+ private static final int CR = 1;
+ private static final int LF = 2;
+ private static final int CRLF = 3;
+ private static final int ADD = 1;
+ private static final int REMOVE = -1;
+ private static final int SPACES = -1;
+ private static final int TABS = 1;
- private final static int INBUFLEN = 8192;
- private final static int LINEBUFLEN = 200;
+ private static final int INBUFLEN = 8192;
+ private static final int LINEBUFLEN = 200;
- private final static char CTRLZ = '\u001A';
+ private static final char CTRLZ = '\u001A';
private int tablength = 8;
private String spaces = " ";
1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/text/RegularExpression.java
Index: RegularExpression.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/text/RegularExpression.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegularExpression.java 14 Apr 2002 09:31:52 -0000 1.1
+++ RegularExpression.java 6 May 2002 09:29:45 -0000 1.2
@@ -43,7 +43,7 @@
public class RegularExpression
{
// The regular expression factory
- private final static RegexpFactory factory = new RegexpFactory();
+ private static final RegexpFactory factory = new RegexpFactory();
private Regexp m_regexp;
1.2 +20 -20 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/vss/MSVSS.java
Index: MSVSS.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/vss/MSVSS.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MSVSS.java 14 Apr 2002 09:31:52 -0000 1.1
+++ MSVSS.java 6 May 2002 09:29:45 -0000 1.2
@@ -36,71 +36,71 @@
/**
* 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 '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";
/**
*/
- 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-";
private String m_SSDir = "";
private String m_vssLogin = null;
1.2 +4 -4 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/vss/MSVSSHISTORY.java
Index: MSVSSHISTORY.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/vss/MSVSSHISTORY.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MSVSSHISTORY.java 14 Apr 2002 09:31:52 -0000 1.1
+++ MSVSSHISTORY.java 6 May 2002 09:29:45 -0000 1.2
@@ -29,11 +29,11 @@
public class MSVSSHISTORY extends MSVSS
{
- 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";
private String m_FromDate = null;
private String m_ToDate = null;
1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/vss/MSVSSLABEL.java
Index: MSVSSLABEL.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/vss/MSVSSLABEL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MSVSSLABEL.java 14 Apr 2002 09:31:52 -0000 1.1
+++ MSVSSLABEL.java 6 May 2002 09:29:45 -0000 1.2
@@ -155,7 +155,7 @@
public class MSVSSLABEL extends MSVSS
{
- public final static String FLAG_LABEL = "-L";
+ public static final String FLAG_LABEL = "-L";
private String m_AutoResponse = null;
private String m_Label = null;
private String m_Version = null;
1.2 +2 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/types/ScannerUtil.java
Index: ScannerUtil.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/types/ScannerUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ScannerUtil.java 14 Apr 2002 09:31:52 -0000 1.1
+++ ScannerUtil.java 6 May 2002 09:29:46 -0000 1.2
@@ -26,14 +26,14 @@
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
* @author Arnout J. Kuiper <a href="mailto:ajkuiper@wxs.nl">ajkuiper@wxs.nl</a>
* @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
- * @version $Revision: 1.1 $ $Date: 2002/04/14 09:31:52 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/06 09:29:46 $
*/
public class ScannerUtil
{
/**
* Patterns that should be excluded by default.
*/
- public final static String[] DEFAULTEXCLUDES = new String[]
+ public static final String[] DEFAULTEXCLUDES = new String[]
{
"**/*~",
"**/#*#",
1.2 +3 -3 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/regexp/RegexpMatcherFactory.java
Index: RegexpMatcherFactory.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/regexp/RegexpMatcherFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegexpMatcherFactory.java 14 Apr 2002 09:31:53 -0000 1.1
+++ RegexpMatcherFactory.java 6 May 2002 09:29:46 -0000 1.2
@@ -22,9 +22,9 @@
*/
public class RegexpMatcherFactory
{
- protected final static String JAKARTA_REGEXP = "org.apache.tools.ant.util.regexp.JakartaRegexpRegexp";
- protected final static String JAKARTA_ORO = "org.apache.tools.ant.util.regexp.JakartaOroRegexp";
- protected final static String JDK14_REGEXP = "org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp";
+ protected static final String JAKARTA_REGEXP = "org.apache.tools.ant.util.regexp.JakartaRegexpRegexp";
+ protected static final String JAKARTA_ORO = "org.apache.tools.ant.util.regexp.JakartaOroRegexp";
+ protected static final String JDK14_REGEXP = "org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp";
/**
* Create a new regular expression instance.
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>