diff --git a/proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java b/proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java index 7a700780a..3d1a76924 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java @@ -22,7 +22,7 @@ import org.apache.avalon.excalibur.bzip2.CBZip2InputStream; public class BUnzip2 extends Unpack { - private final static String DEFAULT_EXTENSION = ".bz2"; + private static final String DEFAULT_EXTENSION = ".bz2"; protected String getDefaultExtension() { diff --git a/proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java b/proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java index 729fab09b..d943490d2 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java @@ -23,7 +23,7 @@ import org.apache.myrmidon.api.TaskException; public class BZip2 extends Pack { - private final static byte[] HEADER = new byte[]{(byte)'B', (byte)'Z'}; + private static final byte[] HEADER = new byte[]{(byte)'B', (byte)'Z'}; protected OutputStream getPackingStream( OutputStream output ) throws TaskException, IOException diff --git a/proposal/myrmidon/src/java/org/apache/antlib/archive/GUnzip.java b/proposal/myrmidon/src/java/org/apache/antlib/archive/GUnzip.java index 3388836ef..e77b37e4e 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/archive/GUnzip.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/archive/GUnzip.java @@ -23,7 +23,7 @@ import org.apache.myrmidon.api.TaskException; public class GUnzip extends Unpack { - private final static String DEFAULT_EXTENSION = ".gz"; + private static final String DEFAULT_EXTENSION = ".gz"; protected String getDefaultExtension() { diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/BuildNumber.java b/proposal/myrmidon/src/java/org/apache/antlib/build/BuildNumber.java index 9130ad0c0..023a90568 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/build/BuildNumber.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/build/BuildNumber.java @@ -33,7 +33,7 @@ import org.apache.myrmidon.api.TaskException; public class BuildNumber extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( BuildNumber.class ); /** diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java b/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java index 395bf3d36..22739882a 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java @@ -26,7 +26,7 @@ import org.apache.tools.todo.types.Commandline; public class Patch extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( Patch.class ); private File m_originalFile; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java b/proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java index 5c995be98..84df99859 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java @@ -22,7 +22,7 @@ import org.apache.myrmidon.api.TaskException; public class SleepTask extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( SleepTask.class ); private int m_seconds; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/AntCallTask.java b/proposal/myrmidon/src/java/org/apache/antlib/core/AntCallTask.java index 8acbff796..26da9011b 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/AntCallTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/AntCallTask.java @@ -22,7 +22,7 @@ import org.apache.myrmidon.interfaces.model.Project; */ public class AntCallTask extends AbstractAntTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( AntCallTask.class ); private String m_project; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/AntParam.java b/proposal/myrmidon/src/java/org/apache/antlib/core/AntParam.java index 30a9a2206..54736fcde 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/AntParam.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/AntParam.java @@ -21,7 +21,7 @@ import org.apache.myrmidon.api.TaskException; */ public class AntParam { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( AntParam.class ); private String m_name; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/FileTokenSet.java b/proposal/myrmidon/src/java/org/apache/antlib/core/FileTokenSet.java index 31a2140b8..c48a2921e 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/FileTokenSet.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/FileTokenSet.java @@ -30,7 +30,7 @@ import org.apache.myrmidon.framework.filters.TokenSet; public class FileTokenSet implements TokenSet { - private final static Resources REZ + private static final Resources REZ = ResourceManager.getPackageResources( FileTokenSet.class ); private Map m_tokens = new HashMap(); diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java b/proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java index 1e01b574d..6322ef6c3 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java @@ -28,7 +28,7 @@ import org.apache.myrmidon.framework.conditions.NotCondition; public class IfTask extends AbstractContainerTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( IfTask.class ); private Condition m_condition; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java b/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java index c59cbfd7d..dcbd2b4ba 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java @@ -26,7 +26,7 @@ import org.apache.myrmidon.api.TaskException; public class LoadProperties extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( LoadProperties.class ); private String m_prefix; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java b/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java index 703d53d52..0bfb56e63 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java @@ -25,7 +25,7 @@ import org.apache.myrmidon.framework.DataType; public class Property extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( Property.class ); private String m_name; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java index 8fa33b477..5f7e9b71d 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java @@ -24,7 +24,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class StringToEnumConverter implements Converter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( StringToEnumConverter.class ); public Object convert( final Class destination, diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java index 4643d07f9..89cd1ab40 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java @@ -24,7 +24,7 @@ import org.apache.myrmidon.api.TaskException; public class StringToFileConverter extends AbstractConverter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( StringToFileConverter.class ); public StringToFileConverter() diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/TryCatchTask.java b/proposal/myrmidon/src/java/org/apache/antlib/core/TryCatchTask.java index c6e746776..7e29d2592 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/TryCatchTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/TryCatchTask.java @@ -25,7 +25,7 @@ import org.apache.myrmidon.framework.TaskList; public final class TryCatchTask extends AbstractContainerTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( TryCatchTask.class ); private TaskList m_try; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java index a4d69c04b..97ef34c51 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java @@ -29,7 +29,7 @@ import org.apache.myrmidon.api.TaskException; public class CVSPass extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( CVSPass.class ); /** @@ -50,7 +50,7 @@ public class CVSPass /** * Array contain char conversion data */ - private final static char[] c_shifts = new char[] + private static final char[] c_shifts = new char[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, diff --git a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/ChangeLog.java b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/ChangeLog.java index 6dbde7cfb..04ae0358f 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/ChangeLog.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/ChangeLog.java @@ -60,7 +60,7 @@ import org.apache.tools.todo.types.Commandline; public class ChangeLog extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( ChangeLog.class ); /** User list */ diff --git a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CvsUser.java b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CvsUser.java index fa0b34aea..d70960375 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CvsUser.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CvsUser.java @@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; */ public class CvsUser { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( CvsUser.class ); private String m_userID; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java b/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java index 9c04c0c68..b5a72d518 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java @@ -100,17 +100,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 EXE_NAME = "csc"; + private static final String EXE_NAME = "csc"; /** * what is the file extension we search on? */ - private final static String FILE_EXT = "cs"; + private static final String FILE_EXT = "cs"; /** * derive the search pattern from the extension */ - private final static String FILE_PATTERN = "**/*." + FILE_EXT; + private static final String FILE_PATTERN = "**/*." + FILE_EXT; /** * Fix C# reference inclusion. C# is really dumb in how it handles @@ -125,7 +125,7 @@ public class CSharp * system exactly so may work on a unix box too. */ - private final static String DEFAULT_REFERENCE_LIST = + private static final String DEFAULT_REFERENCE_LIST = "Accessibility.dll;" + "cscompmgd.dll;" + "CustomMarshalers.dll;" + diff --git a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java b/proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java index 4dd9f2077..d74e9aa0c 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java @@ -44,17 +44,17 @@ public class Ilasm * name of the executable. the .exe suffix is deliberately not included in * anticipation of the unix version */ - private final static String EXE_NAME = "ilasm"; + private static final String EXE_NAME = "ilasm"; /** * what is the file extension we search on? */ - private final static String FILE_EXT = "il"; + private static final String FILE_EXT = "il"; /** * and now derive the search pattern from the extension */ - private final static String FILE_PATTERN = "**/*." + FILE_EXT; + private static final String FILE_PATTERN = "**/*." + FILE_EXT; /** * debug flag. Controls generation of debug information. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java b/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java index 8a452b598..ab92cf20a 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java @@ -39,7 +39,7 @@ import org.apache.tools.todo.util.mappers.IdentityMapper; public class CopyTask extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( CopyTask.class ); private File m_file; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java b/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java index 19fb65a28..e57212c24 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java @@ -31,7 +31,7 @@ import org.apache.tools.todo.types.ScannerUtil; public class Delete extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( Delete.class ); private final ArrayList filesets = new ArrayList(); diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java b/proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java index 6b14be31d..2e9e40452 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java @@ -24,7 +24,7 @@ import org.apache.myrmidon.api.TaskException; public class Mkdir extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( Mkdir.class ); private File m_dir; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java b/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java index 09b43cd31..eb90c4e7e 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java @@ -37,7 +37,7 @@ import org.apache.tools.todo.types.ScannerUtil; public class Touch extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( Touch.class ); private long m_millis = -1; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java index c32d52f80..177137609 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java @@ -27,7 +27,7 @@ import org.apache.myrmidon.api.TaskException; public class LoadEnvironment extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( LoadEnvironment.class ); private String m_prefix; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java b/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java index f71434183..fbb1dc124 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java @@ -27,7 +27,7 @@ public class Facility extends AbstractContainerTask implements Configurable { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( Facility.class ); private String m_namespace; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java b/proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java index ae597ce20..0bd382916 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java @@ -25,7 +25,7 @@ import org.apache.myrmidon.interfaces.deployer.TypeDeployer; public class Import extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( Import.class ); private File m_lib; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/runtime/TypeAvailableCondition.java b/proposal/myrmidon/src/java/org/apache/antlib/runtime/TypeAvailableCondition.java index 29b7f410d..ee3ab6677 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/runtime/TypeAvailableCondition.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/runtime/TypeAvailableCondition.java @@ -29,7 +29,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class TypeAvailableCondition implements Condition { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( TypeAvailableCondition.class ); private String m_roleShorthand; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java b/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java index f18eedc6c..4492a1352 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java @@ -34,7 +34,7 @@ import org.apache.myrmidon.interfaces.workspace.Workspace; public class SoundTask extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( SoundTask.class ); private BuildAlert m_success; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java index a6c8d946a..798f31f0b 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java @@ -28,7 +28,7 @@ import org.apache.myrmidon.api.TaskException; public class CopyFilesTask extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( CopyFilesTask.class ); private FileObject m_srcFile; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java index a12597637..12bdbbe65 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java @@ -30,7 +30,7 @@ import org.apache.myrmidon.api.TaskException; public class DefaultFileSet implements FileSet { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultFileSet.class ); private FileObject m_dir; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java index 613444434..481da5574 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java @@ -24,7 +24,7 @@ import org.apache.myrmidon.api.TaskContext; public class StringToFileObjectConverter extends AbstractConverter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( StringToFileObjectConverter.class ); public StringToFileObjectConverter() diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java index 1219ebcfd..dc241cf17 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java @@ -27,7 +27,7 @@ import org.apache.oro.text.regex.Perl5Matcher; public abstract class AbstractNameFileSelector implements FileSelector { - private final static Resources REZ + private static final Resources REZ = ResourceManager.getPackageResources( AbstractNameFileSelector.class ); private Object m_type; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java index 2790e9af7..f7efe586c 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java @@ -25,7 +25,7 @@ import org.apache.myrmidon.framework.conditions.Condition; public class FileTestCondition implements Condition { - private final static Resources REZ + private static final Resources REZ = ResourceManager.getPackageResources( FileTestCondition.class ); private FileObject m_file; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java index a5b8b9c94..aabed0d5f 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java @@ -23,7 +23,7 @@ import org.apache.myrmidon.api.TaskException; public class NameFileSelector extends AbstractNameFileSelector { - private final static Resources REZ + private static final Resources REZ = ResourceManager.getPackageResources( NameFileSelector.class ); /** diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java index b0ef60acf..e4019f35c 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java @@ -24,7 +24,7 @@ import org.apache.myrmidon.api.TaskException; public class NotFileSelector implements FileSelector { - private final static Resources REZ + private static final Resources REZ = ResourceManager.getPackageResources( NotFileSelector.class ); private FileSelector m_selector; diff --git a/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractConverter.java index a915bbc77..ee364be7d 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractConverter.java @@ -19,7 +19,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public abstract class AbstractConverter implements Converter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( AbstractConverter.class ); private final Class m_source; diff --git a/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractMasterConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractMasterConverter.java index eb15f144f..18799d412 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractMasterConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractMasterConverter.java @@ -35,7 +35,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public abstract class AbstractMasterConverter implements Converter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( AbstractMasterConverter.class ); /** diff --git a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToBooleanConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToBooleanConverter.java index a837fafc4..9d165e260 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToBooleanConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToBooleanConverter.java @@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class StringToBooleanConverter extends AbstractConverter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( StringToBooleanConverter.class ); public StringToBooleanConverter() diff --git a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToByteConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToByteConverter.java index 2abe41bea..3f48ddcc2 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToByteConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToByteConverter.java @@ -24,7 +24,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class StringToByteConverter extends AbstractConverter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( StringToByteConverter.class ); public StringToByteConverter() diff --git a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToClassConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToClassConverter.java index 436192fc7..3c56e4a74 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToClassConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToClassConverter.java @@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class StringToClassConverter extends AbstractConverter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( StringToClassConverter.class ); public StringToClassConverter() diff --git a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDateConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDateConverter.java index 92fb178b2..9ceb1ac5b 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDateConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDateConverter.java @@ -27,7 +27,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class StringToDateConverter extends AbstractConverter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( StringToDateConverter.class ); public StringToDateConverter() diff --git a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDoubleConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDoubleConverter.java index a648014d6..f34fe778a 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDoubleConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDoubleConverter.java @@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class StringToDoubleConverter extends AbstractConverter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( StringToDoubleConverter.class ); public StringToDoubleConverter() diff --git a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFloatConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFloatConverter.java index 71659d7f3..a092dd7ee 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFloatConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFloatConverter.java @@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class StringToFloatConverter extends AbstractConverter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( StringToFloatConverter.class ); public StringToFloatConverter() diff --git a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToIntegerConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToIntegerConverter.java index 8bb17c516..e6d5237b0 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToIntegerConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToIntegerConverter.java @@ -25,7 +25,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class StringToIntegerConverter extends AbstractConverter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( StringToFloatConverter.class ); public StringToIntegerConverter() diff --git a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToLongConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToLongConverter.java index 4c098e9e5..e7e191f1d 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToLongConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToLongConverter.java @@ -24,7 +24,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class StringToLongConverter extends AbstractConverter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( StringToLongConverter.class ); public StringToLongConverter() diff --git a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToShortConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToShortConverter.java index 1a8944cc0..6d873c7a2 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToShortConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToShortConverter.java @@ -24,7 +24,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class StringToShortConverter extends AbstractConverter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( StringToShortConverter.class ); public StringToShortConverter() diff --git a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToURLConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToURLConverter.java index 17e13104a..92224ee03 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToURLConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToURLConverter.java @@ -23,7 +23,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class StringToURLConverter extends AbstractConverter { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( StringToURLConverter.class ); public StringToURLConverter() diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/Os.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/Os.java index 19fc1cab5..652246cdf 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/Os.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/Os.java @@ -22,50 +22,50 @@ import java.util.Set; */ public class Os { - private final static String OS_NAME = + private static final String OS_NAME = System.getProperty( "os.name" ).toLowerCase( Locale.US ); - private final static String OS_ARCH = + private static final String OS_ARCH = System.getProperty( "os.arch" ).toLowerCase( Locale.US ); - private final static String OS_VERSION = + private static final String OS_VERSION = System.getProperty( "os.version" ).toLowerCase( Locale.US ); - private final static String PATH_SEP = + private static final String PATH_SEP = System.getProperty( "path.separator" ); - private final static OsFamily OS_FAMILY; - private final static OsFamily[] OS_ALL_FAMILIES; + private static final OsFamily OS_FAMILY; + private static final OsFamily[] OS_ALL_FAMILIES; /** All Windows based OSes. */ - public final static OsFamily OS_FAMILY_WINDOWS = new OsFamily( "windows" ); + public static final OsFamily OS_FAMILY_WINDOWS = new OsFamily( "windows" ); /** All DOS based OSes. */ - public final static OsFamily OS_FAMILY_DOS = new OsFamily( "dos" ); + public static final OsFamily OS_FAMILY_DOS = new OsFamily( "dos" ); /** All Windows NT based OSes. */ - public final static OsFamily OS_FAMILY_WINNT = + public static final OsFamily OS_FAMILY_WINNT = new OsFamily( "nt", new OsFamily[]{OS_FAMILY_WINDOWS} ); /** All Windows 9x based OSes. */ - public final static OsFamily OS_FAMILY_WIN9X = + public static final OsFamily OS_FAMILY_WIN9X = new OsFamily( "win9x", new OsFamily[]{OS_FAMILY_WINDOWS, OS_FAMILY_DOS} ); /** OS/2 */ - public final static OsFamily OS_FAMILY_OS2 = + public static final OsFamily OS_FAMILY_OS2 = new OsFamily( "os/2", new OsFamily[]{OS_FAMILY_DOS} ); /** Netware */ - public final static OsFamily OS_FAMILY_NETWARE = + public static final OsFamily OS_FAMILY_NETWARE = new OsFamily( "netware" ); /** All UNIX based OSes. */ - public final static OsFamily OS_FAMILY_UNIX = new OsFamily( "unix" ); + public static final OsFamily OS_FAMILY_UNIX = new OsFamily( "unix" ); /** All Mac based OSes. */ - public final static OsFamily OS_FAMILY_MAC = new OsFamily( "mac" ); + public static final OsFamily OS_FAMILY_MAC = new OsFamily( "mac" ); /** OSX */ - public final static OsFamily OS_FAMILY_OSX = + public static final OsFamily OS_FAMILY_OSX = new OsFamily( "osx", new OsFamily[]{OS_FAMILY_UNIX, OS_FAMILY_MAC} ); - private final static OsFamily[] ALL_FAMILIES = new OsFamily[] + private static final OsFamily[] ALL_FAMILIES = new OsFamily[] { OS_FAMILY_DOS, OS_FAMILY_MAC, diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/Environment.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/Environment.java index c21a9f5bc..dfb042146 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/Environment.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/Environment.java @@ -30,12 +30,12 @@ import org.apache.avalon.excalibur.util.StringUtil; */ final class Environment { - private final static String[] COMMAND_COM = new String[]{"command.com", "/c", "set"}; - private final static String[] CMD_EXE = new String[]{"cmd", "/c", "set"}; + private static final String[] COMMAND_COM = new String[]{"command.com", "/c", "set"}; + private static final String[] CMD_EXE = new String[]{"cmd", "/c", "set"}; // Alternatively one could use: /bin/sh -c env - private final static String[] ENV_CMD = new String[]{"/usr/bin/env"}; - private final static String[] ENV_RAW = new String[]{"env"}; + private static final String[] ENV_CMD = new String[]{"/usr/bin/env"}; + private static final String[] ENV_RAW = new String[]{"env"}; /** * This is a cached version of the native environment variables. diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java index e56313d84..c7266a39a 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java @@ -29,16 +29,16 @@ class ProcessMonitor { //Time to sleep in loop while processing output //of command and monitoring for timeout - private final static int SLEEP_TIME = 5; + private static final int SLEEP_TIME = 5; //State to indicate process is still running - private final static int STATE_RUNNING = 0; + private static final int STATE_RUNNING = 0; //State to indicate process shutdown by itself - private final static int STATE_STOPPED = 1; + private static final int STATE_STOPPED = 1; //State to indicate process was terminated due to timeout - private final static int STATE_TERMINATED = 2; + private static final int STATE_TERMINATED = 2; /** * The state of the process monitor and thus diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java index 0669e3cee..605ebfeb6 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java @@ -28,10 +28,10 @@ import org.apache.avalon.excalibur.i18n.Resources; public class DefaultCommandLauncher implements CommandLauncher { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultCommandLauncher.class ); - private final static Method c_execWithCWD; + private static final Method c_execWithCWD; static { diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java index d0b0e8ea6..d3b925a8b 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java @@ -26,7 +26,7 @@ class ExecUtil /** * The file representing the current working directory. */ - private final static File c_cwd; + private static final File c_cwd; static { diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java index 66d9ec8fd..69b2b31c2 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java @@ -17,19 +17,19 @@ import org.apache.avalon.excalibur.i18n.Resources; */ public final class FileType { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( FileType.class ); /** * A folder, which can contain other files, but does not have any data * content. */ - public final static FileType FOLDER = new FileType( REZ.getString( "folder.name" ) ); + public static final FileType FOLDER = new FileType( REZ.getString( "folder.name" ) ); /** * A regular file, which has data content, but cannot contain other files. */ - public final static FileType FILE = new FileType( REZ.getString( "file.name" ) ); + public static final FileType FILE = new FileType( REZ.getString( "file.name" ) ); private String m_name; diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/NameScope.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/NameScope.java index ffd61771d..e730a4c73 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/NameScope.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/NameScope.java @@ -20,14 +20,14 @@ public final class NameScope * as described by {@link #FILE_SYSTEM}. However, an exception is * thrown if the resolved file is not a direct child of the base file. */ - public final static NameScope CHILD = new NameScope( "child" ); + public static final NameScope CHILD = new NameScope( "child" ); /** * Resolve against the descendents of the base file. The name is resolved * as described by {@link #FILE_SYSTEM}. However, an exception is thrown * if the resolved file is not a descendent of the base file. */ - public final static NameScope DESCENDENT = new NameScope( "descendent" ); + public static final NameScope DESCENDENT = new NameScope( "descendent" ); /** * Resolve against files in the same file system as the base file. @@ -44,7 +44,7 @@ public final class NameScope *

A path is considered absolute if it starts with a separator character, * and relative if it does not. */ - public final static NameScope FILE_SYSTEM = new NameScope( "filesystem" ); + public static final NameScope FILE_SYSTEM = new NameScope( "filesystem" ); private String m_name; diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java index f3b3aebd9..7bed643da 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java @@ -28,7 +28,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class DefaultFileSystemManager implements FileSystemManager { - private final static Resources REZ + private static final Resources REZ = ResourceManager.getPackageResources( DefaultFileSystemManager.class ); /** The default provider. */ diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java index cedc0b453..103a8883a 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java @@ -31,10 +31,10 @@ import org.apache.avalon.excalibur.io.IOUtil; public abstract class AbstractFileObject implements FileObject { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( AbstractFileObject.class ); - private final static FileObject[] EMPTY_FILE_ARRAY = {}; + private static final FileObject[] EMPTY_FILE_ARRAY = {}; private FileName m_name; private AbstractFileSystem m_fs; diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileSystemProvider.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileSystemProvider.java index f3e6e0d92..ea143b2e5 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileSystemProvider.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileSystemProvider.java @@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public abstract class AbstractFileSystemProvider implements FileSystemProvider { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( AbstractFileSystemProvider.class ); private FileSystemProviderContext m_context; diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/DefaultFileContent.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/DefaultFileContent.java index f15ca60f7..fed48eed6 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/DefaultFileContent.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/DefaultFileContent.java @@ -26,12 +26,12 @@ import org.apache.avalon.excalibur.i18n.Resources; public class DefaultFileContent implements FileContent { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultFileContent.class ); - private final static int STATE_NONE = 0; - private final static int STATE_READING = 1; - private final static int STATE_WRITING = 2; + private static final int STATE_NONE = 0; + private static final int STATE_READING = 1; + private static final int STATE_WRITING = 2; private AbstractFileObject m_file; private int _state = STATE_NONE; diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/UriParser.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/UriParser.java index 8b6c85e17..298b1fca2 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/UriParser.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/UriParser.java @@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources; */ public class UriParser { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( UriParser.class ); /** The normalised separator to use. */ diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java index f1de1ec7f..7c71fc1f3 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java @@ -25,10 +25,10 @@ import org.apache.avalon.excalibur.i18n.Resources; class FtpFileObject extends AbstractFileObject { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( FtpFileObject.class ); - private final static FTPFile[] EMPTY_FTP_FILE_ARRAY = {}; + private static final FTPFile[] EMPTY_FTP_FILE_ARRAY = {}; private FtpFileSystem m_ftpFs; diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java index b47e3b63e..dd4cf4c9f 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java @@ -26,7 +26,7 @@ import org.apache.avalon.excalibur.i18n.Resources; class FtpFileSystem extends AbstractFileSystem { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( FtpFileSystem.class ); private FTPClient m_client; diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/GenericFileNameParser.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/GenericFileNameParser.java index 042c2451e..31ef0524a 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/GenericFileNameParser.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/GenericFileNameParser.java @@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.i18n.Resources; class GenericFileNameParser extends LocalFileNameParser { - private final static Resources REZ + private static final Resources REZ = ResourceManager.getPackageResources( GenericFileNameParser.class ); /** diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFile.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFile.java index f9fe1c4b0..a0d04cfc5 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFile.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFile.java @@ -30,7 +30,7 @@ final class LocalFile extends AbstractFileObject implements FileObject { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( LocalFile.class ); private File m_file; diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/WindowsFileNameParser.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/WindowsFileNameParser.java index 1d2931b08..f9a5413a7 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/WindowsFileNameParser.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/WindowsFileNameParser.java @@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.i18n.Resources; class WindowsFileNameParser extends LocalFileNameParser { - private final static Resources REZ + private static final Resources REZ = ResourceManager.getPackageResources( WindowsFileNameParser.class ); /** diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java index 2f0248854..d5bef9099 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java @@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class SmbFileNameParser extends UriParser { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( SmbFileNameParser.class ); /** diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileObject.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileObject.java index 044bfea4b..ed7dfe26d 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileObject.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileObject.java @@ -29,7 +29,7 @@ public class SmbFileObject extends AbstractFileObject implements FileObject { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( SmbFileObject.class ); private String m_fileName; diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java index 4f9624184..c10d2a9ab 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java @@ -28,7 +28,7 @@ import org.apache.avalon.excalibur.i18n.Resources; */ public class ZipFileSystem extends AbstractFileSystem implements FileSystem { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( ZipFileSystem.class ); private File m_file; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java index 2546c5c3c..dff4f14a0 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java @@ -29,7 +29,7 @@ import org.apache.myrmidon.interfaces.aspect.AspectManager; public class DefaultAspectManager implements AspectManager, Initializable { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultAspectManager.class ); private HashMap m_aspectMap = new HashMap(); diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java index ed38af6f0..b013c552d 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java @@ -35,7 +35,7 @@ public class ATIProjectBuilder extends DefaultProjectBuilder implements Parameterizable { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( ATIProjectBuilder.class ); private Parameters m_parameters; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProject.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProject.java index 9d883548a..454dc9091 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProject.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProject.java @@ -25,7 +25,7 @@ import org.apache.myrmidon.interfaces.model.TypeLib; public class DefaultProject implements Project { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultProject.class ); ///The imports diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java index 5938b69e8..75569585c 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java @@ -42,15 +42,15 @@ public class DefaultProjectBuilder extends AbstractLogEnabled implements ProjectBuilder { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultProjectBuilder.class ); - private final static Version VERSION = new Version( 2, 0, 0 ); + private static final Version VERSION = new Version( 2, 0, 0 ); - private final static int PROJECT_REFERENCES = 0; - private final static int LIBRARY_IMPORTS = 1; - private final static int IMPLICIT_TASKS = 2; - private final static int TARGETS = 3; + private static final int PROJECT_REFERENCES = 0; + private static final int LIBRARY_IMPORTS = 1; + private static final int IMPLICIT_TASKS = 2; + private static final int TARGETS = 3; // Use a name validator with the default rules. private DefaultNameValidator m_nameValidator = new DefaultNameValidator(); diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/TransformingProjectBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/TransformingProjectBuilder.java index 64fe83b26..58b8c9eb1 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/TransformingProjectBuilder.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/TransformingProjectBuilder.java @@ -32,10 +32,10 @@ import org.apache.myrmidon.interfaces.builder.ProjectException; public class TransformingProjectBuilder extends DefaultProjectBuilder { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( TransformingProjectBuilder.class ); - private final static String STYLESHEET = "ant1convert.xsl"; + private static final String STYLESHEET = "ant1convert.xsl"; private Transformer m_transformer; protected Configuration parseProject( String systemID ) diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/classloader/DefaultClassLoaderManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/classloader/DefaultClassLoaderManager.java index 24ee439c9..e72328a0c 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/classloader/DefaultClassLoaderManager.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/classloader/DefaultClassLoaderManager.java @@ -43,7 +43,7 @@ public class DefaultClassLoaderManager extends AbstractLogEnabled implements ClassLoaderManager, Serviceable, Initializable { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultClassLoaderManager.class ); /** diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java index 8b0109d85..fc5681c82 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java @@ -40,7 +40,7 @@ public class DefaultConfigurer extends AbstractLogEnabled implements Configurer, Serviceable, LogEnabled { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultConfigurer.class ); ///Converter to use for converting between values diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java index 0c8c15acf..5ed17dc33 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java @@ -29,7 +29,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException; class DefaultObjectConfigurer implements ObjectConfigurer { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultObjectConfigurer.class ); private final Class m_class; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java index 5b13bae17..72c28f956 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java @@ -23,7 +23,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException; class DefaultPropertyConfigurer implements PropertyConfigurer { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultPropertyConfigurer.class ); private final int m_propertyIndex; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java index bce695e0f..2a0fcd4b5 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java @@ -42,7 +42,7 @@ public class DefaultDeployer extends AbstractLogEnabled implements Deployer, Serviceable { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultDeployer.class ); // The components used to deploy diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java index be6c97efc..5b842e6a8 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java @@ -36,12 +36,12 @@ class Deployment extends AbstractLogEnabled implements TypeDeployer { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( Deployment.class ); - private final static String TYPE_DESCRIPTOR_NAME = "META-INF/ant-descriptor.xml"; - private final static String ROLE_DESCRIPTOR_NAME = "META-INF/ant-roles.xml"; - private final static String SERVICE_DESCRIPTOR_NAME = "META-INF/ant-services.xml"; + private static final String TYPE_DESCRIPTOR_NAME = "META-INF/ant-descriptor.xml"; + private static final String ROLE_DESCRIPTOR_NAME = "META-INF/ant-roles.xml"; + private static final String SERVICE_DESCRIPTOR_NAME = "META-INF/ant-services.xml"; private ClassLoader m_classLoader; private DefaultDeployer m_deployer; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/RoleDescriptorBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/RoleDescriptorBuilder.java index 550135bb4..adada066d 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/RoleDescriptorBuilder.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/RoleDescriptorBuilder.java @@ -22,10 +22,10 @@ import org.apache.myrmidon.interfaces.deployer.DeploymentException; class RoleDescriptorBuilder implements DescriptorBuilder { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( RoleDescriptorBuilder.class ); - private final static Version ROLE_DESCRIPTOR_VERSION = new Version( 1, 0, 0 ); + private static final Version ROLE_DESCRIPTOR_VERSION = new Version( 1, 0, 0 ); /** * Builds a descriptor from a set of configuration. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/ServiceDescriptorBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/ServiceDescriptorBuilder.java index 4e6598950..7e179875f 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/ServiceDescriptorBuilder.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/ServiceDescriptorBuilder.java @@ -22,10 +22,10 @@ import org.apache.myrmidon.interfaces.deployer.DeploymentException; class ServiceDescriptorBuilder implements DescriptorBuilder { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( ServiceDescriptorBuilder.class ); - private final static Version SERVICE_DESCRIPTOR_VERSION = new Version( 1, 0, 0 ); + private static final Version SERVICE_DESCRIPTOR_VERSION = new Version( 1, 0, 0 ); /** * Builds a descriptor from a set of configuration. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java index cae09db32..f2d8736da 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java @@ -25,10 +25,10 @@ import org.apache.myrmidon.interfaces.deployer.TypeDefinition; class TypeDescriptorBuilder implements DescriptorBuilder { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( TypeDescriptorBuilder.class ); - private final static Version TYPE_DESCRIPTOR_VERSION = new Version( 1, 0, 0 ); + private static final Version TYPE_DESCRIPTOR_VERSION = new Version( 1, 0, 0 ); /** * Builds a descriptor from a set of configuration. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java index 53043fd8e..87dd7abb6 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java @@ -58,7 +58,7 @@ public class DefaultEmbeddor extends AbstractLogEnabled implements Embeddor, Parameterizable, Initializable, Startable, Disposable { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultEmbeddor.class ); /** Package containing the default component implementations. */ diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java index 2ea3786ec..9eb093e41 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java @@ -33,10 +33,10 @@ import org.apache.myrmidon.interfaces.executor.ExecutionFrame; public class AspectAwareExecutor extends DefaultExecutor { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( AspectAwareExecutor.class ); - private final static Configuration[] EMPTY_ELEMENTS = new Configuration[ 0 ]; + private static final Configuration[] EMPTY_ELEMENTS = new Configuration[ 0 ]; private AspectManager m_aspectManager; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java index 707b8cdba..64cfc97b6 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java @@ -34,7 +34,7 @@ public class DefaultExecutor extends AbstractLogEnabled implements Executor, Serviceable { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultExecutor.class ); private Configurer m_configurer; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java index 1c3b6e005..e165203a9 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java @@ -30,7 +30,7 @@ import org.apache.myrmidon.interfaces.property.PropertyResolver; public class DefaultPropertyResolver implements PropertyResolver, Serviceable { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultPropertyResolver.class ); private Converter m_converter; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java index f8b47e9d8..842b2370e 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java @@ -23,7 +23,7 @@ import org.apache.myrmidon.interfaces.role.RoleManager; public class DefaultRoleManager implements RoleManager { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultRoleManager.class ); /** Parent RoleManager for nested resolution */ diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/service/InstantiatingServiceManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/service/InstantiatingServiceManager.java index 654c2bb00..4abd5062a 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/service/InstantiatingServiceManager.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/service/InstantiatingServiceManager.java @@ -49,7 +49,7 @@ public class InstantiatingServiceManager extends AbstractLogEnabled implements ServiceManager, Parameterizable, Serviceable, Disposable { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( InstantiatingServiceManager.class ); /** Map from service class -> service object. */ diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java index d71744014..3ea84061b 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java @@ -28,7 +28,7 @@ import org.apache.myrmidon.interfaces.type.TypeManager; public class DefaultTypeManager implements TypeManager, Serviceable { - private final static Resources REZ + private static final Resources REZ = ResourceManager.getPackageResources( DefaultTypeManager.class ); ///Parent type manager to inherit values from. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java index f1543b81a..f01727781 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java @@ -22,7 +22,7 @@ import org.apache.myrmidon.interfaces.type.TypeFactory; public class MultiSourceTypeFactory implements TypeFactory { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( MultiSourceTypeFactory.class ); ///Parent Selector diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java index bfc80b82a..a71e1f497 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java @@ -31,7 +31,7 @@ import org.apache.myrmidon.interfaces.property.PropertyResolver; public class DefaultTaskContext implements TaskContext { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultTaskContext.class ); // Property name validator allows digits, but no internal whitespace. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java index 81dff63c7..7ec3b2196 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java @@ -49,7 +49,7 @@ public class DefaultWorkspace extends AbstractLogEnabled implements Workspace, Serviceable, Parameterizable, Initializable { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultWorkspace.class ); private Executor m_executor; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/TargetState.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/TargetState.java index 1d89f30c8..bff8bcd37 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/TargetState.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/TargetState.java @@ -21,14 +21,14 @@ final class TargetState } /** Target has not been started. */ - public final static TargetState NOT_STARTED = new TargetState(); + public static final TargetState NOT_STARTED = new TargetState(); /** * Target has been started, and the dependencies of the target are being * traversed. */ - public final static TargetState TRAVERSING = new TargetState(); + public static final TargetState TRAVERSING = new TargetState(); /** Target has been completed. */ - public final static TargetState FINISHED = new TargetState(); + public static final TargetState FINISHED = new TargetState(); } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java index 1edeb0b0d..042cdf1be 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java @@ -34,7 +34,7 @@ import org.apache.myrmidon.interfaces.type.TypeManager; public abstract class AbstractContainerTask extends AbstractTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( AbstractContainerTask.class ); ///For converting own attributes diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractFacadeTask.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractFacadeTask.java index ebe6cee9b..1be8b86c9 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractFacadeTask.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractFacadeTask.java @@ -26,7 +26,7 @@ public abstract class AbstractFacadeTask extends AbstractContainerTask implements Configurable { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( AbstractFacadeTask.class ); /** diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java index 0e63500ff..d431160a2 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java @@ -27,7 +27,7 @@ import org.apache.myrmidon.interfaces.deployer.TypeDeployer; public abstract class AbstractTypeDef extends AbstractContainerTask { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( AbstractTypeDef.class ); // TODO - replace lib with class-path diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java index 30c14239e..b0c2053f0 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java @@ -33,7 +33,7 @@ import org.apache.tools.todo.util.FileUtils; */ public class Execute { - private final static Resources REZ + private static final Resources REZ = ResourceManager.getPackageResources( Execute.class ); private Commandline m_command; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/JavaVersion.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/JavaVersion.java index 8d8ea147e..d8309e237 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/JavaVersion.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/JavaVersion.java @@ -19,13 +19,13 @@ public final class JavaVersion extends ValuedEnum { //standard enums for version of JVM - public final static JavaVersion JAVA1_0 = new JavaVersion( "Java 1.0", 100 ); - public final static JavaVersion JAVA1_1 = new JavaVersion( "Java 1.1", 110 ); - public final static JavaVersion JAVA1_2 = new JavaVersion( "Java 1.2", 120 ); - public final static JavaVersion JAVA1_3 = new JavaVersion( "Java 1.3", 130 ); - public final static JavaVersion JAVA1_4 = new JavaVersion( "Java 1.4", 140 ); + public static final JavaVersion JAVA1_0 = new JavaVersion( "Java 1.0", 100 ); + public static final JavaVersion JAVA1_1 = new JavaVersion( "Java 1.1", 110 ); + public static final JavaVersion JAVA1_2 = new JavaVersion( "Java 1.2", 120 ); + public static final JavaVersion JAVA1_3 = new JavaVersion( "Java 1.3", 130 ); + public static final JavaVersion JAVA1_4 = new JavaVersion( "Java 1.4", 140 ); - private final static JavaVersion CURRENT = determineCurrentJavaVersion(); + private static final JavaVersion CURRENT = determineCurrentJavaVersion(); /** * Method to retrieve the current JVM version. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/LogLevel.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/LogLevel.java index 8ff422e2b..37d7d06d3 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/LogLevel.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/LogLevel.java @@ -23,14 +23,14 @@ public final class LogLevel extends Enum { //Map for all the levels - private final static HashMap c_levels = new HashMap(); + private static final HashMap c_levels = new HashMap(); //standard enums for version of JVM - public final static LogLevel ERROR = new LogLevel( "error" ); - public final static LogLevel WARN = new LogLevel( "warn" ); - public final static LogLevel INFO = new LogLevel( "info" ); - public final static LogLevel VERBOSE = new LogLevel( "verbose" ); - public final static LogLevel DEBUG = new LogLevel( "debug" ); + public static final LogLevel ERROR = new LogLevel( "error" ); + public static final LogLevel WARN = new LogLevel( "warn" ); + public static final LogLevel INFO = new LogLevel( "info" ); + public static final LogLevel VERBOSE = new LogLevel( "verbose" ); + public static final LogLevel DEBUG = new LogLevel( "debug" ); /** * Retrieve the log level for the specified name. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java index cfeeca65e..5fac4e2f4 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java @@ -25,7 +25,7 @@ import org.apache.myrmidon.framework.conditions.NotCondition; public class Pattern implements DataType { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( Pattern.class ); private String m_name; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java index 9d21c3344..683769a1f 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java @@ -25,7 +25,7 @@ public class TypeInstanceTask extends AbstractContainerTask implements Configurable { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( TypeInstanceTask.class ); private String m_id; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java index 2d26a907b..64da4dff0 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java @@ -25,7 +25,7 @@ import org.apache.myrmidon.api.TaskException; public class IsSetCondition implements Condition { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( IsSetCondition.class ); private String m_property; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsTrueCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsTrueCondition.java index 1772659b7..dcd45653c 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsTrueCondition.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsTrueCondition.java @@ -28,7 +28,7 @@ import org.apache.aut.converter.ConverterException; public class IsTrueCondition implements Condition { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( IsTrueCondition.class ); private String m_property; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java index cf36a93ae..c96d50cf5 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java @@ -24,7 +24,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class NotCondition implements Condition { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( NotCondition.class ); private Condition m_condition; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/ExecManagerFactory.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/ExecManagerFactory.java index ac91c15bc..3eb383907 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/ExecManagerFactory.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/ExecManagerFactory.java @@ -27,7 +27,7 @@ import org.apache.myrmidon.interfaces.service.ServiceFactory; public class ExecManagerFactory implements ServiceFactory, Parameterizable { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( ExecManagerFactory.class ); private Parameters m_parameters; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/VfsManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/VfsManager.java index 2d360aebc..2042f0bd0 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/VfsManager.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/VfsManager.java @@ -30,7 +30,7 @@ public class VfsManager extends DefaultFileSystemManager implements Serviceable, Initializable, Disposable { - private final static Resources REZ + private static final Resources REZ = ResourceManager.getPackageResources( VfsManager.class ); private TypeManager m_typeManager; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/VfsManagerFactory.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/VfsManagerFactory.java index 3ba63eadf..b40806c21 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/VfsManagerFactory.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/VfsManagerFactory.java @@ -22,7 +22,7 @@ import org.apache.myrmidon.interfaces.service.ServiceFactory; public class VfsManagerFactory implements ServiceFactory { - private final static Resources REZ + private static final Resources REZ = ResourceManager.getPackageResources( VfsManagerFactory.class ); /** diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters/TokenLineFilter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters/TokenLineFilter.java index 4532f01de..c98f25d2e 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters/TokenLineFilter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters/TokenLineFilter.java @@ -24,12 +24,12 @@ public class TokenLineFilter /** * The default token start string */ - private final static char[] DEFAULT_TOKEN_START = {'@'}; + private static final char[] DEFAULT_TOKEN_START = {'@'}; /** * The default token end string */ - private final static char[] DEFAULT_TOKEN_END = {'@'}; + private static final char[] DEFAULT_TOKEN_END = {'@'}; /** * List of ordered filters and filter files. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/ExecuteJava.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/ExecuteJava.java index 106dd1c11..320197331 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/ExecuteJava.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/ExecuteJava.java @@ -40,7 +40,7 @@ import org.apache.tools.todo.util.FileUtils; */ public class ExecuteJava { - private final static Resources REZ + private static final Resources REZ = ResourceManager.getPackageResources( ExecuteJava.class ); private final Path m_classPath = new Path(); diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/AbstractLogger.java b/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/AbstractLogger.java index bded478ff..eb2e2ae9d 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/AbstractLogger.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/AbstractLogger.java @@ -18,11 +18,11 @@ import org.apache.avalon.framework.logger.Logger; public abstract class AbstractLogger implements Logger { - public final static int LEVEL_DEBUG = 0; - public final static int LEVEL_INFO = 1; - public final static int LEVEL_WARN = 2; - public final static int LEVEL_ERROR = 3; - public final static int LEVEL_FATAL = 4; + public static final int LEVEL_DEBUG = 0; + public static final int LEVEL_INFO = 1; + public static final int LEVEL_WARN = 2; + public static final int LEVEL_ERROR = 3; + public static final int LEVEL_FATAL = 4; /** * Log a debug message. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java b/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java index 1aa045c4b..764123bec 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java @@ -36,28 +36,28 @@ import org.apache.myrmidon.interfaces.executor.Executor; */ public class CLIMain { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( CLIMain.class ); //defines for the Command Line options - private final static int HELP_OPT = 'h'; - private final static int QUIET_OPT = 'q'; - private final static int VERBOSE_OPT = 'v'; - private final static int FILE_OPT = 'f'; - private final static int LOG_LEVEL_OPT = 'l'; - private final static int DEFINE_OPT = 'D'; - private final static int BUILDER_PARAM_OPT = 'B'; - private final static int NO_PREFIX_OPT = 'p'; - private final static int VERSION_OPT = 1; - private final static int LISTENER_OPT = 2; - private final static int TASKLIB_DIR_OPT = 5; - private final static int INCREMENTAL_OPT = 6; - private final static int HOME_DIR_OPT = 7; - private final static int DRY_RUN_OPT = 8; - private final static int DEBUG_OPT = 9; + private static final int HELP_OPT = 'h'; + private static final int QUIET_OPT = 'q'; + private static final int VERBOSE_OPT = 'v'; + private static final int FILE_OPT = 'f'; + private static final int LOG_LEVEL_OPT = 'l'; + private static final int DEFINE_OPT = 'D'; + private static final int BUILDER_PARAM_OPT = 'B'; + private static final int NO_PREFIX_OPT = 'p'; + private static final int VERSION_OPT = 1; + private static final int LISTENER_OPT = 2; + private static final int TASKLIB_DIR_OPT = 5; + private static final int INCREMENTAL_OPT = 6; + private static final int HOME_DIR_OPT = 7; + private static final int DRY_RUN_OPT = 8; + private static final int DEBUG_OPT = 9; //incompatable options for info options - private final static int[] INFO_OPT_INCOMPAT = new int[] + private static final int[] INFO_OPT_INCOMPAT = new int[] { HELP_OPT, QUIET_OPT, VERBOSE_OPT, FILE_OPT, LOG_LEVEL_OPT, BUILDER_PARAM_OPT, NO_PREFIX_OPT, @@ -66,13 +66,13 @@ public class CLIMain }; //incompatable options for other logging options - private final static int[] LOG_OPT_INCOMPAT = new int[] + private static final int[] LOG_OPT_INCOMPAT = new int[] { QUIET_OPT, VERBOSE_OPT, LOG_LEVEL_OPT, DEBUG_OPT }; //incompatible options for listener options - private final static int[] LISTENER_OPT_INCOMPAT = new int[] + private static final int[] LISTENER_OPT_INCOMPAT = new int[] { LISTENER_OPT, NO_PREFIX_OPT }; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/EmbeddedAnt.java b/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/EmbeddedAnt.java index 19e2d3d9c..895905db1 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/EmbeddedAnt.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/EmbeddedAnt.java @@ -38,7 +38,7 @@ import org.apache.myrmidon.listeners.ProjectListener; public class EmbeddedAnt extends AbstractLogEnabled { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( EmbeddedAnt.class ); private static final String DEFAULT_EMBEDDOR_CLASS = diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/DefaultNameValidator.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/DefaultNameValidator.java index eef258c85..f1e14da40 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/DefaultNameValidator.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/DefaultNameValidator.java @@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class DefaultNameValidator implements NameValidator { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultNameValidator.class ); /** diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/service/MultiSourceServiceManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/service/MultiSourceServiceManager.java index 54d1f08f0..63db8f6aa 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/service/MultiSourceServiceManager.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/service/MultiSourceServiceManager.java @@ -23,7 +23,7 @@ import org.apache.avalon.framework.service.ServiceManager; public class MultiSourceServiceManager implements ServiceManager { - private final static Resources REZ + private static final Resources REZ = ResourceManager.getPackageResources( MultiSourceServiceManager.class ); /** The source service managers, in order. */ diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java index 58ecacc3f..ed7b473cc 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java @@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.i18n.Resources; public class DefaultTypeFactory implements TypeFactory { - private final static Resources REZ = + private static final Resources REZ = ResourceManager.getPackageResources( DefaultTypeFactory.class ); ///A Map of shortnames to classnames