This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/master by this push: new 1fc1978 Javadoc: Use "file system" instead of "filesystem". 1fc1978 is described below commit 1fc19783bd4882df0e9cd99ce1df3d763e55dbee Author: Gary Gregory <gardgreg...@gmail.com> AuthorDate: Thu May 30 14:00:46 2019 -0400 Javadoc: Use "file system" instead of "filesystem". --- .../src/main/java/org/apache/commons/vfs2/Capability.java | 8 ++++---- .../src/main/java/org/apache/commons/vfs2/FileSystem.java | 4 ++-- .../main/java/org/apache/commons/vfs2/FileSystemManager.java | 2 +- .../java/org/apache/commons/vfs2/cache/DefaultFilesCache.java | 6 +++--- .../main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java | 4 ++-- .../org/apache/commons/vfs2/impl/DefaultFileReplicator.java | 2 +- .../org/apache/commons/vfs2/impl/DefaultFileSystemManager.java | 6 +++--- .../apache/commons/vfs2/impl/DefaultVfsComponentContext.java | 4 ++-- .../java/org/apache/commons/vfs2/impl/VirtualFileProvider.java | 2 +- .../org/apache/commons/vfs2/provider/AbstractFileName.java | 2 +- .../org/apache/commons/vfs2/provider/AbstractFileObject.java | 10 +++++----- .../org/apache/commons/vfs2/provider/AbstractFileSystem.java | 8 ++++---- .../java/org/apache/commons/vfs2/provider/FileProvider.java | 4 ++-- .../java/org/apache/commons/vfs2/provider/FileSystemKey.java | 2 +- .../org/apache/commons/vfs2/provider/GenericURLFileName.java | 2 +- .../apache/commons/vfs2/provider/GenericURLFileNameParser.java | 2 +- .../org/apache/commons/vfs2/provider/HostFileNameParser.java | 2 +- .../apache/commons/vfs2/provider/LayeredFileNameParser.java | 2 +- .../java/org/apache/commons/vfs2/provider/URLFileName.java | 2 +- .../org/apache/commons/vfs2/provider/URLFileNameParser.java | 2 +- .../org/apache/commons/vfs2/provider/VfsComponentContext.java | 4 ++-- .../org/apache/commons/vfs2/provider/ftp/FtpFileProvider.java | 2 +- .../apache/commons/vfs2/provider/ftps/FtpsFileProvider.java | 2 +- .../commons/vfs2/provider/local/DefaultLocalFileProvider.java | 2 +- .../commons/vfs2/provider/ram/RamFileSystemConfigBuilder.java | 2 +- .../apache/commons/vfs2/provider/url/UrlFileNameParser.java | 2 +- .../commons/vfs2/provider/sftp/test/SftpProviderTestCase.java | 2 +- .../java/org/apache/commons/vfs2/test/PermissionsTests.java | 2 +- .../java/org/apache/commons/vfs2/test/ProviderWriteTests.java | 4 ++-- 29 files changed, 49 insertions(+), 49 deletions(-) diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/Capability.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/Capability.java index 62b5fb6..79cba5c 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/Capability.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/Capability.java @@ -128,22 +128,22 @@ public enum Capability { MANIFEST_ATTRIBUTES, /** - * The provider itself do not provide a filesystem. It simply resolves a full name and dispatches the request back + * The provider itself do not provide a file system. It simply resolves a full name and dispatches the request back * to the filesystemmanager. * <p> - * A provider with this capability cant tell much about the capabilities about the finally used filesystem in + * A provider with this capability cant tell much about the capabilities about the finally used file system in * advance. * </p> */ DISPATCHER, /** - * A compressed filesystem is a filesystem which use compression. + * A compressed filesystem is a file system which use compression. */ COMPRESS, /** - * A virtual filesystem can be an archive like tar or zip. + * A virtual file system can be an archive like tar or zip. */ VIRTUAL, diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystem.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystem.java index f17a498..33dda0f 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystem.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystem.java @@ -52,7 +52,7 @@ public interface FileSystem { * </p> * * @param capability The capability to check for. - * @return true if this filesystem has the requested capability. Note that not all files in the file system may have + * @return true if this file system has the requested capability. Note that not all files in the file system may have * the capability. */ boolean hasCapability(Capability capability); @@ -165,7 +165,7 @@ public interface FileSystem { File replicateFile(FileObject file, FileSelector selector) throws FileSystemException; /** - * Returns the FileSystemOptions used to instantiate this filesystem. + * Returns the FileSystemOptions used to instantiate this file system. * * @return The FileSystemOptions. */ diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemManager.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemManager.java index 3b64f50..5eae5e3 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemManager.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemManager.java @@ -84,7 +84,7 @@ public interface FileSystemManager { boolean canCreateFileSystem(FileObject file) throws FileSystemException; /** - * Closes the given filesystem. + * Closes the given file system. * <p> * If you use VFS as singleton it is VERY dangerous to call this method. * </p> diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/DefaultFilesCache.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/DefaultFilesCache.java index 0415409..1e67bf6 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/DefaultFilesCache.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/DefaultFilesCache.java @@ -27,13 +27,13 @@ import org.apache.commons.vfs2.FileSystem; /** * A simple {@link org.apache.commons.vfs2.FilesCache FilesCache} implementation. * <p> - * This implementation caches every file with no expire or limit. All files and filesystems are hard reachable - * references. This implementation holds a list of filesystem specific {@linkplain ConcurrentHashMap ConcurrentHashMaps} + * This implementation caches every file with no expire or limit. All files and file systems are hard reachable + * references. This implementation holds a list of file system specific {@linkplain ConcurrentHashMap ConcurrentHashMaps} * in the main cache map. * </p> * <p> * Cached {@linkplain FileObject FileObjects} as well as {@linkplain FileSystem FileSystems} are only removed when - * {@link #clear(FileSystem)} is called (i.e. on filesystem close). When the used + * {@link #clear(FileSystem)} is called (i.e. on file system close). When the used * {@link org.apache.commons.vfs2.FileSystemManager FileSystemManager} is closed, it will also {@linkplain #close() * close} this cache (which frees all entries). * </p> diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java index 1e1ad58..1b835a9 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java @@ -37,7 +37,7 @@ import org.apache.commons.vfs2.util.Messages; /** * This implementation caches every file using {@link LRUMap}. * <p> - * The default constructor uses a LRU size of 100 per filesystem. + * The default constructor uses a LRU size of 100 per file system. * </p> */ public class LRUFilesCache extends AbstractFilesCache { @@ -113,7 +113,7 @@ public class LRUFilesCache extends AbstractFilesCache { } /** - * Default constructor. Uses a LRU size of 100 per filesystem. + * Default constructor. Uses a LRU size of 100 per file system. */ public LRUFilesCache() { this(DEFAULT_LRU_SIZE); diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java index 43f5f20..f0b56e9 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java @@ -143,7 +143,7 @@ public class DefaultFileReplicator extends AbstractVfsComponent implements FileR } /** - * Physically deletes the file from the filesystem. + * Physically deletes the file from the file system. * * @param file The File to delete. */ diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java index 8d5a8ad..2271473 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java @@ -67,7 +67,7 @@ public class DefaultFileSystemManager implements FileSystemManager, AutoCloseabl private final Map<String, FileProvider> providers = new HashMap<>(); /** - * List of the schemes of virtual filesystems added. + * List of the schemes of virtual file systems added. */ private final List<String> virtualFileSystemSchemes = new ArrayList<>(); @@ -579,7 +579,7 @@ public class DefaultFileSystemManager implements FileSystemManager, AutoCloseabl } /** - * Free all resources used by unused filesystems created by this manager. + * Free all resources used by unused file systems created by this manager. */ public void freeUnusedResources() { if (!init) { @@ -981,7 +981,7 @@ public class DefaultFileSystemManager implements FileSystemManager, AutoCloseabl } /** - * Closes the given filesystem. + * Closes the given file system. * <p> * If you use VFS as singleton it is VERY dangerous to call this method. * diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultVfsComponentContext.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultVfsComponentContext.java index a00ef3b..c93a64d 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultVfsComponentContext.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultVfsComponentContext.java @@ -85,9 +85,9 @@ final class DefaultVfsComponentContext implements VfsComponentContext { } /** - * Returns the filesystem manager for the current context + * Returns the file system manager for the current context * - * @return the filesystem manager + * @return the file system manager */ @Override public FileSystemManager getFileSystemManager() { diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VirtualFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VirtualFileProvider.java index 26853e5..24706f9 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VirtualFileProvider.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VirtualFileProvider.java @@ -26,7 +26,7 @@ import org.apache.commons.vfs2.provider.AbstractFileSystem; import org.apache.commons.vfs2.provider.AbstractVfsContainer; /** - * A virtual filesystem provider. + * A virtual file system provider. */ public class VirtualFileProvider extends AbstractVfsContainer { diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java index 8b67980..daf42ae 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java @@ -200,7 +200,7 @@ public abstract class AbstractFileName implements FileName { } /** - * find the root of the filesystem. + * find the root of the file system. * * @return The root FileName. */ diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java index 4001e4e..5e5cd1e 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java @@ -721,7 +721,7 @@ public abstract class AbstractFileObject<AFS extends AbstractFileSystem> impleme /** * Checks if this fileObject is the same file as {@code destFile} just with a different name. E.g. for case - * insensitive filesystems like windows. + * insensitive file systems like windows. * * @param destFile The file to compare to. * @return true if the FileObjects are the same. @@ -1203,7 +1203,7 @@ public abstract class AbstractFileObject<AFS extends AbstractFileSystem> impleme * stream to use to write the content of the file to. * * @param bAppend true when append to the file. - * Note: If the underlying filesystem does not support appending, a FileSystemException is thrown. + * Note: If the underlying file system does not support appending, a FileSystemException is thrown. * @return An OutputStream where the new contents of the file can be written. * @throws FileSystemException if an error occurs; for example: * bAppend is true, and the underlying FileSystem does not support it @@ -1421,7 +1421,7 @@ public abstract class AbstractFileObject<AFS extends AbstractFileSystem> impleme } /** - * This method is meant to add an object where this object holds a strong reference then. E.g. a archive-filesystem + * This method is meant to add an object where this object holds a strong reference then. E.g. a archive-file system * creates a list of all children and they shouldn't get garbage collected until the container is garbage collected * * @param strongRef The Object to add. @@ -1537,7 +1537,7 @@ public abstract class AbstractFileObject<AFS extends AbstractFileSystem> impleme /** * Checks if this fileObject is the same file as {@code destFile} just with a different name. E.g. for case - * insensitive filesystems like windows. + * insensitive file systems like windows. * * @param destFile The file to compare to. * @return true if the FileObjects are the same. @@ -1714,7 +1714,7 @@ public abstract class AbstractFileObject<AFS extends AbstractFileSystem> impleme } /** - * This will prepare the fileObject to get resynchronized with the underlying filesystem if required. + * This will prepare the fileObject to get resynchronized with the underlying file system if required. * * @throws FileSystemException if an error occurs. */ diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java index ec94958..1fb0489 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java @@ -90,7 +90,7 @@ public abstract class AbstractFileSystem extends AbstractVfsComponent implements private FileSystemKey cacheKey; /** - * open streams counter for this filesystem + * open streams counter for this file system */ private final AtomicInteger openStreams = new AtomicInteger(0); @@ -389,7 +389,7 @@ public abstract class AbstractFileSystem extends AbstractVfsComponent implements } /** - * Returns the FileSystemOptions used to instantiate this filesystem. + * Returns the FileSystemOptions used to instantiate this file system. * * @return the FileSystemOptions. */ @@ -399,7 +399,7 @@ public abstract class AbstractFileSystem extends AbstractVfsComponent implements } /** - * Returns the FileSystemManager used to instantiate this filesystem. + * Returns the FileSystemManager used to instantiate this file system. * * @return the FileSystemManager. */ @@ -594,7 +594,7 @@ public abstract class AbstractFileSystem extends AbstractVfsComponent implements } /** - * Checks if this filesystem has open streams. + * Checks if this file system has open streams. * * @return true if the FileSystem has open streams. */ diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileProvider.java index be62d70..f6cf353 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileProvider.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileProvider.java @@ -65,9 +65,9 @@ public interface FileProvider { FileSystemConfigBuilder getConfigBuilder(); /** - * Gets the filesystem capabilities. + * Gets the file system capabilities. * <p> - * These are the same as on the filesystem, but available before the first filesystem was instanciated. + * These are the same as on the filesystem, but available before the first file system was instanciated. * </p> * * @return a Collection of the file systems Capabilities. diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileSystemKey.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileSystemKey.java index 6281c84..063aacf 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileSystemKey.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileSystemKey.java @@ -19,7 +19,7 @@ package org.apache.commons.vfs2.provider; import org.apache.commons.vfs2.FileSystemOptions; /** - * Used to identify a filesystem + * Used to identify a file system */ class FileSystemKey implements Comparable<FileSystemKey> { diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/GenericURLFileName.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/GenericURLFileName.java index 8708e1f..218520c 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/GenericURLFileName.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/GenericURLFileName.java @@ -63,7 +63,7 @@ public class GenericURLFileName extends GenericFileName { } /** - * Gets the path encoded suitable for url like filesystem e.g. (http, webdav). + * Gets the path encoded suitable for url like file system e.g. (http, webdav). * * @param charset the charset used for the path encoding * @return The encoded path. diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/GenericURLFileNameParser.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/GenericURLFileNameParser.java index 72e7e57..bf5cc54 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/GenericURLFileNameParser.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/GenericURLFileNameParser.java @@ -21,7 +21,7 @@ import org.apache.commons.vfs2.FileSystemException; import org.apache.commons.vfs2.FileType; /** - * Generic implementation for any url based filesystem, without depending a specific library. + * Generic implementation for any url based file system, without depending a specific library. * <p> * Parses the url into user/password/host/port/path/queryString. * </p> diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/HostFileNameParser.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/HostFileNameParser.java index 5e31530..2f14f84 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/HostFileNameParser.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/HostFileNameParser.java @@ -24,7 +24,7 @@ import org.apache.commons.vfs2.util.Cryptor; import org.apache.commons.vfs2.util.CryptorFactory; /** - * Implementation for any url based filesystem. + * Implementation for any url based file system. * <p> * Parses the url into user/password/host/port/path. Does not handle a query string (after ?) * </p> diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java index 8dbdc42..acde79b 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java @@ -22,7 +22,7 @@ import org.apache.commons.vfs2.FileType; import org.apache.commons.vfs2.VFS; /** - * Implementation for layered filesystems. + * Implementation for layered file systems. * <p> * Additionally encodes the '!' character. * </p> diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/URLFileName.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/URLFileName.java index f3e15b4..b669b53 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/URLFileName.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/URLFileName.java @@ -64,7 +64,7 @@ public class URLFileName extends GenericFileName { } /** - * Gets the path encoded suitable for url like filesystem e.g. (http, webdav). + * Gets the path encoded suitable for url like file system e.g. (http, webdav). * * @param charset the charset used for the path encoding * @return The encoded path. diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/URLFileNameParser.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/URLFileNameParser.java index f142bc1..ecc9ace 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/URLFileNameParser.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/URLFileNameParser.java @@ -21,7 +21,7 @@ import org.apache.commons.vfs2.FileSystemException; import org.apache.commons.vfs2.FileType; /** - * Implementation for any url based filesystem. + * Implementation for any url based file system. * <p> * Parses the url into user/password/host/port/path/queryString. * </p> diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/VfsComponentContext.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/VfsComponentContext.java index 6cfac77..a1cd7f8 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/VfsComponentContext.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/VfsComponentContext.java @@ -90,9 +90,9 @@ public interface VfsComponentContext { FileObject toFileObject(File file) throws FileSystemException; /** - * Returns the filesystem manager for the current context. + * Returns the file system manager for the current context. * - * @return the filesystem manager + * @return the file system manager */ FileSystemManager getFileSystemManager(); } diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileProvider.java index 104b469..24ac874 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileProvider.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileProvider.java @@ -60,7 +60,7 @@ public class FtpFileProvider extends AbstractOriginatingFileProvider { } /** - * Creates the filesystem. + * Creates the file system. */ @Override protected FileSystem doCreateFileSystem(final FileName name, final FileSystemOptions fileSystemOptions) diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileProvider.java index ce77231..07c61f1 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileProvider.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileProvider.java @@ -38,7 +38,7 @@ public class FtpsFileProvider extends FtpFileProvider { } /** - * Creates the filesystem. + * Creates the file system. */ @Override protected FileSystem doCreateFileSystem(final FileName name, final FileSystemOptions fileSystemOptions) diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/DefaultLocalFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/DefaultLocalFileProvider.java index 1c811ff..0b924b0 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/DefaultLocalFileProvider.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/DefaultLocalFileProvider.java @@ -100,7 +100,7 @@ public class DefaultLocalFileProvider extends AbstractOriginatingFileProvider im } /** - * Creates the filesystem. + * Creates the file system. */ @Override protected FileSystem doCreateFileSystem(final FileName name, final FileSystemOptions fileSystemOptions) diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystemConfigBuilder.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystemConfigBuilder.java index 64d97a1..ba958a0 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystemConfigBuilder.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystemConfigBuilder.java @@ -21,7 +21,7 @@ import org.apache.commons.vfs2.FileSystemConfigBuilder; import org.apache.commons.vfs2.FileSystemOptions; /** - * Config Builder for the RAM filesystem. + * Config Builder for the RAM file system. */ public final class RamFileSystemConfigBuilder extends FileSystemConfigBuilder { diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java index e1ea61a..d43180c 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java @@ -25,7 +25,7 @@ import org.apache.commons.vfs2.provider.VfsComponentContext; import org.apache.commons.vfs2.provider.local.GenericFileNameParser; /** - * Implementation for any java.net.url based filesystem. + * Implementation for any java.net.url based file system. * <p> * Composite of URLFilenameParser and GenericFilenameParser */ diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java index a44da9d..c94b794 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java @@ -89,7 +89,7 @@ import junit.framework.TestSuite; public class SftpProviderTestCase extends AbstractProviderTestConfig { /** - * The underlying filesystem + * The underlying file system */ private SftpFileSystem fileSystem; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/PermissionsTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/PermissionsTests.java index 910b574..419265a 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/PermissionsTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/PermissionsTests.java @@ -151,7 +151,7 @@ public class PermissionsTests extends AbstractProviderTestCase { } /** - * Returns true if the filesystem is a LocalFileSystem on Windows + * Returns true if the file system is a LocalFileSystem on Windows */ private boolean isWindows() { return SystemUtils.IS_OS_WINDOWS && this.getFileSystem() instanceof LocalFileSystem; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java index 3841281..3677fe5 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java @@ -319,7 +319,7 @@ public class ProviderWriteTests extends AbstractProviderTestCase { */ /** - * Tests file copy to and from the same filesystem type. This was a problem w/ FTP. + * Tests file copy to and from the same file system type. This was a problem w/ FTP. */ public void testCopySameFileSystem() throws Exception { final FileObject scratchFolder = createScratchFolder(); @@ -636,7 +636,7 @@ public class ProviderWriteTests extends AbstractProviderTestCase { } /** - * Tests file write to and from the same filesystem type + * Tests file write to and from the same file system type */ public void testWriteSameFileSystem() throws Exception { final FileObject scratchFolder = createScratchFolder();