Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 57694 invoked from network); 5 Jul 2002 04:08:34 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 5 Jul 2002 04:08:34 -0000 Received: (qmail 24069 invoked by uid 97); 5 Jul 2002 04:08:44 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 24022 invoked by uid 97); 5 Jul 2002 04:08:43 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 24011 invoked by uid 97); 5 Jul 2002 04:08:43 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 5 Jul 2002 04:08:19 -0000 Message-ID: <20020705040819.9658.qmail@icarus.apache.org> From: donaldp@apache.org To: jakarta-ant-myrmidon-cvs@apache.org Subject: cvs commit: jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/zip ParsedZipUri.java ZipFileNameParser.java ZipFileObject.java ZipFileSystem.java ZipFileSystemProvider.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N donaldp 2002/07/04 21:08:19 Modified: aut/src/java/org/apache/aut/vfs/provider AbstractFileObject.java DefaultFileContent.java DefaultFileName.java DefaultFileSelectorInfo.java DefaultURLConnection.java DefaultURLStreamHandler.java aut/src/java/org/apache/aut/vfs AllFileSelector.java FileDepthSelector.java FileSystemException.java FileType.java aut/src/java/org/apache/aut/nativelib/impl/launchers DefaultCommandLauncher.java ExecUtil.java MacCommandLauncher.java ScriptCommandLauncher.java WinNTCommandLauncher.java aut/src/java/org/apache/aut/nativelib/impl DefaultExecManager.java LogOutputStream.java ProcessDestroyer.java ProcessMonitor.java aut/src/java/org/apache/aut/nativelib DefaultExecOutputHandler.java ExecException.java ExecMetaData.java Os.java PathUtil.java aut/src/java/org/apache/aut/vfs/impl DefaultFileReplicator.java DefaultFileSystemManager.java URLStreamHandlerProxy.java aut/src/java/org/apache/aut/vfs/provider/local DefaultLocalFileSystemProvider.java GenericFileNameParser.java LocalFileSystem.java ParsedFileUri.java WindowsFileNameParser.java aut/src/java/org/apache/aut/vfs/provider/ftp FtpFileNameParser.java FtpFileObject.java FtpFileSystem.java FtpFileSystemProvider.java ParsedFtpUri.java aut/src/java/org/apache/aut/vfs/provider/smb ParsedSmbUri.java SmbFileNameParser.java SmbFileObject.java SmbFileSystem.java SmbFileSystemProvider.java aut/src/java/org/apache/aut/vfs/provider/zip ParsedZipUri.java ZipFileNameParser.java ZipFileObject.java ZipFileSystem.java ZipFileSystemProvider.java Log: Add in some finals where we can Revision Changes Path 1.11 +5 -4 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java Index: AbstractFileObject.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- AbstractFileObject.java 5 Jul 2002 03:21:54 -0000 1.10 +++ AbstractFileObject.java 5 Jul 2002 04:08:17 -0000 1.11 @@ -43,8 +43,8 @@ private static final FileObject[] EMPTY_FILE_ARRAY = {}; - private FileName m_name; - private AbstractFileSystem m_fs; + private final FileName m_name; + private final AbstractFileSystem m_fs; private DefaultFileContent m_content; // Cached info @@ -53,7 +53,8 @@ private FileType m_type; private FileObject[] m_children; - protected AbstractFileObject( FileName name, AbstractFileSystem fs ) + protected AbstractFileObject( final FileName name, + final AbstractFileSystem fs ) { m_name = name; m_fs = fs; 1.7 +4 -4 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultFileContent.java Index: DefaultFileContent.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultFileContent.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- DefaultFileContent.java 5 Jul 2002 03:46:53 -0000 1.6 +++ DefaultFileContent.java 5 Jul 2002 04:08:17 -0000 1.7 @@ -24,7 +24,7 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class DefaultFileContent +public final class DefaultFileContent implements FileContent { private static final Resources REZ = @@ -34,12 +34,12 @@ private static final int STATE_READING = 1; private static final int STATE_WRITING = 2; - private AbstractFileObject m_file; + private final AbstractFileObject m_file; private int _state = STATE_NONE; private FileContentInputStream m_instr; private FileContentOutputStream m_outstr; - public DefaultFileContent( AbstractFileObject file ) + public DefaultFileContent( final AbstractFileObject file ) { m_file = file; } 1.4 +3 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultFileName.java Index: DefaultFileName.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultFileName.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DefaultFileName.java 7 Apr 2002 02:27:56 -0000 1.3 +++ DefaultFileName.java 5 Jul 2002 04:08:17 -0000 1.4 @@ -17,7 +17,8 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class DefaultFileName implements FileName +public final class DefaultFileName + implements FileName { private final UriParser m_parser; private final String m_rootPrefix; 1.2 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultFileSelectorInfo.java Index: DefaultFileSelectorInfo.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultFileSelectorInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultFileSelectorInfo.java 7 Apr 2002 02:27:56 -0000 1.1 +++ DefaultFileSelectorInfo.java 5 Jul 2002 04:08:17 -0000 1.2 @@ -16,7 +16,7 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -class DefaultFileSelectorInfo +final class DefaultFileSelectorInfo implements FileSelectInfo { private FileObject m_baseFolder; 1.3 +5 -4 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultURLConnection.java Index: DefaultURLConnection.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultURLConnection.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DefaultURLConnection.java 5 Jul 2002 03:21:54 -0000 1.2 +++ DefaultURLConnection.java 5 Jul 2002 04:08:17 -0000 1.3 @@ -22,12 +22,13 @@ * @author Brian Olsen * @version $Revision$ $Date$ */ -public class DefaultURLConnection +public final class DefaultURLConnection extends URLConnection { - FileContent m_content; + private final FileContent m_content; - public DefaultURLConnection( URL url, FileContent content ) + public DefaultURLConnection( final URL url, + final FileContent content ) { super( url ); m_content = content; 1.5 +10 -8 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultURLStreamHandler.java Index: DefaultURLStreamHandler.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultURLStreamHandler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DefaultURLStreamHandler.java 5 Jul 2002 03:46:41 -0000 1.4 +++ DefaultURLStreamHandler.java 5 Jul 2002 04:08:17 -0000 1.5 @@ -24,20 +24,19 @@ public class DefaultURLStreamHandler extends URLStreamHandler { + private final FileSystemProviderContext m_context; - FileSystemProviderContext m_context; - - public DefaultURLStreamHandler( FileSystemProviderContext context ) + public DefaultURLStreamHandler( final FileSystemProviderContext context ) { m_context = context; } - protected URLConnection openConnection( URL url ) + protected URLConnection openConnection( final URL url ) throws IOException { try { - FileObject entry = m_context.resolveFile( url.toExternalForm() ); + final FileObject entry = m_context.resolveFile( url.toExternalForm() ); return new DefaultURLConnection( url, entry.getContent() ); } catch( FileSystemException fse ) @@ -46,7 +45,10 @@ } } - protected void parseURL( URL u, String spec, int start, int limit ) + protected void parseURL( final URL u, + final String spec, + final int start, + final int limit ) { try { @@ -75,7 +77,7 @@ } } - protected String toExternalForm( URL u ) + protected String toExternalForm( final URL u ) { return u.getProtocol() + ":" + u.getFile(); } 1.2 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/AllFileSelector.java Index: AllFileSelector.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/AllFileSelector.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AllFileSelector.java 7 Apr 2002 02:27:55 -0000 1.1 +++ AllFileSelector.java 5 Jul 2002 04:08:17 -0000 1.2 @@ -13,7 +13,7 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class AllFileSelector +public final class AllFileSelector implements FileSelector { /** 1.2 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/FileDepthSelector.java Index: FileDepthSelector.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/FileDepthSelector.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FileDepthSelector.java 7 Apr 2002 02:27:55 -0000 1.1 +++ FileDepthSelector.java 5 Jul 2002 04:08:17 -0000 1.2 @@ -13,7 +13,7 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class FileDepthSelector +public final class FileDepthSelector implements FileSelector { private final int m_minDepth; 1.5 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/FileSystemException.java Index: FileSystemException.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/FileSystemException.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- FileSystemException.java 7 Apr 2002 02:27:55 -0000 1.4 +++ FileSystemException.java 5 Jul 2002 04:08:17 -0000 1.5 @@ -13,7 +13,7 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class FileSystemException +public final class FileSystemException extends Exception { /** 1.6 +3 -3 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/FileType.java Index: FileType.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/FileType.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- FileType.java 7 Apr 2002 02:27:55 -0000 1.5 +++ FileType.java 5 Jul 2002 04:08:17 -0000 1.6 @@ -32,9 +32,9 @@ */ public static final FileType FILE = new FileType( REZ.getString( "file.name" ) ); - private String m_name; + private final String m_name; - private FileType( String name ) + private FileType( final String name ) { m_name = name; } 1.6 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java Index: DefaultCommandLauncher.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DefaultCommandLauncher.java 23 May 2002 01:50:25 -0000 1.5 +++ DefaultCommandLauncher.java 5 Jul 2002 04:08:18 -0000 1.6 @@ -25,7 +25,7 @@ * @author Thomas Haas * @version $Revision$ $Date$ */ -public class DefaultCommandLauncher +public final class DefaultCommandLauncher implements CommandLauncher { private static final Resources REZ = 1.6 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java Index: ExecUtil.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ExecUtil.java 29 Mar 2002 12:56:37 -0000 1.5 +++ ExecUtil.java 5 Jul 2002 04:08:18 -0000 1.6 @@ -21,7 +21,7 @@ * @author Peter Donald * @version $Revision$ $Date$ */ -class ExecUtil +final class ExecUtil { /** * The file representing the current working directory. 1.3 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/launchers/MacCommandLauncher.java Index: MacCommandLauncher.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/launchers/MacCommandLauncher.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MacCommandLauncher.java 2 Feb 2002 05:10:36 -0000 1.2 +++ MacCommandLauncher.java 5 Jul 2002 04:08:18 -0000 1.3 @@ -23,7 +23,7 @@ * @author Thomas Haas * @version $Revision$ $Date$ */ -public class MacCommandLauncher +public final class MacCommandLauncher implements CommandLauncher { /** 1.3 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/launchers/ScriptCommandLauncher.java Index: ScriptCommandLauncher.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/launchers/ScriptCommandLauncher.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ScriptCommandLauncher.java 2 Feb 2002 05:10:36 -0000 1.2 +++ ScriptCommandLauncher.java 5 Jul 2002 04:08:18 -0000 1.3 @@ -21,7 +21,7 @@ * @author Thomas Haas * @version $Revision$ $Date$ */ -public class ScriptCommandLauncher +public final class ScriptCommandLauncher implements CommandLauncher { private String[] m_script; 1.3 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/launchers/WinNTCommandLauncher.java Index: WinNTCommandLauncher.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/launchers/WinNTCommandLauncher.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- WinNTCommandLauncher.java 2 Feb 2002 05:10:36 -0000 1.2 +++ WinNTCommandLauncher.java 5 Jul 2002 04:08:18 -0000 1.3 @@ -19,7 +19,7 @@ * @author Thomas Haas * @version $Revision$ $Date$ */ -public class WinNTCommandLauncher +public final class WinNTCommandLauncher implements CommandLauncher { /** 1.13 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/DefaultExecManager.java Index: DefaultExecManager.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/DefaultExecManager.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- DefaultExecManager.java 5 Jul 2002 03:48:03 -0000 1.12 +++ DefaultExecManager.java 5 Jul 2002 04:08:18 -0000 1.13 @@ -36,7 +36,7 @@ * @see ExecMetaData * @see Environment */ -public class DefaultExecManager +public final class DefaultExecManager implements ExecManager { /** 1.4 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/LogOutputStream.java Index: LogOutputStream.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/LogOutputStream.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- LogOutputStream.java 6 Feb 2002 13:34:46 -0000 1.3 +++ LogOutputStream.java 5 Jul 2002 04:08:18 -0000 1.4 @@ -20,7 +20,7 @@ * @author Peter Donald * @version $Revision$ $Date$ */ -class LogOutputStream +final class LogOutputStream extends OutputStream { private final boolean m_isError; 1.2 +3 -3 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/ProcessDestroyer.java Index: ProcessDestroyer.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/ProcessDestroyer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ProcessDestroyer.java 12 Jan 2002 04:51:08 -0000 1.1 +++ ProcessDestroyer.java 5 Jul 2002 04:08:18 -0000 1.2 @@ -19,10 +19,10 @@ * @author Peter Donald * @version $Revision$ $Date$ */ -class ProcessDestroyer +final class ProcessDestroyer extends Thread { - private ArrayList m_processes = new ArrayList(); + private final ArrayList m_processes = new ArrayList(); /** * Constructs a ProcessDestroyer and registers it as a shutdown 1.8 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java Index: ProcessMonitor.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ProcessMonitor.java 29 Mar 2002 12:56:37 -0000 1.7 +++ ProcessMonitor.java 5 Jul 2002 04:08:18 -0000 1.8 @@ -23,7 +23,7 @@ * @author Peter Donald * @version $Revision$ $Date$ */ -class ProcessMonitor +final class ProcessMonitor extends AbstractLogEnabled implements Runnable { 1.2 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/DefaultExecOutputHandler.java Index: DefaultExecOutputHandler.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/DefaultExecOutputHandler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultExecOutputHandler.java 12 Jan 2002 04:51:07 -0000 1.1 +++ DefaultExecOutputHandler.java 5 Jul 2002 04:08:18 -0000 1.2 @@ -16,7 +16,7 @@ * @author Peter Donald * @version $Revision$ $Date$ */ -public class DefaultExecOutputHandler +public final class DefaultExecOutputHandler extends AbstractLogEnabled implements ExecOutputHandler { 1.3 +1 -1 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/ExecException.java Index: ExecException.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/ExecException.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ExecException.java 1 Mar 2002 10:33:37 -0000 1.2 +++ ExecException.java 5 Jul 2002 04:08:18 -0000 1.3 @@ -12,7 +12,7 @@ * * @author Peter Donald */ -public class ExecException +public final class ExecException extends Exception { /** 1.5 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/ExecMetaData.java Index: ExecMetaData.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/ExecMetaData.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ExecMetaData.java 2 Mar 2002 01:28:06 -0000 1.4 +++ ExecMetaData.java 5 Jul 2002 04:08:18 -0000 1.5 @@ -19,7 +19,7 @@ * @author Peter Donald * @version $Revision$ $Date$ */ -public class ExecMetaData +public final class ExecMetaData { /** * The working directory in which the applicaiton is launched. 1.8 +1 -1 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/Os.java Index: Os.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/Os.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Os.java 29 Mar 2002 12:56:37 -0000 1.7 +++ Os.java 5 Jul 2002 04:08:18 -0000 1.8 @@ -20,7 +20,7 @@ * @author Magesh Umasankar * @author Peter Donald */ -public class Os +public final class Os { private static final String OS_NAME = System.getProperty( "os.name" ).toLowerCase( Locale.US ); 1.2 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/PathUtil.java Index: PathUtil.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/PathUtil.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PathUtil.java 7 Apr 2002 09:51:09 -0000 1.1 +++ PathUtil.java 5 Jul 2002 04:08:18 -0000 1.2 @@ -16,7 +16,7 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class PathUtil +public final class PathUtil { /** * Formats a path into its native representation. 1.2 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/impl/DefaultFileReplicator.java Index: DefaultFileReplicator.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/impl/DefaultFileReplicator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultFileReplicator.java 7 Apr 2002 02:27:56 -0000 1.1 +++ DefaultFileReplicator.java 5 Jul 2002 04:08:18 -0000 1.2 @@ -25,7 +25,7 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class DefaultFileReplicator +public final class DefaultFileReplicator extends AbstractLogEnabled implements FileReplicator, Disposable { 1.11 +4 -4 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java Index: DefaultFileSystemManager.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- DefaultFileSystemManager.java 5 Jul 2002 03:21:54 -0000 1.10 +++ DefaultFileSystemManager.java 5 Jul 2002 04:08:18 -0000 1.11 @@ -37,7 +37,7 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class DefaultFileSystemManager +public final class DefaultFileSystemManager extends AbstractLogEnabled implements FileSystemManager, Disposable { @@ -57,7 +57,7 @@ private FileObject m_baseFile; /** The context to send to providers. */ - private DefaultProviderContext m_context = new DefaultProviderContext( this ); + private final DefaultProviderContext m_context = new DefaultProviderContext( this ); /** * Registers a file system provider. @@ -282,7 +282,7 @@ } // This is an internal class because it needs access to the private member m_providers. - class VfsStreamHandlerFactory implements URLStreamHandlerFactory + final class VfsStreamHandlerFactory implements URLStreamHandlerFactory { public URLStreamHandler createURLStreamHandler( final String protocol ) { 1.3 +9 -7 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/impl/URLStreamHandlerProxy.java Index: URLStreamHandlerProxy.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/impl/URLStreamHandlerProxy.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- URLStreamHandlerProxy.java 5 Jul 2002 03:21:54 -0000 1.2 +++ URLStreamHandlerProxy.java 5 Jul 2002 04:08:18 -0000 1.3 @@ -19,22 +19,24 @@ * @author Brian Olsen * @version $Revision$ $Date$ */ -public class URLStreamHandlerProxy +public final class URLStreamHandlerProxy extends URLStreamHandler { - - protected URLConnection openConnection( URL url ) + protected URLConnection openConnection( final URL url ) throws IOException { - URL proxyURL = new URL( url.toExternalForm() ); + final URL proxyURL = new URL( url.toExternalForm() ); return proxyURL.openConnection(); } - protected void parseURL( URL u, String spec, int start, int limit ) + protected void parseURL( final URL u, + final String spec, + final int start, + final int limit ) { try { - URL url = new URL( u, spec ); + final URL url = new URL( u, spec ); setURL( u, url.getProtocol(), url.getHost(), url.getPort(), url.getAuthority(), url.getUserInfo(), url.getFile(), url.getQuery(), url.getRef() ); 1.3 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/local/DefaultLocalFileSystemProvider.java Index: DefaultLocalFileSystemProvider.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/local/DefaultLocalFileSystemProvider.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DefaultLocalFileSystemProvider.java 17 Jun 2002 07:19:45 -0000 1.2 +++ DefaultLocalFileSystemProvider.java 5 Jul 2002 04:08:18 -0000 1.3 @@ -26,7 +26,7 @@ * @ant.type type="file-provider" name="file" * */ -public class DefaultLocalFileSystemProvider +public final class DefaultLocalFileSystemProvider extends AbstractFileSystemProvider implements LocalFileProvider { 1.3 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/local/GenericFileNameParser.java Index: GenericFileNameParser.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/local/GenericFileNameParser.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- GenericFileNameParser.java 29 Mar 2002 12:56:37 -0000 1.2 +++ GenericFileNameParser.java 5 Jul 2002 04:08:18 -0000 1.3 @@ -17,7 +17,7 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -class GenericFileNameParser +final class GenericFileNameParser extends LocalFileNameParser { private static final Resources REZ 1.4 +5 -3 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/local/LocalFileSystem.java Index: LocalFileSystem.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/local/LocalFileSystem.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- LocalFileSystem.java 7 Apr 2002 02:27:57 -0000 1.3 +++ LocalFileSystem.java 5 Jul 2002 04:08:18 -0000 1.4 @@ -21,9 +21,11 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -class LocalFileSystem extends AbstractFileSystem implements FileSystem +final class LocalFileSystem + extends AbstractFileSystem + implements FileSystem { - private String m_rootFile; + private final String m_rootFile; public LocalFileSystem( final FileSystemProviderContext context, final DefaultFileName rootName, 1.3 +3 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/local/ParsedFileUri.java Index: ParsedFileUri.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/local/ParsedFileUri.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ParsedFileUri.java 2 Mar 2002 04:07:51 -0000 1.2 +++ ParsedFileUri.java 5 Jul 2002 04:08:18 -0000 1.3 @@ -15,7 +15,8 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -class ParsedFileUri extends ParsedUri +final class ParsedFileUri + extends ParsedUri { private String m_rootFile; 1.3 +2 -3 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/local/WindowsFileNameParser.java Index: WindowsFileNameParser.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/local/WindowsFileNameParser.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- WindowsFileNameParser.java 29 Mar 2002 12:56:37 -0000 1.2 +++ WindowsFileNameParser.java 5 Jul 2002 04:08:18 -0000 1.3 @@ -17,7 +17,7 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -class WindowsFileNameParser +final class WindowsFileNameParser extends LocalFileNameParser { private static final Resources REZ @@ -79,7 +79,6 @@ * Extracts a drive prefix from a path. Leading '/' chars have been removed. */ private String extractDrivePrefix( final StringBuffer name ) - throws FileSystemException { // Looking for ':' '/' if( name.length() < 3 ) 1.5 +3 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/ftp/FtpFileNameParser.java Index: FtpFileNameParser.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/ftp/FtpFileNameParser.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- FtpFileNameParser.java 7 Apr 2002 02:27:57 -0000 1.4 +++ FtpFileNameParser.java 5 Jul 2002 04:08:18 -0000 1.5 @@ -16,7 +16,8 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class FtpFileNameParser extends UriParser +public final class FtpFileNameParser + extends UriParser { /** * Parses an absolute URI, splitting it into its components. 1.7 +3 -3 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java Index: FtpFileObject.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- FtpFileObject.java 7 Apr 2002 02:27:57 -0000 1.6 +++ FtpFileObject.java 5 Jul 2002 04:08:18 -0000 1.7 @@ -24,7 +24,7 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -class FtpFileObject +final class FtpFileObject extends AbstractFileObject { private static final Resources REZ = @@ -32,7 +32,7 @@ private static final FTPFile[] EMPTY_FTP_FILE_ARRAY = {}; - private FtpFileSystem m_ftpFs; + private final FtpFileSystem m_ftpFs; // Cached info private FTPFile m_fileInfo; 1.6 +3 -3 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java Index: FtpFileSystem.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- FtpFileSystem.java 7 Apr 2002 02:27:57 -0000 1.5 +++ FtpFileSystem.java 5 Jul 2002 04:08:19 -0000 1.6 @@ -25,13 +25,13 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -class FtpFileSystem +final class FtpFileSystem extends AbstractFileSystem { private static final Resources REZ = ResourceManager.getPackageResources( FtpFileSystem.class ); - private FTPClient m_client; + private final FTPClient m_client; public FtpFileSystem( final FileSystemProviderContext context, final FileName rootName, 1.6 +3 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystemProvider.java Index: FtpFileSystemProvider.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystemProvider.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- FtpFileSystemProvider.java 17 Jun 2002 07:19:45 -0000 1.5 +++ FtpFileSystemProvider.java 5 Jul 2002 04:08:19 -0000 1.6 @@ -23,7 +23,8 @@ * * @ant.type type="file-provider" name="ftp" */ -public class FtpFileSystemProvider extends AbstractFileSystemProvider +public final class FtpFileSystemProvider + extends AbstractFileSystemProvider { private final FtpFileNameParser m_parser = new FtpFileNameParser(); 1.3 +3 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/ftp/ParsedFtpUri.java Index: ParsedFtpUri.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/ftp/ParsedFtpUri.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ParsedFtpUri.java 7 Apr 2002 02:27:57 -0000 1.2 +++ ParsedFtpUri.java 5 Jul 2002 04:08:19 -0000 1.3 @@ -15,7 +15,8 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class ParsedFtpUri extends ParsedUri +public final class ParsedFtpUri + extends ParsedUri { private String m_userName; private String m_password; 1.3 +3 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/smb/ParsedSmbUri.java Index: ParsedSmbUri.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/smb/ParsedSmbUri.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ParsedSmbUri.java 7 Apr 2002 02:27:57 -0000 1.2 +++ ParsedSmbUri.java 5 Jul 2002 04:08:19 -0000 1.3 @@ -15,7 +15,8 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class ParsedSmbUri extends ParsedUri +public final class ParsedSmbUri + extends ParsedUri { private String m_share; 1.7 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java Index: SmbFileNameParser.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SmbFileNameParser.java 7 Apr 2002 02:27:57 -0000 1.6 +++ SmbFileNameParser.java 5 Jul 2002 04:08:19 -0000 1.7 @@ -19,7 +19,7 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class SmbFileNameParser +public final class SmbFileNameParser extends UriParser { private static final Resources REZ = 1.5 +3 -3 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/smb/SmbFileObject.java Index: SmbFileObject.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/smb/SmbFileObject.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- SmbFileObject.java 7 Apr 2002 02:27:57 -0000 1.4 +++ SmbFileObject.java 5 Jul 2002 04:08:19 -0000 1.5 @@ -26,14 +26,14 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class SmbFileObject +public final class SmbFileObject extends AbstractFileObject implements FileObject { private static final Resources REZ = ResourceManager.getPackageResources( SmbFileObject.class ); - private String m_fileName; + private final String m_fileName; private SmbFile m_file; protected SmbFileObject( final String fileName, 1.3 +4 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/smb/SmbFileSystem.java Index: SmbFileSystem.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/smb/SmbFileSystem.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SmbFileSystem.java 7 Apr 2002 02:27:57 -0000 1.2 +++ SmbFileSystem.java 5 Jul 2002 04:08:19 -0000 1.3 @@ -20,7 +20,9 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class SmbFileSystem extends AbstractFileSystem implements FileSystem +public final class SmbFileSystem + extends AbstractFileSystem + implements FileSystem { public SmbFileSystem( final FileSystemProviderContext context, final FileName rootName ) 1.7 +4 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/smb/SmbFileSystemProvider.java Index: SmbFileSystemProvider.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/smb/SmbFileSystemProvider.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SmbFileSystemProvider.java 5 Jul 2002 03:21:54 -0000 1.6 +++ SmbFileSystemProvider.java 5 Jul 2002 04:08:19 -0000 1.7 @@ -24,7 +24,9 @@ * * @ant.type type="file-provider" name="smb" */ -public class SmbFileSystemProvider extends AbstractFileSystemProvider implements FileProvider +public final class SmbFileSystemProvider + extends AbstractFileSystemProvider + implements FileProvider { private final SmbFileNameParser m_parser = new SmbFileNameParser(); 1.4 +3 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/zip/ParsedZipUri.java Index: ParsedZipUri.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/zip/ParsedZipUri.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ParsedZipUri.java 7 Apr 2002 02:27:57 -0000 1.3 +++ ParsedZipUri.java 5 Jul 2002 04:08:19 -0000 1.4 @@ -16,7 +16,8 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class ParsedZipUri extends ParsedUri +public final class ParsedZipUri + extends ParsedUri { private String m_zipFileName; private FileObject m_zipFile; 1.4 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/zip/ZipFileNameParser.java Index: ZipFileNameParser.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/zip/ZipFileNameParser.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ZipFileNameParser.java 7 Apr 2002 02:27:57 -0000 1.3 +++ ZipFileNameParser.java 5 Jul 2002 04:08:19 -0000 1.4 @@ -16,7 +16,7 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class ZipFileNameParser +public final class ZipFileNameParser extends UriParser { private static final char[] ZIP_URL_RESERVED_CHARS = {'!'}; 1.3 +17 -8 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/zip/ZipFileObject.java Index: ZipFileObject.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/zip/ZipFileObject.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ZipFileObject.java 7 Apr 2002 02:27:57 -0000 1.2 +++ ZipFileObject.java 5 Jul 2002 04:08:19 -0000 1.3 @@ -22,12 +22,14 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -class ZipFileObject extends AbstractFileObject implements FileObject +final class ZipFileObject + extends AbstractFileObject + implements FileObject { - private ZipEntry m_entry; - private ZipFile m_file; - private FileType m_type; - private HashSet m_children = new HashSet(); + private final ZipEntry m_entry; + private final ZipFile m_file; + private final FileType m_type; + private final HashSet m_children = new HashSet(); public ZipFileObject( FileName name, ZipEntry entry, @@ -40,14 +42,21 @@ m_file = zipFile; } - public ZipFileObject( FileName name, boolean exists, ZipFileSystem fs ) + public ZipFileObject( final FileName name, + final boolean exists, + final ZipFileSystem fs ) { super( name, fs ); + m_entry = null; + m_file = null; if( exists ) { m_type = FileType.FOLDER; } - // else _type = null + else + { + m_type = null; + } } /** 1.7 +6 -5 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java Index: ZipFileSystem.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ZipFileSystem.java 5 Jul 2002 03:46:14 -0000 1.6 +++ ZipFileSystem.java 5 Jul 2002 04:08:19 -0000 1.7 @@ -28,19 +28,20 @@ * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class ZipFileSystem +public final class ZipFileSystem extends AbstractFileSystem implements FileSystem { private static final Resources REZ = ResourceManager.getPackageResources( ZipFileSystem.class ); - private File m_file; - private ZipFile m_zipFile; + private final File m_file; + private final ZipFile m_zipFile; public ZipFileSystem( final FileSystemProviderContext context, final DefaultFileName rootName, - final File file ) throws FileSystemException + final File file ) + throws FileSystemException { super( context, rootName ); m_file = file; 1.7 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystemProvider.java Index: ZipFileSystemProvider.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystemProvider.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ZipFileSystemProvider.java 5 Jul 2002 03:21:54 -0000 1.6 +++ ZipFileSystemProvider.java 5 Jul 2002 04:08:19 -0000 1.7 @@ -26,7 +26,7 @@ * * @ant.type type="file-provider" name="zip" */ -public class ZipFileSystemProvider +public final class ZipFileSystemProvider extends AbstractFileSystemProvider implements FileProvider { -- To unsubscribe, e-mail: For additional commands, e-mail: