You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ad...@apache.org on 2002/11/23 01:41:10 UTC
cvs commit: jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test FileInfo.java ProviderTestSuite.java ProviderWriteTests.java UrlTests.java
adammurdoch 2002/11/22 16:41:10
Modified: vfs/src/java/org/apache/commons/vfs FileSelector.java
FileSystemManager.java FileType.java FileUtil.java
VFS.java
vfs/src/java/org/apache/commons/vfs/impl
PrivilegedFileReplicator.java Resource.java
StandardFileSystemManager.java VFSClassLoader.java
vfs/src/java/org/apache/commons/vfs/provider
AbstractFileObject.java AbstractFileSystem.java
AbstractFileSystemProvider.java
AbstractLayeredFileProvider.java
AbstractVfsContainer.java DefaultFileContent.java
Uri.java UriParser.java VfsComponentContext.java
vfs/src/java/org/apache/commons/vfs/provider/ftp
FtpFileSystem.java
vfs/src/java/org/apache/commons/vfs/provider/zip
ZipFileObject.java
vfs/src/java/org/apache/commons/vfs/tasks
AbstractSyncTask.java
vfs/src/java/org/apache/commons/vfs/util Messages.java
Os.java
vfs/src/test/org/apache/commons/vfs/provider/jar/test
JarProviderTestCase.java NestedJarTestCase.java
vfs/src/test/org/apache/commons/vfs/provider/test
JunctionProviderConfig.java
vfs/src/test/org/apache/commons/vfs/test FileInfo.java
ProviderTestSuite.java ProviderWriteTests.java
UrlTests.java
Log:
Tidy up formatting.
Revision Changes Path
1.5 +1 -1 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/FileSelector.java
Index: FileSelector.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/FileSelector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FileSelector.java 28 Oct 2002 02:05:06 -0000 1.4
+++ FileSelector.java 23 Nov 2002 00:41:09 -0000 1.5
@@ -59,7 +59,7 @@
* This interface is used to select files when traversing a file hierarchy.
*
* @see Selectors
- *
+ *
* @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
* @version $Revision$ $Date$
*/
1.9 +1 -1 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/FileSystemManager.java
Index: FileSystemManager.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/FileSystemManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FileSystemManager.java 1 Nov 2002 03:29:31 -0000 1.8
+++ FileSystemManager.java 23 Nov 2002 00:41:09 -0000 1.9
@@ -195,7 +195,7 @@
*
* @return
* The root file of the new file system.
- *
+ *
* @throws FileSystemException
* On error creating the file system.
*/
1.5 +2 -2 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/FileType.java
Index: FileType.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/FileType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FileType.java 23 Oct 2002 11:59:39 -0000 1.4
+++ FileType.java 23 Nov 2002 00:41:09 -0000 1.5
@@ -67,12 +67,12 @@
* A folder, which can contain other files, but does not have any data
* content.
*/
- public static final FileType FOLDER = new FileType("folder");
+ public static final FileType FOLDER = new FileType( "folder" );
/**
* A regular file, which has data content, but cannot contain other files.
*/
- public static final FileType FILE = new FileType("file");
+ public static final FileType FILE = new FileType( "file" );
private final String name;
1.2 +3 -3 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/FileUtil.java
Index: FileUtil.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/FileUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileUtil.java 27 Oct 2002 08:15:01 -0000 1.1
+++ FileUtil.java 23 Nov 2002 00:41:09 -0000 1.2
@@ -79,7 +79,7 @@
throws IOException
{
final FileContent content = file.getContent();
- final int size = (int) content.getSize();
+ final int size = (int)content.getSize();
final byte[] buf = new byte[ size ];
final InputStream in = content.getInputStream();
@@ -88,7 +88,7 @@
int read = 0;
for ( int pos = 0; pos < size && read >= 0; pos += read )
{
- read = in.read( buf, pos, size - pos );
+ read = in.read( buf, pos, size - pos );
}
}
finally
1.2 +3 -3 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/VFS.java
Index: VFS.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/VFS.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VFS.java 23 Oct 2002 13:12:14 -0000 1.1
+++ VFS.java 23 Nov 2002 00:41:09 -0000 1.2
@@ -105,9 +105,9 @@
try
{
// Set the logger
- final Method setLogMethod = mgrClass.getMethod( "setLogger", new Class[] { Log.class } );
+ final Method setLogMethod = mgrClass.getMethod( "setLogger", new Class[]{Log.class} );
final Log logger = LogFactory.getLog( VFS.class );
- setLogMethod.invoke( mgr, new Object[] { logger } );
+ setLogMethod.invoke( mgr, new Object[]{logger} );
}
catch ( final NoSuchMethodException e )
{
1.9 +2 -2 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/impl/PrivilegedFileReplicator.java
Index: PrivilegedFileReplicator.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/impl/PrivilegedFileReplicator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PrivilegedFileReplicator.java 23 Nov 2002 00:33:52 -0000 1.8
+++ PrivilegedFileReplicator.java 23 Nov 2002 00:41:09 -0000 1.9
@@ -99,7 +99,7 @@
*/
public void setLogger( final Log logger )
{
- if ( replicatorComponent != null )
+ if ( replicatorComponent != null )
{
replicatorComponent.setLogger( logger );
}
1.5 +2 -2 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/impl/Resource.java
Index: Resource.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/impl/Resource.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Resource.java 1 Nov 2002 03:29:53 -0000 1.4
+++ Resource.java 23 Nov 2002 00:41:09 -0000 1.5
@@ -86,7 +86,7 @@
this.root = root;
this.resource = resource;
}
-
+
/**
* Returns the URL of the resource.
*/
1.7 +2 -2 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/impl/StandardFileSystemManager.java
Index: StandardFileSystemManager.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/impl/StandardFileSystemManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StandardFileSystemManager.java 23 Nov 2002 00:33:52 -0000 1.6
+++ StandardFileSystemManager.java 23 Nov 2002 00:41:09 -0000 1.7
@@ -138,7 +138,7 @@
}
catch ( final Exception e )
{
- throw new FileSystemException("vfs.impl/create-provider.error", providerClassName, e );
+ throw new FileSystemException( "vfs.impl/create-provider.error", providerClassName, e );
}
}
1.11 +3 -3 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/impl/VFSClassLoader.java
Index: VFSClassLoader.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/impl/VFSClassLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- VFSClassLoader.java 23 Nov 2002 00:33:52 -0000 1.10
+++ VFSClassLoader.java 23 Nov 2002 00:41:09 -0000 1.11
@@ -107,7 +107,7 @@
final FileSystemManager manager )
throws FileSystemException
{
- this( new FileObject[] { file }, manager, null );
+ this( new FileObject[]{file}, manager, null );
}
/**
@@ -126,7 +126,7 @@
final ClassLoader parent )
throws FileSystemException
{
- this( new FileObject[] { file }, manager, parent );
+ this( new FileObject[]{file}, manager, parent );
}
/**
1.21 +2 -2 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractFileObject.java
Index: AbstractFileObject.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractFileObject.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AbstractFileObject.java 23 Nov 2002 00:01:58 -0000 1.20
+++ AbstractFileObject.java 23 Nov 2002 00:41:09 -0000 1.21
@@ -76,7 +76,7 @@
import org.apache.commons.vfs.Selectors;
/**
- * A partial file object implementation.
+ * A partial file object implementation.
*
* @todo Chop this class up - move all the protected methods to several
* interfaces, so that structure and content can be separately overridden.
@@ -1058,7 +1058,7 @@
fileInfo.setFile( child );
traverse( fileInfo, selector, depthwise, selected );
}
-
+
fileInfo.setFile( file );
fileInfo.setDepth( curDepth );
}
1.16 +1 -1 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractFileSystem.java
Index: AbstractFileSystem.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractFileSystem.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AbstractFileSystem.java 23 Nov 2002 00:11:53 -0000 1.15
+++ AbstractFileSystem.java 23 Nov 2002 00:41:09 -0000 1.16
@@ -214,7 +214,7 @@
{
if ( !rootName.getRootURI().equals( name.getRootURI() ) )
{
- throw new FileSystemException( "vfs.provider/mismatched-fs-for-name.error", new Object[] { name, rootName } );
+ throw new FileSystemException( "vfs.provider/mismatched-fs-for-name.error", new Object[]{name, rootName} );
}
FileObject file = (FileObject)files.get( name );
1.14 +1 -1 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractFileSystemProvider.java
Index: AbstractFileSystemProvider.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractFileSystemProvider.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AbstractFileSystemProvider.java 23 Nov 2002 00:33:53 -0000 1.13
+++ AbstractFileSystemProvider.java 23 Nov 2002 00:41:09 -0000 1.14
@@ -96,7 +96,7 @@
// Can't create a layered file system
throw new FileSystemException( "vfs.provider/not-layered-fs.error", scheme );
}
-
+
/**
* Adds a file system to those cached by this provider. The file system
* may implement {@link VfsComponent}, in which case it is initialised.
1.6 +2 -2 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractLayeredFileProvider.java
Index: AbstractLayeredFileProvider.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractLayeredFileProvider.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractLayeredFileProvider.java 23 Nov 2002 00:33:53 -0000 1.5
+++ AbstractLayeredFileProvider.java 23 Nov 2002 00:41:09 -0000 1.6
@@ -115,7 +115,7 @@
/**
* Creates a layered file system. This method is called if the file system
* is not cached. The file system may implement {@link VfsComponent}.
- *
+ *
* @param scheme The URI scheme.
* @param file The file to create the file system on top of.
* @return The file system.
1.2 +2 -2 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractVfsContainer.java
Index: AbstractVfsContainer.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractVfsContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractVfsContainer.java 1 Nov 2002 03:25:51 -0000 1.1
+++ AbstractVfsContainer.java 23 Nov 2002 00:41:09 -0000 1.2
@@ -78,7 +78,7 @@
protected void addComponent( final Object component )
throws FileSystemException
{
- if ( ! components.contains( component ) )
+ if ( !components.contains( component ) )
{
// Initialise
if ( component instanceof VfsComponent )
1.10 +2 -2 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/DefaultFileContent.java
Index: DefaultFileContent.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/DefaultFileContent.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultFileContent.java 27 Oct 2002 08:16:20 -0000 1.9
+++ DefaultFileContent.java 23 Nov 2002 00:41:09 -0000 1.10
@@ -177,7 +177,7 @@
}
catch ( final Exception e )
{
- throw new FileSystemException( "vfs.provider/get-attribute.error", new Object[] { attrName, file }, e );
+ throw new FileSystemException( "vfs.provider/get-attribute.error", new Object[]{attrName, file}, e );
}
}
@@ -193,7 +193,7 @@
}
catch ( final Exception e )
{
- throw new FileSystemException( "vfs.provider/set-attribute.error", new Object[] { attrName, file }, e );
+ throw new FileSystemException( "vfs.provider/set-attribute.error", new Object[]{attrName, file}, e );
}
}
1.2 +2 -2 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/Uri.java
Index: Uri.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/Uri.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Uri.java 31 Oct 2002 10:40:57 -0000 1.1
+++ Uri.java 23 Nov 2002 00:41:09 -0000 1.2
@@ -90,7 +90,7 @@
{
this.path = path;
}
-
+
/** Returns the root URI, used to identify the file system. */
public String getContainerUri()
{
1.10 +3 -3 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/UriParser.java
Index: UriParser.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/UriParser.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- UriParser.java 1 Nov 2002 03:20:58 -0000 1.9
+++ UriParser.java 23 Nov 2002 00:41:09 -0000 1.10
@@ -548,7 +548,7 @@
int depth = 1;
for ( int pos = 0; pos > -1 && pos < len; depth++ )
{
- pos = path.indexOf( separatorChar, pos+1 );
+ pos = path.indexOf( separatorChar, pos + 1 );
}
return depth;
}
@@ -694,8 +694,8 @@
continue;
}
if ( elemLen == 2
- && path.charAt( startElem ) == '.'
- && path.charAt( startElem + 1 ) == '.' )
+ && path.charAt( startElem ) == '.'
+ && path.charAt( startElem + 1 ) == '.' )
{
// A '..' element - remove the previous element
if ( startElem == startFirstElem )
1.2 +2 -2 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/VfsComponentContext.java
Index: VfsComponentContext.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/VfsComponentContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VfsComponentContext.java 17 Nov 2002 03:37:11 -0000 1.1
+++ VfsComponentContext.java 23 Nov 2002 00:41:09 -0000 1.2
@@ -97,7 +97,7 @@
* Locates a temporary file store for the provider to use.
*/
TemporaryFileStore getTemporaryFileStore() throws FileSystemException;
-
+
/**
* Returns a {@link FileObject} for a local file.
*/
1.13 +1 -1 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/ftp/FtpFileSystem.java
Index: FtpFileSystem.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/ftp/FtpFileSystem.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FtpFileSystem.java 23 Nov 2002 00:33:53 -0000 1.12
+++ FtpFileSystem.java 23 Nov 2002 00:41:10 -0000 1.13
@@ -132,7 +132,7 @@
caps.add( Capability.LIST_CHILDREN );
caps.add( Capability.READ_CONTENT );
caps.add( Capability.URI );
- caps.add( Capability.WRITE_CONTENT );
+ caps.add( Capability.WRITE_CONTENT );
}
/**
1.10 +1 -1 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/zip/ZipFileObject.java
Index: ZipFileObject.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/zip/ZipFileObject.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ZipFileObject.java 23 Nov 2002 00:33:54 -0000 1.9
+++ ZipFileObject.java 23 Nov 2002 00:41:10 -0000 1.10
@@ -103,7 +103,7 @@
return;
}
- if ((entry == null) || ( entry.isDirectory() ))
+ if ( ( entry == null ) || ( entry.isDirectory() ) )
{
type = FileType.FOLDER;
}
1.6 +2 -2 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/tasks/AbstractSyncTask.java
Index: AbstractSyncTask.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/tasks/AbstractSyncTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractSyncTask.java 20 Nov 2002 23:57:13 -0000 1.5
+++ AbstractSyncTask.java 23 Nov 2002 00:41:10 -0000 1.6
@@ -253,7 +253,7 @@
for ( int i = 0; i < allDestFiles.length; i++ )
{
final FileObject destFile = allDestFiles[ i ];
- if ( ! destFiles.contains( destFile ) )
+ if ( !destFiles.contains( destFile ) )
{
handleMissingSourceFile( destFile );
}
1.6 +2 -2 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/util/Messages.java
Index: Messages.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/util/Messages.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Messages.java 23 Nov 2002 00:33:54 -0000 1.5
+++ Messages.java 23 Nov 2002 00:41:10 -0000 1.6
@@ -97,7 +97,7 @@
*/
public static String getString( final String code, final Object param )
{
- return getString( code, new Object[] { param } );
+ return getString( code, new Object[]{param} );
}
/**
1.5 +2 -2 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/util/Os.java
Index: Os.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/util/Os.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Os.java 23 Oct 2002 11:59:42 -0000 1.4
+++ Os.java 23 Nov 2002 00:41:10 -0000 1.5
@@ -330,8 +330,8 @@
if ( OS_NAME.indexOf( "windows" ) > -1 )
{
if ( OS_NAME.indexOf( "xp" ) > -1
- || OS_NAME.indexOf( "2000" ) > -1
- || OS_NAME.indexOf( "nt" ) > -1 )
+ || OS_NAME.indexOf( "2000" ) > -1
+ || OS_NAME.indexOf( "nt" ) > -1 )
{
return OS_FAMILY_WINNT;
}
1.4 +7 -7 jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/provider/jar/test/JarProviderTestCase.java
Index: JarProviderTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/provider/jar/test/JarProviderTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JarProviderTestCase.java 23 Nov 2002 00:33:54 -0000 1.3
+++ JarProviderTestCase.java 23 Nov 2002 00:41:10 -0000 1.4
@@ -109,12 +109,12 @@
protected boolean verifyPackage( Package pack )
{
return "code".equals( pack.getName() ) &&
- "ImplTitle".equals( pack.getImplementationTitle() ) &&
- "ImplVendor".equals( pack.getImplementationVendor() ) &&
- "1.1".equals( pack.getImplementationVersion() ) &&
- "SpecTitle".equals( pack.getSpecificationTitle() ) &&
- "SpecVendor".equals( pack.getSpecificationVendor() ) &&
- "1.0".equals( pack.getSpecificationVersion() ) &&
- !pack.isSealed();
+ "ImplTitle".equals( pack.getImplementationTitle() ) &&
+ "ImplVendor".equals( pack.getImplementationVendor() ) &&
+ "1.1".equals( pack.getImplementationVersion() ) &&
+ "SpecTitle".equals( pack.getSpecificationTitle() ) &&
+ "SpecVendor".equals( pack.getSpecificationVendor() ) &&
+ "1.0".equals( pack.getSpecificationVersion() ) &&
+ !pack.isSealed();
}
}
1.3 +14 -14 jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/provider/jar/test/NestedJarTestCase.java
Index: NestedJarTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/provider/jar/test/NestedJarTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NestedJarTestCase.java 23 Nov 2002 00:32:12 -0000 1.2
+++ NestedJarTestCase.java 23 Nov 2002 00:41:10 -0000 1.3
@@ -114,13 +114,13 @@
protected boolean verifyPackage( Package pack )
{
return "code".equals( pack.getName() ) &&
- "ImplTitle".equals( pack.getImplementationTitle() ) &&
- "ImplVendor".equals( pack.getImplementationVendor() ) &&
- "1.1".equals( pack.getImplementationVersion() ) &&
- "SpecTitle".equals( pack.getSpecificationTitle() ) &&
- "SpecVendor".equals( pack.getSpecificationVendor() ) &&
- "1.0".equals( pack.getSpecificationVersion() ) &&
- !pack.isSealed();
+ "ImplTitle".equals( pack.getImplementationTitle() ) &&
+ "ImplVendor".equals( pack.getImplementationVendor() ) &&
+ "1.1".equals( pack.getImplementationVersion() ) &&
+ "SpecTitle".equals( pack.getSpecificationTitle() ) &&
+ "SpecVendor".equals( pack.getSpecificationVendor() ) &&
+ "1.0".equals( pack.getSpecificationVersion() ) &&
+ !pack.isSealed();
}
/*
@@ -152,12 +152,12 @@
protected boolean verifyNormalPackage( Package pack )
{
return "code".equals( pack.getName() ) &&
- "NormalTitle".equals( pack.getImplementationTitle() ) &&
- "NormalVendor".equals( pack.getImplementationVendor() ) &&
- "1.2".equals( pack.getImplementationVersion() ) &&
- "NormalSpec".equals( pack.getSpecificationTitle() ) &&
- "NormalSpecVendor".equals( pack.getSpecificationVendor() ) &&
- "0.1".equals( pack.getSpecificationVersion() ) &&
- pack.isSealed();
+ "NormalTitle".equals( pack.getImplementationTitle() ) &&
+ "NormalVendor".equals( pack.getImplementationVendor() ) &&
+ "1.2".equals( pack.getImplementationVersion() ) &&
+ "NormalSpec".equals( pack.getSpecificationTitle() ) &&
+ "NormalSpecVendor".equals( pack.getSpecificationVendor() ) &&
+ "0.1".equals( pack.getSpecificationVersion() ) &&
+ pack.isSealed();
}
}
1.2 +3 -3 jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/provider/test/JunctionProviderConfig.java
Index: JunctionProviderConfig.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/provider/test/JunctionProviderConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JunctionProviderConfig.java 23 Nov 2002 00:32:12 -0000 1.1
+++ JunctionProviderConfig.java 23 Nov 2002 00:41:10 -0000 1.2
@@ -96,8 +96,8 @@
// Create an empty file system, then link in read-tests and write-tests
final FileSystem newFs = manager.createFileSystem( "vfs:" ).getFileSystem();
final String junctionPoint = "/some/dir";
- newFs.addJunction( junctionPoint + "/read-tests", baseFolder.resolveFile( "read-tests") );
- newFs.addJunction( junctionPoint + "/write-tests", baseFolder.resolveFile( "write-tests/subdir") );
+ newFs.addJunction( junctionPoint + "/read-tests", baseFolder.resolveFile( "read-tests" ) );
+ newFs.addJunction( junctionPoint + "/write-tests", baseFolder.resolveFile( "write-tests/subdir" ) );
return newFs.resolveFile( junctionPoint );
}
1.4 +1 -1 jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/FileInfo.java
Index: FileInfo.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/FileInfo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileInfo.java 23 Nov 2002 00:33:55 -0000 1.3
+++ FileInfo.java 23 Nov 2002 00:41:10 -0000 1.4
@@ -96,7 +96,7 @@
/** Adds a bunch of children. */
public void addChildren( final String[] baseNames, final FileType type )
{
- for( int i = 0; i < baseNames.length; i++ )
+ for ( int i = 0; i < baseNames.length; i++ )
{
String baseName = baseNames[ i ];
addChild( new FileInfo( baseName, type ) );
1.4 +2 -2 jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/ProviderTestSuite.java
Index: ProviderTestSuite.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/ProviderTestSuite.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProviderTestSuite.java 23 Nov 2002 00:32:12 -0000 1.3
+++ ProviderTestSuite.java 23 Nov 2002 00:41:10 -0000 1.4
@@ -119,7 +119,7 @@
for ( int i = 0; i < methods.length; i++ )
{
final Method method = methods[ i ];
- if ( ! method.getName().startsWith( "test")
+ if ( !method.getName().startsWith( "test" )
|| Modifier.isStatic( method.getModifiers() )
|| method.getReturnType() != Void.TYPE
|| method.getParameterTypes().length != 0 )
1.4 +4 -4 jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/ProviderWriteTests.java
Index: ProviderWriteTests.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/ProviderWriteTests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProviderWriteTests.java 23 Nov 2002 00:33:55 -0000 1.3
+++ ProviderWriteTests.java 23 Nov 2002 00:41:10 -0000 1.4
@@ -191,7 +191,7 @@
folder.createFile();
fail();
}
- catch( FileSystemException exc )
+ catch ( FileSystemException exc )
{
}
@@ -201,7 +201,7 @@
file.createFolder();
fail();
}
- catch( FileSystemException exc )
+ catch ( FileSystemException exc )
{
}
@@ -212,7 +212,7 @@
folder2.createFolder();
fail();
}
- catch( FileSystemException exc )
+ catch ( FileSystemException exc )
{
}
}
@@ -374,7 +374,7 @@
assertEquals( names.size(), files.length );
// Check for unexpected names
- for( int i = 0; i < files.length; i++ )
+ for ( int i = 0; i < files.length; i++ )
{
FileObject file = files[ i ];
assertTrue( names.contains( file.getName().getBaseName() ) );
1.3 +2 -2 jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/UrlTests.java
Index: UrlTests.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/UrlTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UrlTests.java 23 Nov 2002 00:33:55 -0000 1.2
+++ UrlTests.java 23 Nov 2002 00:41:10 -0000 1.3
@@ -80,7 +80,7 @@
*/
protected Capability[] getRequiredCaps()
{
- return new Capability[] { Capability.URI };
+ return new Capability[]{Capability.URI};
}
/**
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>