Browse Source

final static --> static final to follow JLS recomendations

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272092 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
d11461fa75
100 changed files with 162 additions and 162 deletions
  1. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java
  2. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java
  3. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/archive/GUnzip.java
  4. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/build/BuildNumber.java
  5. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java
  6. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java
  7. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/core/AntCallTask.java
  8. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/core/AntParam.java
  9. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/core/FileTokenSet.java
  10. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java
  11. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java
  12. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/core/Property.java
  13. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java
  14. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java
  15. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/core/TryCatchTask.java
  16. +2
    -2
      proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java
  17. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/cvslib/ChangeLog.java
  18. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/cvslib/CvsUser.java
  19. +4
    -4
      proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java
  20. +3
    -3
      proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java
  21. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java
  22. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java
  23. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java
  24. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java
  25. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java
  26. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java
  27. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java
  28. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/runtime/TypeAvailableCondition.java
  29. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java
  30. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java
  31. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java
  32. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java
  33. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java
  34. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java
  35. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java
  36. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java
  37. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/converter/AbstractConverter.java
  38. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/converter/AbstractMasterConverter.java
  39. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToBooleanConverter.java
  40. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToByteConverter.java
  41. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToClassConverter.java
  42. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDateConverter.java
  43. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDoubleConverter.java
  44. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFloatConverter.java
  45. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToIntegerConverter.java
  46. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToLongConverter.java
  47. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToShortConverter.java
  48. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToURLConverter.java
  49. +16
    -16
      proposal/myrmidon/src/java/org/apache/aut/nativelib/Os.java
  50. +4
    -4
      proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/Environment.java
  51. +4
    -4
      proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java
  52. +2
    -2
      proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java
  53. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java
  54. +3
    -3
      proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java
  55. +3
    -3
      proposal/myrmidon/src/java/org/apache/aut/vfs/NameScope.java
  56. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java
  57. +2
    -2
      proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java
  58. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileSystemProvider.java
  59. +4
    -4
      proposal/myrmidon/src/java/org/apache/aut/vfs/provider/DefaultFileContent.java
  60. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/vfs/provider/UriParser.java
  61. +2
    -2
      proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java
  62. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java
  63. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/GenericFileNameParser.java
  64. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFile.java
  65. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/WindowsFileNameParser.java
  66. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java
  67. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileObject.java
  68. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java
  69. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java
  70. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java
  71. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProject.java
  72. +6
    -6
      proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
  73. +2
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/TransformingProjectBuilder.java
  74. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/classloader/DefaultClassLoaderManager.java
  75. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
  76. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java
  77. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java
  78. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java
  79. +4
    -4
      proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java
  80. +2
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/RoleDescriptorBuilder.java
  81. +2
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/ServiceDescriptorBuilder.java
  82. +2
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java
  83. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java
  84. +2
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java
  85. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java
  86. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java
  87. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java
  88. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/service/InstantiatingServiceManager.java
  89. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java
  90. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java
  91. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java
  92. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
  93. +3
    -3
      proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/TargetState.java
  94. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java
  95. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractFacadeTask.java
  96. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java
  97. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java
  98. +6
    -6
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/JavaVersion.java
  99. +6
    -6
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/LogLevel.java
  100. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java

+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java View File

