donaldp 02/03/29 04:56:38
Modified: proposal/myrmidon/src/java/org/apache/aut/converter
AbstractConverter.java AbstractMasterConverter.java
proposal/myrmidon/src/java/org/apache/aut/converter/lib
StringToBooleanConverter.java
StringToByteConverter.java
StringToClassConverter.java
StringToDateConverter.java
StringToDoubleConverter.java
StringToFloatConverter.java
StringToIntegerConverter.java
StringToLongConverter.java
StringToShortConverter.java
StringToURLConverter.java
proposal/myrmidon/src/java/org/apache/aut/nativelib Os.java
proposal/myrmidon/src/java/org/apache/aut/nativelib/impl
Environment.java ProcessMonitor.java
proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers
DefaultCommandLauncher.java ExecUtil.java
proposal/myrmidon/src/java/org/apache/aut/vfs FileType.java
NameScope.java
proposal/myrmidon/src/java/org/apache/aut/vfs/impl
DefaultFileSystemManager.java
proposal/myrmidon/src/java/org/apache/aut/vfs/provider
AbstractFileObject.java
AbstractFileSystemProvider.java
DefaultFileContent.java UriParser.java
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp
FtpFileObject.java FtpFileSystem.java
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local
GenericFileNameParser.java LocalFile.java
WindowsFileNameParser.java
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb
SmbFileNameParser.java SmbFileObject.java
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip
ZipFileSystem.java
Log:
final static --> static final to follow JLS recomendations
Revision Changes Path
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractConverter.java
Index: AbstractConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractConverter.java 21 Feb 2002 10:16:42 -0000 1.4
+++ AbstractConverter.java 29 Mar 2002 12:56:36 -0000 1.5
@@ -14,12 +14,12 @@
* Instances of this interface are used to convert between different types.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.4 $ $Date: 2002/02/21 10:16:42 $
+ * @version $Revision: 1.5 $ $Date: 2002/03/29 12:56:36 $
*/
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;
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractMasterConverter.java
Index: AbstractMasterConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractMasterConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractMasterConverter.java 23 Mar 2002 08:55:39 -0000 1.4
+++ AbstractMasterConverter.java 29 Mar 2002 12:56:36 -0000 1.5
@@ -30,12 +30,12 @@
* when it is first used.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.4 $ $Date: 2002/03/23 08:55:39 $
+ * @version $Revision: 1.5 $ $Date: 2002/03/29 12:56:36 $
*/
public abstract class AbstractMasterConverter
implements Converter
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( AbstractMasterConverter.class );
/**
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToBooleanConverter.java
Index: StringToBooleanConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToBooleanConverter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringToBooleanConverter.java 23 Mar 2002 05:34:17 -0000 1.1
+++ StringToBooleanConverter.java 29 Mar 2002 12:56:36 -0000 1.2
@@ -21,7 +21,7 @@
public class StringToBooleanConverter
extends AbstractConverter
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( StringToBooleanConverter.class
);
public StringToBooleanConverter()
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToByteConverter.java
Index: StringToByteConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToByteConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringToByteConverter.java 23 Mar 2002 07:30:48 -0000 1.2
+++ StringToByteConverter.java 29 Mar 2002 12:56:36 -0000 1.3
@@ -24,7 +24,7 @@
public class StringToByteConverter
extends AbstractConverter
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( StringToByteConverter.class );
public StringToByteConverter()
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToClassConverter.java
Index: StringToClassConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToClassConverter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringToClassConverter.java 23 Mar 2002 05:34:17 -0000 1.1
+++ StringToClassConverter.java 29 Mar 2002 12:56:36 -0000 1.2
@@ -21,7 +21,7 @@
public class StringToClassConverter
extends AbstractConverter
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( StringToClassConverter.class );
public StringToClassConverter()
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDateConverter.java
Index: StringToDateConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDateConverter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringToDateConverter.java 28 Mar 2002 01:58:42 -0000 1.1
+++ StringToDateConverter.java 29 Mar 2002 12:56:36 -0000 1.2
@@ -27,7 +27,7 @@
public class StringToDateConverter
extends AbstractConverter
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( StringToDateConverter.class );
public StringToDateConverter()
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDoubleConverter.java
Index: StringToDoubleConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDoubleConverter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringToDoubleConverter.java 23 Mar 2002 05:34:17 -0000 1.1
+++ StringToDoubleConverter.java 29 Mar 2002 12:56:36 -0000 1.2
@@ -21,7 +21,7 @@
public class StringToDoubleConverter
extends AbstractConverter
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( StringToDoubleConverter.class );
public StringToDoubleConverter()
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFloatConverter.java
Index: StringToFloatConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFloatConverter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringToFloatConverter.java 23 Mar 2002 05:34:17 -0000 1.1
+++ StringToFloatConverter.java 29 Mar 2002 12:56:36 -0000 1.2
@@ -21,7 +21,7 @@
public class StringToFloatConverter
extends AbstractConverter
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( StringToFloatConverter.class );
public StringToFloatConverter()
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToIntegerConverter.java
Index: StringToIntegerConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToIntegerConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringToIntegerConverter.java 23 Mar 2002 07:30:48 -0000 1.2
+++ StringToIntegerConverter.java 29 Mar 2002 12:56:36 -0000 1.3
@@ -25,7 +25,7 @@
public class StringToIntegerConverter
extends AbstractConverter
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( StringToFloatConverter.class );
public StringToIntegerConverter()
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToLongConverter.java
Index: StringToLongConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToLongConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringToLongConverter.java 23 Mar 2002 07:30:48 -0000 1.2
+++ StringToLongConverter.java 29 Mar 2002 12:56:36 -0000 1.3
@@ -24,7 +24,7 @@
public class StringToLongConverter
extends AbstractConverter
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( StringToLongConverter.class );
public StringToLongConverter()
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToShortConverter.java
Index: StringToShortConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToShortConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringToShortConverter.java 23 Mar 2002 07:30:48 -0000 1.2
+++ StringToShortConverter.java 29 Mar 2002 12:56:36 -0000 1.3
@@ -24,7 +24,7 @@
public class StringToShortConverter
extends AbstractConverter
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( StringToShortConverter.class );
public StringToShortConverter()
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToURLConverter.java
Index: StringToURLConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToURLConverter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringToURLConverter.java 23 Mar 2002 05:34:17 -0000 1.1
+++ StringToURLConverter.java 29 Mar 2002 12:56:36 -0000 1.2
@@ -23,7 +23,7 @@
public class StringToURLConverter
extends AbstractConverter
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( StringToURLConverter.class );
public StringToURLConverter()
1.7 +16 -16
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/Os.java
Index: Os.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/Os.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Os.java 16 Mar 2002 04:24:20 -0000 1.6
+++ Os.java 29 Mar 2002 12:56:37 -0000 1.7
@@ -22,50 +22,50 @@
*/
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,
1.6 +5 -5
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/Environment.java
Index: Environment.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/Environment.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Environment.java 2 Mar 2002 04:03:36 -0000 1.5
+++ Environment.java 29 Mar 2002 12:56:37 -0000 1.6
@@ -26,16 +26,16 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Thomas Haas</a>
- * @version $Revision: 1.5 $ $Date: 2002/03/02 04:03:36 $
+ * @version $Revision: 1.6 $ $Date: 2002/03/29 12:56:37 $
*/
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.
1.7 +5 -5
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java
Index: ProcessMonitor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ProcessMonitor.java 2 Mar 2002 01:07:13 -0000 1.6
+++ ProcessMonitor.java 29 Mar 2002 12:56:37 -0000 1.7
@@ -21,7 +21,7 @@
* It will also in the future do the same for stdin.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.6 $ $Date: 2002/03/02 01:07:13 $
+ * @version $Revision: 1.7 $ $Date: 2002/03/29 12:56:37 $
*/
class ProcessMonitor
extends AbstractLogEnabled
@@ -29,16 +29,16 @@
{
//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
1.4 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java
Index: DefaultCommandLauncher.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultCommandLauncher.java 6 Feb 2002 13:34:46 -0000 1.3
+++ DefaultCommandLauncher.java 29 Mar 2002 12:56:37 -0000 1.4
@@ -23,15 +23,15 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Thomas Haas</a>
- * @version $Revision: 1.3 $ $Date: 2002/02/06 13:34:46 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/29 12:56:37 $
*/
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
{
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java
Index: ExecUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExecUtil.java 21 Feb 2002 09:27:22 -0000 1.4
+++ ExecUtil.java 29 Mar 2002 12:56:37 -0000 1.5
@@ -19,14 +19,14 @@
* A set of utility functions useful when writing CommandLaunchers.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.4 $ $Date: 2002/02/21 09:27:22 $
+ * @version $Revision: 1.5 $ $Date: 2002/03/29 12:56:37 $
*/
class ExecUtil
{
/**
* The file representing the current working directory.
*/
- private final static File c_cwd;
+ private static final File c_cwd;
static
{
1.4 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java
Index: FileType.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileType.java 9 Feb 2002 03:21:36 -0000 1.3
+++ FileType.java 29 Mar 2002 12:56:37 -0000 1.4
@@ -17,19 +17,19 @@
*/
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;
1.5 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/NameScope.java
Index: NameScope.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/NameScope.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NameScope.java 2 Mar 2002 04:07:51 -0000 1.4
+++ NameScope.java 29 Mar 2002 12:56:37 -0000 1.5
@@ -20,14 +20,14 @@
* as described by [EMAIL PROTECTED] #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 [EMAIL PROTECTED] #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 @@
* <p>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;
1.6 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java
Index: DefaultFileSystemManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultFileSystemManager.java 9 Mar 2002 10:31:30 -0000 1.5
+++ DefaultFileSystemManager.java 29 Mar 2002 12:56:37 -0000 1.6
@@ -23,12 +23,12 @@
* A default file system manager implementation.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.5 $ $Date: 2002/03/09 10:31:30 $
+ * @version $Revision: 1.6 $ $Date: 2002/03/29 12:56:37 $
*/
public class DefaultFileSystemManager
implements FileSystemManager
{
- private final static Resources REZ
+ private static final Resources REZ
= ResourceManager.getPackageResources(
DefaultFileSystemManager.class );
/** The default provider. */
1.7 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java
Index: AbstractFileObject.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractFileObject.java 9 Mar 2002 10:31:30 -0000 1.6
+++ AbstractFileObject.java 29 Mar 2002 12:56:37 -0000 1.7
@@ -31,10 +31,10 @@
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;
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileSystemProvider.java
Index: AbstractFileSystemProvider.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileSystemProvider.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractFileSystemProvider.java 9 Mar 2002 10:31:30 -0000 1.5
+++ AbstractFileSystemProvider.java 29 Mar 2002 12:56:37 -0000 1.6
@@ -20,7 +20,7 @@
public abstract class AbstractFileSystemProvider
implements FileSystemProvider
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources(
AbstractFileSystemProvider.class );
private FileSystemProviderContext m_context;
1.4 +4 -4
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/DefaultFileContent.java
Index: DefaultFileContent.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/DefaultFileContent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultFileContent.java 9 Feb 2002 22:49:55 -0000 1.3
+++ DefaultFileContent.java 29 Mar 2002 12:56:37 -0000 1.4
@@ -26,12 +26,12 @@
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;
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/UriParser.java
Index: UriParser.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/UriParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UriParser.java 9 Mar 2002 10:31:30 -0000 1.5
+++ UriParser.java 29 Mar 2002 12:56:37 -0000 1.6
@@ -21,7 +21,7 @@
*/
public class UriParser
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( UriParser.class );
/** The normalised separator to use. */
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java
Index: FtpFileObject.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FtpFileObject.java 14 Feb 2002 10:53:53 -0000 1.4
+++ FtpFileObject.java 29 Mar 2002 12:56:37 -0000 1.5
@@ -25,10 +25,10 @@
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;
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java
Index: FtpFileSystem.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FtpFileSystem.java 9 Feb 2002 02:51:49 -0000 1.3
+++ FtpFileSystem.java 29 Mar 2002 12:56:37 -0000 1.4
@@ -26,7 +26,7 @@
class FtpFileSystem
extends AbstractFileSystem
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( FtpFileSystem.class );
private FTPClient m_client;
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/GenericFileNameParser.java
Index: GenericFileNameParser.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/GenericFileNameParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GenericFileNameParser.java 2 Mar 2002 04:07:51 -0000 1.1
+++ GenericFileNameParser.java 29 Mar 2002 12:56:37 -0000 1.2
@@ -15,12 +15,12 @@
* A general-purpose file name parser.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/02 04:07:51 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/29 12:56:37 $
*/
class GenericFileNameParser
extends LocalFileNameParser
{
- private final static Resources REZ
+ private static final Resources REZ
= ResourceManager.getPackageResources( GenericFileNameParser.class );
/**
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFile.java
Index: LocalFile.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFile.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalFile.java 2 Mar 2002 04:07:51 -0000 1.4
+++ LocalFile.java 29 Mar 2002 12:56:37 -0000 1.5
@@ -24,13 +24,13 @@
* A file object implementation which uses direct file access.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.4 $ $Date: 2002/03/02 04:07:51 $
+ * @version $Revision: 1.5 $ $Date: 2002/03/29 12:56:37 $
*/
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;
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/WindowsFileNameParser.java
Index: WindowsFileNameParser.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/WindowsFileNameParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WindowsFileNameParser.java 2 Mar 2002 04:07:51 -0000 1.1
+++ WindowsFileNameParser.java 29 Mar 2002 12:56:37 -0000 1.2
@@ -15,12 +15,12 @@
* A parser for Windows file names.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/02 04:07:51 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/29 12:56:37 $
*/
class WindowsFileNameParser
extends LocalFileNameParser
{
- private final static Resources REZ
+ private static final Resources REZ
= ResourceManager.getPackageResources( WindowsFileNameParser.class );
/**
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java
Index: SmbFileNameParser.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SmbFileNameParser.java 9 Mar 2002 10:31:30 -0000 1.4
+++ SmbFileNameParser.java 29 Mar 2002 12:56:38 -0000 1.5
@@ -21,7 +21,7 @@
public class SmbFileNameParser
extends UriParser
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( SmbFileNameParser.class );
/**
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileObject.java
Index: SmbFileObject.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileObject.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SmbFileObject.java 9 Feb 2002 02:51:50 -0000 1.2
+++ SmbFileObject.java 29 Mar 2002 12:56:38 -0000 1.3
@@ -29,7 +29,7 @@
extends AbstractFileObject
implements FileObject
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( SmbFileObject.class );
private String m_fileName;
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java
Index: ZipFileSystem.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ZipFileSystem.java 9 Feb 2002 02:51:50 -0000 1.3
+++ ZipFileSystem.java 29 Mar 2002 12:56:38 -0000 1.4
@@ -28,7 +28,7 @@
*/
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;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