@@ -22,7 +22,7 @@ import org.apache.avalon.excalibur.bzip2.CBZip2InputStream;
public class BUnzip2 public class BUnzip2
extends Unpack extends Unpack
{ {
private final static String DEFAULT_EXTENSION = ".bz2";
private static final String DEFAULT_EXTENSION = ".bz2";


protected String getDefaultExtension() protected String getDefaultExtension()
{ {


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java View File

@@ -23,7 +23,7 @@ import org.apache.myrmidon.api.TaskException;
public class BZip2 public class BZip2
extends Pack 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 ) protected OutputStream getPackingStream( OutputStream output )
throws TaskException, IOException throws TaskException, IOException


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/archive/GUnzip.java View File

@@ -23,7 +23,7 @@ import org.apache.myrmidon.api.TaskException;
public class GUnzip public class GUnzip
extends Unpack extends Unpack
{ {
private final static String DEFAULT_EXTENSION = ".gz";
private static final String DEFAULT_EXTENSION = ".gz";


protected String getDefaultExtension() protected String getDefaultExtension()
{ {


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/build/BuildNumber.java View File

@@ -33,7 +33,7 @@ import org.apache.myrmidon.api.TaskException;
public class BuildNumber public class BuildNumber
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( BuildNumber.class ); ResourceManager.getPackageResources( BuildNumber.class );


/** /**


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java View File

@@ -26,7 +26,7 @@ import org.apache.tools.todo.types.Commandline;
public class Patch public class Patch
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( Patch.class ); ResourceManager.getPackageResources( Patch.class );


private File m_originalFile; private File m_originalFile;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java View File

@@ -22,7 +22,7 @@ import org.apache.myrmidon.api.TaskException;
public class SleepTask public class SleepTask
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( SleepTask.class ); ResourceManager.getPackageResources( SleepTask.class );


private int m_seconds; private int m_seconds;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/core/AntCallTask.java View File

@@ -22,7 +22,7 @@ import org.apache.myrmidon.interfaces.model.Project;
*/ */
public class AntCallTask extends AbstractAntTask public class AntCallTask extends AbstractAntTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( AntCallTask.class ); ResourceManager.getPackageResources( AntCallTask.class );


private String m_project; private String m_project;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/core/AntParam.java View File

@@ -21,7 +21,7 @@ import org.apache.myrmidon.api.TaskException;
*/ */
public class AntParam public class AntParam
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( AntParam.class ); ResourceManager.getPackageResources( AntParam.class );


private String m_name; private String m_name;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/core/FileTokenSet.java View File

@@ -30,7 +30,7 @@ import org.apache.myrmidon.framework.filters.TokenSet;
public class FileTokenSet public class FileTokenSet
implements TokenSet implements TokenSet
{ {
private final static Resources REZ
private static final Resources REZ
= ResourceManager.getPackageResources( FileTokenSet.class ); = ResourceManager.getPackageResources( FileTokenSet.class );


private Map m_tokens = new HashMap(); private Map m_tokens = new HashMap();


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java View File

@@ -28,7 +28,7 @@ import org.apache.myrmidon.framework.conditions.NotCondition;
public class IfTask public class IfTask
extends AbstractContainerTask extends AbstractContainerTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( IfTask.class ); ResourceManager.getPackageResources( IfTask.class );


private Condition m_condition; private Condition m_condition;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java View File

@@ -26,7 +26,7 @@ import org.apache.myrmidon.api.TaskException;
public class LoadProperties public class LoadProperties
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( LoadProperties.class ); ResourceManager.getPackageResources( LoadProperties.class );


private String m_prefix; private String m_prefix;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/core/Property.java View File

@@ -25,7 +25,7 @@ import org.apache.myrmidon.framework.DataType;
public class Property public class Property
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( Property.class ); ResourceManager.getPackageResources( Property.class );


private String m_name; private String m_name;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java View File

@@ -24,7 +24,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class StringToEnumConverter public class StringToEnumConverter
implements Converter implements Converter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( StringToEnumConverter.class ); ResourceManager.getPackageResources( StringToEnumConverter.class );


public Object convert( final Class destination, public Object convert( final Class destination,


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java View File

@@ -24,7 +24,7 @@ import org.apache.myrmidon.api.TaskException;
public class StringToFileConverter public class StringToFileConverter
extends AbstractConverter extends AbstractConverter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( StringToFileConverter.class ); ResourceManager.getPackageResources( StringToFileConverter.class );


public StringToFileConverter() public StringToFileConverter()


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/core/TryCatchTask.java View File

@@ -25,7 +25,7 @@ import org.apache.myrmidon.framework.TaskList;
public final class TryCatchTask public final class TryCatchTask
extends AbstractContainerTask extends AbstractContainerTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( TryCatchTask.class ); ResourceManager.getPackageResources( TryCatchTask.class );


private TaskList m_try; private TaskList m_try;


+ 2
- 2
proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java View File

@@ -29,7 +29,7 @@ import org.apache.myrmidon.api.TaskException;
public class CVSPass public class CVSPass
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( CVSPass.class ); ResourceManager.getPackageResources( CVSPass.class );


/** /**
@@ -50,7 +50,7 @@ public class CVSPass
/** /**
* Array contain char conversion data * 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, 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, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/cvslib/ChangeLog.java View File

@@ -60,7 +60,7 @@ import org.apache.tools.todo.types.Commandline;
public class ChangeLog public class ChangeLog
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( ChangeLog.class ); ResourceManager.getPackageResources( ChangeLog.class );


/** User list */ /** User list */


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/cvslib/CvsUser.java View File

@@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.i18n.ResourceManager;
*/ */
public class CvsUser public class CvsUser
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( CvsUser.class ); ResourceManager.getPackageResources( CvsUser.class );


private String m_userID; private String m_userID;


+ 4
- 4
proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java View File

@@ -100,17 +100,17 @@ public class CSharp
* name of the executable. the .exe suffix is deliberately not included in * name of the executable. the .exe suffix is deliberately not included in
* anticipation of the unix version * 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? * 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 * 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 * Fix C# reference inclusion. C# is really dumb in how it handles
@@ -125,7 +125,7 @@ public class CSharp
* system <i>exactly</i> so may work on a unix box too. * system <i>exactly</i> so may work on a unix box too.
*/ */


private final static String DEFAULT_REFERENCE_LIST =
private static final String DEFAULT_REFERENCE_LIST =
"Accessibility.dll;" + "Accessibility.dll;" +
"cscompmgd.dll;" + "cscompmgd.dll;" +
"CustomMarshalers.dll;" + "CustomMarshalers.dll;" +


+ 3
- 3
proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java View File

@@ -44,17 +44,17 @@ public class Ilasm
* name of the executable. the .exe suffix is deliberately not included in * name of the executable. the .exe suffix is deliberately not included in
* anticipation of the unix version * 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? * 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 * 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. * debug flag. Controls generation of debug information.


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java View File

@@ -39,7 +39,7 @@ import org.apache.tools.todo.util.mappers.IdentityMapper;
public class CopyTask public class CopyTask
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( CopyTask.class ); ResourceManager.getPackageResources( CopyTask.class );


private File m_file; private File m_file;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java View File

@@ -31,7 +31,7 @@ import org.apache.tools.todo.types.ScannerUtil;
public class Delete public class Delete
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( Delete.class ); ResourceManager.getPackageResources( Delete.class );


private final ArrayList filesets = new ArrayList(); private final ArrayList filesets = new ArrayList();


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java View File

@@ -24,7 +24,7 @@ import org.apache.myrmidon.api.TaskException;
public class Mkdir public class Mkdir
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( Mkdir.class ); ResourceManager.getPackageResources( Mkdir.class );


private File m_dir; private File m_dir;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java View File

@@ -37,7 +37,7 @@ import org.apache.tools.todo.types.ScannerUtil;
public class Touch public class Touch
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( Touch.class ); ResourceManager.getPackageResources( Touch.class );


private long m_millis = -1; private long m_millis = -1;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java View File

@@ -27,7 +27,7 @@ import org.apache.myrmidon.api.TaskException;
public class LoadEnvironment public class LoadEnvironment
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( LoadEnvironment.class ); ResourceManager.getPackageResources( LoadEnvironment.class );


private String m_prefix; private String m_prefix;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java View File

@@ -27,7 +27,7 @@ public class Facility
extends AbstractContainerTask extends AbstractContainerTask
implements Configurable implements Configurable
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( Facility.class ); ResourceManager.getPackageResources( Facility.class );


private String m_namespace; private String m_namespace;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java View File

@@ -25,7 +25,7 @@ import org.apache.myrmidon.interfaces.deployer.TypeDeployer;
public class Import public class Import
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( Import.class ); ResourceManager.getPackageResources( Import.class );


private File m_lib; private File m_lib;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/runtime/TypeAvailableCondition.java View File

@@ -29,7 +29,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class TypeAvailableCondition public class TypeAvailableCondition
implements Condition implements Condition
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( TypeAvailableCondition.class ); ResourceManager.getPackageResources( TypeAvailableCondition.class );


private String m_roleShorthand; private String m_roleShorthand;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java View File

@@ -34,7 +34,7 @@ import org.apache.myrmidon.interfaces.workspace.Workspace;
public class SoundTask public class SoundTask
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( SoundTask.class ); ResourceManager.getPackageResources( SoundTask.class );


private BuildAlert m_success; private BuildAlert m_success;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java View File

@@ -28,7 +28,7 @@ import org.apache.myrmidon.api.TaskException;
public class CopyFilesTask public class CopyFilesTask
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( CopyFilesTask.class ); ResourceManager.getPackageResources( CopyFilesTask.class );


private FileObject m_srcFile; private FileObject m_srcFile;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java View File

@@ -30,7 +30,7 @@ import org.apache.myrmidon.api.TaskException;
public class DefaultFileSet public class DefaultFileSet
implements FileSet implements FileSet
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultFileSet.class ); ResourceManager.getPackageResources( DefaultFileSet.class );


private FileObject m_dir; private FileObject m_dir;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java View File

@@ -24,7 +24,7 @@ import org.apache.myrmidon.api.TaskContext;
public class StringToFileObjectConverter public class StringToFileObjectConverter
extends AbstractConverter extends AbstractConverter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( StringToFileObjectConverter.class ); ResourceManager.getPackageResources( StringToFileObjectConverter.class );


public StringToFileObjectConverter() public StringToFileObjectConverter()


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java View File

@@ -27,7 +27,7 @@ import org.apache.oro.text.regex.Perl5Matcher;
public abstract class AbstractNameFileSelector public abstract class AbstractNameFileSelector
implements FileSelector implements FileSelector
{ {
private final static Resources REZ
private static final Resources REZ
= ResourceManager.getPackageResources( AbstractNameFileSelector.class ); = ResourceManager.getPackageResources( AbstractNameFileSelector.class );


private Object m_type; private Object m_type;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java View File

@@ -25,7 +25,7 @@ import org.apache.myrmidon.framework.conditions.Condition;
public class FileTestCondition public class FileTestCondition
implements Condition implements Condition
{ {
private final static Resources REZ
private static final Resources REZ
= ResourceManager.getPackageResources( FileTestCondition.class ); = ResourceManager.getPackageResources( FileTestCondition.class );


private FileObject m_file; private FileObject m_file;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java View File

@@ -23,7 +23,7 @@ import org.apache.myrmidon.api.TaskException;
public class NameFileSelector public class NameFileSelector
extends AbstractNameFileSelector extends AbstractNameFileSelector
{ {
private final static Resources REZ
private static final Resources REZ
= ResourceManager.getPackageResources( NameFileSelector.class ); = ResourceManager.getPackageResources( NameFileSelector.class );


/** /**


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java View File

@@ -24,7 +24,7 @@ import org.apache.myrmidon.api.TaskException;
public class NotFileSelector public class NotFileSelector
implements FileSelector implements FileSelector
{ {
private final static Resources REZ
private static final Resources REZ
= ResourceManager.getPackageResources( NotFileSelector.class ); = ResourceManager.getPackageResources( NotFileSelector.class );


private FileSelector m_selector; private FileSelector m_selector;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/converter/AbstractConverter.java View File

@@ -19,7 +19,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public abstract class AbstractConverter public abstract class AbstractConverter
implements Converter implements Converter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( AbstractConverter.class ); ResourceManager.getPackageResources( AbstractConverter.class );


private final Class m_source; private final Class m_source;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/converter/AbstractMasterConverter.java View File

@@ -35,7 +35,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public abstract class AbstractMasterConverter public abstract class AbstractMasterConverter
implements Converter implements Converter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( AbstractMasterConverter.class ); ResourceManager.getPackageResources( AbstractMasterConverter.class );


/** /**


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToBooleanConverter.java View File

@@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class StringToBooleanConverter public class StringToBooleanConverter
extends AbstractConverter extends AbstractConverter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( StringToBooleanConverter.class ); ResourceManager.getPackageResources( StringToBooleanConverter.class );


public StringToBooleanConverter() public StringToBooleanConverter()


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToByteConverter.java View File

@@ -24,7 +24,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class StringToByteConverter public class StringToByteConverter
extends AbstractConverter extends AbstractConverter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( StringToByteConverter.class ); ResourceManager.getPackageResources( StringToByteConverter.class );


public StringToByteConverter() public StringToByteConverter()


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToClassConverter.java View File

@@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class StringToClassConverter public class StringToClassConverter
extends AbstractConverter extends AbstractConverter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( StringToClassConverter.class ); ResourceManager.getPackageResources( StringToClassConverter.class );


public StringToClassConverter() public StringToClassConverter()


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDateConverter.java View File

@@ -27,7 +27,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class StringToDateConverter public class StringToDateConverter
extends AbstractConverter extends AbstractConverter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( StringToDateConverter.class ); ResourceManager.getPackageResources( StringToDateConverter.class );


public StringToDateConverter() public StringToDateConverter()


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDoubleConverter.java View File

@@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class StringToDoubleConverter public class StringToDoubleConverter
extends AbstractConverter extends AbstractConverter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( StringToDoubleConverter.class ); ResourceManager.getPackageResources( StringToDoubleConverter.class );


public StringToDoubleConverter() public StringToDoubleConverter()


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFloatConverter.java View File

@@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class StringToFloatConverter public class StringToFloatConverter
extends AbstractConverter extends AbstractConverter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( StringToFloatConverter.class ); ResourceManager.getPackageResources( StringToFloatConverter.class );


public StringToFloatConverter() public StringToFloatConverter()


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToIntegerConverter.java View File

@@ -25,7 +25,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class StringToIntegerConverter public class StringToIntegerConverter
extends AbstractConverter extends AbstractConverter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( StringToFloatConverter.class ); ResourceManager.getPackageResources( StringToFloatConverter.class );


public StringToIntegerConverter() public StringToIntegerConverter()


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToLongConverter.java View File

@@ -24,7 +24,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class StringToLongConverter public class StringToLongConverter
extends AbstractConverter extends AbstractConverter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( StringToLongConverter.class ); ResourceManager.getPackageResources( StringToLongConverter.class );


public StringToLongConverter() public StringToLongConverter()


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToShortConverter.java View File

@@ -24,7 +24,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class StringToShortConverter public class StringToShortConverter
extends AbstractConverter extends AbstractConverter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( StringToShortConverter.class ); ResourceManager.getPackageResources( StringToShortConverter.class );


public StringToShortConverter() public StringToShortConverter()


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToURLConverter.java View File

@@ -23,7 +23,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class StringToURLConverter public class StringToURLConverter
extends AbstractConverter extends AbstractConverter
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( StringToURLConverter.class ); ResourceManager.getPackageResources( StringToURLConverter.class );


public StringToURLConverter() public StringToURLConverter()


+ 16
- 16
proposal/myrmidon/src/java/org/apache/aut/nativelib/Os.java View File

@@ -22,50 +22,50 @@ import java.util.Set;
*/ */
public class Os public class Os
{ {
private final static String OS_NAME =
private static final String OS_NAME =
System.getProperty( "os.name" ).toLowerCase( Locale.US ); 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 ); 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 ); System.getProperty( "os.version" ).toLowerCase( Locale.US );
private final static String PATH_SEP =
private static final String PATH_SEP =
System.getProperty( "path.separator" ); 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. */ /** 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. */ /** 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. */ /** 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} ); new OsFamily( "nt", new OsFamily[]{OS_FAMILY_WINDOWS} );


/** All Windows 9x based OSes. */ /** 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} ); new OsFamily( "win9x", new OsFamily[]{OS_FAMILY_WINDOWS, OS_FAMILY_DOS} );


/** OS/2 */ /** 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} ); new OsFamily( "os/2", new OsFamily[]{OS_FAMILY_DOS} );


/** Netware */ /** Netware */
public final static OsFamily OS_FAMILY_NETWARE =
public static final OsFamily OS_FAMILY_NETWARE =
new OsFamily( "netware" ); new OsFamily( "netware" );


/** All UNIX based OSes. */ /** 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. */ /** 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 */ /** 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} ); 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_DOS,
OS_FAMILY_MAC, OS_FAMILY_MAC,


+ 4
- 4
proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/Environment.java View File

@@ -30,12 +30,12 @@ import org.apache.avalon.excalibur.util.StringUtil;
*/ */
final class Environment 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 // 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. * This is a cached version of the native environment variables.


+ 4
- 4
proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java View File

@@ -29,16 +29,16 @@ class ProcessMonitor
{ {
//Time to sleep in loop while processing output //Time to sleep in loop while processing output
//of command and monitoring for timeout //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 //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 //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 //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 * The state of the process monitor and thus


+ 2
- 2
proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java View File

@@ -28,10 +28,10 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class DefaultCommandLauncher public class DefaultCommandLauncher
implements CommandLauncher implements CommandLauncher
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultCommandLauncher.class ); ResourceManager.getPackageResources( DefaultCommandLauncher.class );


private final static Method c_execWithCWD;
private static final Method c_execWithCWD;


static static
{ {


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java View File

@@ -26,7 +26,7 @@ class ExecUtil
/** /**
* The file representing the current working directory. * The file representing the current working directory.
*/ */
private final static File c_cwd;
private static final File c_cwd;


static static
{ {


+ 3
- 3
proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java View File

@@ -17,19 +17,19 @@ import org.apache.avalon.excalibur.i18n.Resources;
*/ */
public final class FileType public final class FileType
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( FileType.class ); ResourceManager.getPackageResources( FileType.class );


/** /**
* A folder, which can contain other files, but does not have any data * A folder, which can contain other files, but does not have any data
* content. * 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. * 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; private String m_name;




+ 3
- 3
proposal/myrmidon/src/java/org/apache/aut/vfs/NameScope.java View File

@@ -20,14 +20,14 @@ public final class NameScope
* as described by {@link #FILE_SYSTEM}. However, an exception is * as described by {@link #FILE_SYSTEM}. However, an exception is
* thrown if the resolved file is not a direct child of the base file. * 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 * Resolve against the descendents of the base file. The name is resolved
* as described by {@link #FILE_SYSTEM}. However, an exception is thrown * as described by {@link #FILE_SYSTEM}. However, an exception is thrown
* if the resolved file is not a descendent of the base file. * 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. * Resolve against files in the same file system as the base file.
@@ -44,7 +44,7 @@ public final class NameScope
* <p>A path is considered absolute if it starts with a separator character, * <p>A path is considered absolute if it starts with a separator character,
* and relative if it does not. * 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; private String m_name;




+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java View File

@@ -28,7 +28,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class DefaultFileSystemManager public class DefaultFileSystemManager
implements FileSystemManager implements FileSystemManager
{ {
private final static Resources REZ
private static final Resources REZ
= ResourceManager.getPackageResources( DefaultFileSystemManager.class ); = ResourceManager.getPackageResources( DefaultFileSystemManager.class );


/** The default provider. */ /** The default provider. */


+ 2
- 2
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java View File

@@ -31,10 +31,10 @@ import org.apache.avalon.excalibur.io.IOUtil;
public abstract class AbstractFileObject public abstract class AbstractFileObject
implements FileObject implements FileObject
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( AbstractFileObject.class ); ResourceManager.getPackageResources( AbstractFileObject.class );


private final static FileObject[] EMPTY_FILE_ARRAY = {};
private static final FileObject[] EMPTY_FILE_ARRAY = {};


private FileName m_name; private FileName m_name;
private AbstractFileSystem m_fs; private AbstractFileSystem m_fs;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileSystemProvider.java View File

@@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public abstract class AbstractFileSystemProvider public abstract class AbstractFileSystemProvider
implements FileSystemProvider implements FileSystemProvider
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( AbstractFileSystemProvider.class ); ResourceManager.getPackageResources( AbstractFileSystemProvider.class );


private FileSystemProviderContext m_context; private FileSystemProviderContext m_context;


+ 4
- 4
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/DefaultFileContent.java View File

@@ -26,12 +26,12 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class DefaultFileContent public class DefaultFileContent
implements FileContent implements FileContent
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultFileContent.class ); 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 AbstractFileObject m_file;
private int _state = STATE_NONE; private int _state = STATE_NONE;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/UriParser.java View File

@@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
*/ */
public class UriParser public class UriParser
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( UriParser.class ); ResourceManager.getPackageResources( UriParser.class );


/** The normalised separator to use. */ /** The normalised separator to use. */


+ 2
- 2
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java View File

@@ -25,10 +25,10 @@ import org.apache.avalon.excalibur.i18n.Resources;
class FtpFileObject class FtpFileObject
extends AbstractFileObject extends AbstractFileObject
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( FtpFileObject.class ); ResourceManager.getPackageResources( FtpFileObject.class );


private final static FTPFile[] EMPTY_FTP_FILE_ARRAY = {};
private static final FTPFile[] EMPTY_FTP_FILE_ARRAY = {};


private FtpFileSystem m_ftpFs; private FtpFileSystem m_ftpFs;




+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java View File

@@ -26,7 +26,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
class FtpFileSystem class FtpFileSystem
extends AbstractFileSystem extends AbstractFileSystem
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( FtpFileSystem.class ); ResourceManager.getPackageResources( FtpFileSystem.class );


private FTPClient m_client; private FTPClient m_client;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/GenericFileNameParser.java View File

@@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
class GenericFileNameParser class GenericFileNameParser
extends LocalFileNameParser extends LocalFileNameParser
{ {
private final static Resources REZ
private static final Resources REZ
= ResourceManager.getPackageResources( GenericFileNameParser.class ); = ResourceManager.getPackageResources( GenericFileNameParser.class );


/** /**


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFile.java View File

@@ -30,7 +30,7 @@ final class LocalFile
extends AbstractFileObject extends AbstractFileObject
implements FileObject implements FileObject
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( LocalFile.class ); ResourceManager.getPackageResources( LocalFile.class );


private File m_file; private File m_file;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/WindowsFileNameParser.java View File

@@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
class WindowsFileNameParser class WindowsFileNameParser
extends LocalFileNameParser extends LocalFileNameParser
{ {
private final static Resources REZ
private static final Resources REZ
= ResourceManager.getPackageResources( WindowsFileNameParser.class ); = ResourceManager.getPackageResources( WindowsFileNameParser.class );


/** /**


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java View File

@@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
public class SmbFileNameParser public class SmbFileNameParser
extends UriParser extends UriParser
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( SmbFileNameParser.class ); ResourceManager.getPackageResources( SmbFileNameParser.class );


/** /**


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileObject.java View File

@@ -29,7 +29,7 @@ public class SmbFileObject
extends AbstractFileObject extends AbstractFileObject
implements FileObject implements FileObject
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( SmbFileObject.class ); ResourceManager.getPackageResources( SmbFileObject.class );


private String m_fileName; private String m_fileName;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java View File

@@ -28,7 +28,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
*/ */
public class ZipFileSystem extends AbstractFileSystem implements FileSystem public class ZipFileSystem extends AbstractFileSystem implements FileSystem
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( ZipFileSystem.class ); ResourceManager.getPackageResources( ZipFileSystem.class );


private File m_file; private File m_file;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java View File

@@ -29,7 +29,7 @@ import org.apache.myrmidon.interfaces.aspect.AspectManager;
public class DefaultAspectManager public class DefaultAspectManager
implements AspectManager, Initializable implements AspectManager, Initializable
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultAspectManager.class ); ResourceManager.getPackageResources( DefaultAspectManager.class );


private HashMap m_aspectMap = new HashMap(); private HashMap m_aspectMap = new HashMap();


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java View File

@@ -35,7 +35,7 @@ public class ATIProjectBuilder
extends DefaultProjectBuilder extends DefaultProjectBuilder
implements Parameterizable implements Parameterizable
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( ATIProjectBuilder.class ); ResourceManager.getPackageResources( ATIProjectBuilder.class );


private Parameters m_parameters; private Parameters m_parameters;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProject.java View File

@@ -25,7 +25,7 @@ import org.apache.myrmidon.interfaces.model.TypeLib;
public class DefaultProject public class DefaultProject
implements Project implements Project
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultProject.class ); ResourceManager.getPackageResources( DefaultProject.class );


///The imports ///The imports


+ 6
- 6
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java View File

@@ -42,15 +42,15 @@ public class DefaultProjectBuilder
extends AbstractLogEnabled extends AbstractLogEnabled
implements ProjectBuilder implements ProjectBuilder
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultProjectBuilder.class ); 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. // Use a name validator with the default rules.
private DefaultNameValidator m_nameValidator = new DefaultNameValidator(); private DefaultNameValidator m_nameValidator = new DefaultNameValidator();


+ 2
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/TransformingProjectBuilder.java View File

@@ -32,10 +32,10 @@ import org.apache.myrmidon.interfaces.builder.ProjectException;
public class TransformingProjectBuilder public class TransformingProjectBuilder
extends DefaultProjectBuilder extends DefaultProjectBuilder
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( TransformingProjectBuilder.class ); ResourceManager.getPackageResources( TransformingProjectBuilder.class );


private final static String STYLESHEET = "ant1convert.xsl";
private static final String STYLESHEET = "ant1convert.xsl";
private Transformer m_transformer; private Transformer m_transformer;


protected Configuration parseProject( String systemID ) protected Configuration parseProject( String systemID )


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/classloader/DefaultClassLoaderManager.java View File

@@ -43,7 +43,7 @@ public class DefaultClassLoaderManager
extends AbstractLogEnabled extends AbstractLogEnabled
implements ClassLoaderManager, Serviceable, Initializable implements ClassLoaderManager, Serviceable, Initializable
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultClassLoaderManager.class ); ResourceManager.getPackageResources( DefaultClassLoaderManager.class );


/** /**


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java View File

@@ -40,7 +40,7 @@ public class DefaultConfigurer
extends AbstractLogEnabled extends AbstractLogEnabled
implements Configurer, Serviceable, LogEnabled implements Configurer, Serviceable, LogEnabled
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultConfigurer.class ); ResourceManager.getPackageResources( DefaultConfigurer.class );


///Converter to use for converting between values ///Converter to use for converting between values


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java View File

@@ -29,7 +29,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException;
class DefaultObjectConfigurer class DefaultObjectConfigurer
implements ObjectConfigurer implements ObjectConfigurer
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultObjectConfigurer.class ); ResourceManager.getPackageResources( DefaultObjectConfigurer.class );


private final Class m_class; private final Class m_class;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java View File

@@ -23,7 +23,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException;
class DefaultPropertyConfigurer class DefaultPropertyConfigurer
implements PropertyConfigurer implements PropertyConfigurer
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultPropertyConfigurer.class ); ResourceManager.getPackageResources( DefaultPropertyConfigurer.class );


private final int m_propertyIndex; private final int m_propertyIndex;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java View File

@@ -42,7 +42,7 @@ public class DefaultDeployer
extends AbstractLogEnabled extends AbstractLogEnabled
implements Deployer, Serviceable implements Deployer, Serviceable
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultDeployer.class ); ResourceManager.getPackageResources( DefaultDeployer.class );


// The components used to deploy // The components used to deploy


+ 4
- 4
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java View File

@@ -36,12 +36,12 @@ class Deployment
extends AbstractLogEnabled extends AbstractLogEnabled
implements TypeDeployer implements TypeDeployer
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( Deployment.class ); 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 ClassLoader m_classLoader;
private DefaultDeployer m_deployer; private DefaultDeployer m_deployer;


+ 2
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/RoleDescriptorBuilder.java View File

@@ -22,10 +22,10 @@ import org.apache.myrmidon.interfaces.deployer.DeploymentException;
class RoleDescriptorBuilder class RoleDescriptorBuilder
implements DescriptorBuilder implements DescriptorBuilder
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( RoleDescriptorBuilder.class ); 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. * Builds a descriptor from a set of configuration.


+ 2
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/ServiceDescriptorBuilder.java View File

@@ -22,10 +22,10 @@ import org.apache.myrmidon.interfaces.deployer.DeploymentException;
class ServiceDescriptorBuilder class ServiceDescriptorBuilder
implements DescriptorBuilder implements DescriptorBuilder
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( ServiceDescriptorBuilder.class ); 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. * Builds a descriptor from a set of configuration.


+ 2
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java View File

@@ -25,10 +25,10 @@ import org.apache.myrmidon.interfaces.deployer.TypeDefinition;
class TypeDescriptorBuilder class TypeDescriptorBuilder
implements DescriptorBuilder implements DescriptorBuilder
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( TypeDescriptorBuilder.class ); 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. * Builds a descriptor from a set of configuration.


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java View File

@@ -58,7 +58,7 @@ public class DefaultEmbeddor
extends AbstractLogEnabled extends AbstractLogEnabled
implements Embeddor, Parameterizable, Initializable, Startable, Disposable implements Embeddor, Parameterizable, Initializable, Startable, Disposable
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultEmbeddor.class ); ResourceManager.getPackageResources( DefaultEmbeddor.class );


/** Package containing the default component implementations. */ /** Package containing the default component implementations. */


+ 2
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java View File

@@ -33,10 +33,10 @@ import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
public class AspectAwareExecutor public class AspectAwareExecutor
extends DefaultExecutor extends DefaultExecutor
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( AspectAwareExecutor.class ); 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; private AspectManager m_aspectManager;




+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java View File

@@ -34,7 +34,7 @@ public class DefaultExecutor
extends AbstractLogEnabled extends AbstractLogEnabled
implements Executor, Serviceable implements Executor, Serviceable
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultExecutor.class ); ResourceManager.getPackageResources( DefaultExecutor.class );


private Configurer m_configurer; private Configurer m_configurer;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java View File

@@ -30,7 +30,7 @@ import org.apache.myrmidon.interfaces.property.PropertyResolver;
public class DefaultPropertyResolver public class DefaultPropertyResolver
implements PropertyResolver, Serviceable implements PropertyResolver, Serviceable
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultPropertyResolver.class ); ResourceManager.getPackageResources( DefaultPropertyResolver.class );


private Converter m_converter; private Converter m_converter;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java View File

@@ -23,7 +23,7 @@ import org.apache.myrmidon.interfaces.role.RoleManager;
public class DefaultRoleManager public class DefaultRoleManager
implements RoleManager implements RoleManager
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultRoleManager.class ); ResourceManager.getPackageResources( DefaultRoleManager.class );


/** Parent <code>RoleManager</code> for nested resolution */ /** Parent <code>RoleManager</code> for nested resolution */


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/service/InstantiatingServiceManager.java View File

@@ -49,7 +49,7 @@ public class InstantiatingServiceManager
extends AbstractLogEnabled extends AbstractLogEnabled
implements ServiceManager, Parameterizable, Serviceable, Disposable implements ServiceManager, Parameterizable, Serviceable, Disposable
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( InstantiatingServiceManager.class ); ResourceManager.getPackageResources( InstantiatingServiceManager.class );


/** Map from service class -> service object. */ /** Map from service class -> service object. */


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java View File

@@ -28,7 +28,7 @@ import org.apache.myrmidon.interfaces.type.TypeManager;
public class DefaultTypeManager public class DefaultTypeManager
implements TypeManager, Serviceable implements TypeManager, Serviceable
{ {
private final static Resources REZ
private static final Resources REZ
= ResourceManager.getPackageResources( DefaultTypeManager.class ); = ResourceManager.getPackageResources( DefaultTypeManager.class );


///Parent type manager to inherit values from. ///Parent type manager to inherit values from.


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java View File

@@ -22,7 +22,7 @@ import org.apache.myrmidon.interfaces.type.TypeFactory;
public class MultiSourceTypeFactory public class MultiSourceTypeFactory
implements TypeFactory implements TypeFactory
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( MultiSourceTypeFactory.class ); ResourceManager.getPackageResources( MultiSourceTypeFactory.class );


///Parent Selector ///Parent Selector


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java View File

@@ -31,7 +31,7 @@ import org.apache.myrmidon.interfaces.property.PropertyResolver;
public class DefaultTaskContext public class DefaultTaskContext
implements TaskContext implements TaskContext
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultTaskContext.class ); ResourceManager.getPackageResources( DefaultTaskContext.class );


// Property name validator allows digits, but no internal whitespace. // Property name validator allows digits, but no internal whitespace.


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java View File

@@ -49,7 +49,7 @@ public class DefaultWorkspace
extends AbstractLogEnabled extends AbstractLogEnabled
implements Workspace, Serviceable, Parameterizable, Initializable implements Workspace, Serviceable, Parameterizable, Initializable
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultWorkspace.class ); ResourceManager.getPackageResources( DefaultWorkspace.class );


private Executor m_executor; private Executor m_executor;


+ 3
- 3
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/TargetState.java View File

@@ -21,14 +21,14 @@ final class TargetState
} }


/** Target has not been started. */ /** 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 * Target has been started, and the dependencies of the target are being
* traversed. * traversed.
*/ */
public final static TargetState TRAVERSING = new TargetState();
public static final TargetState TRAVERSING = new TargetState();


/** Target has been completed. */ /** Target has been completed. */
public final static TargetState FINISHED = new TargetState();
public static final TargetState FINISHED = new TargetState();
} }

+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java View File

@@ -34,7 +34,7 @@ import org.apache.myrmidon.interfaces.type.TypeManager;
public abstract class AbstractContainerTask public abstract class AbstractContainerTask
extends AbstractTask extends AbstractTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( AbstractContainerTask.class ); ResourceManager.getPackageResources( AbstractContainerTask.class );


///For converting own attributes ///For converting own attributes


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractFacadeTask.java View File

@@ -26,7 +26,7 @@ public abstract class AbstractFacadeTask
extends AbstractContainerTask extends AbstractContainerTask
implements Configurable implements Configurable
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( AbstractFacadeTask.class ); ResourceManager.getPackageResources( AbstractFacadeTask.class );


/** /**


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java View File

@@ -27,7 +27,7 @@ import org.apache.myrmidon.interfaces.deployer.TypeDeployer;
public abstract class AbstractTypeDef public abstract class AbstractTypeDef
extends AbstractContainerTask extends AbstractContainerTask
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( AbstractTypeDef.class ); ResourceManager.getPackageResources( AbstractTypeDef.class );


// TODO - replace lib with class-path // TODO - replace lib with class-path


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java View File

@@ -33,7 +33,7 @@ import org.apache.tools.todo.util.FileUtils;
*/ */
public class Execute public class Execute
{ {
private final static Resources REZ
private static final Resources REZ
= ResourceManager.getPackageResources( Execute.class ); = ResourceManager.getPackageResources( Execute.class );


private Commandline m_command; private Commandline m_command;


+ 6
- 6
proposal/myrmidon/src/java/org/apache/myrmidon/framework/JavaVersion.java View File

@@ -19,13 +19,13 @@ public final class JavaVersion
extends ValuedEnum extends ValuedEnum
{ {
//standard enums for version of JVM //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. * Method to retrieve the current JVM version.


+ 6
- 6
proposal/myrmidon/src/java/org/apache/myrmidon/framework/LogLevel.java View File

@@ -23,14 +23,14 @@ public final class LogLevel
extends Enum extends Enum
{ {
//Map for all the levels //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 //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. * Retrieve the log level for the specified name.


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java View File

@@ -25,7 +25,7 @@ import org.apache.myrmidon.framework.conditions.NotCondition;
public class Pattern public class Pattern
implements DataType implements DataType
{ {
private final static Resources REZ =
private static final Resources REZ =
ResourceManager.getPackageResources( Pattern.class ); ResourceManager.getPackageResources( Pattern.class );


private String m_name; private String m_name;


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save