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 50be2a7 Javadoc: Use "file name" instead of "filename".
50be2a7 is described below
commit 50be2a71c87c03337b01fef8c3627abed7bae1e6
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Thu May 30 16:51:35 2019 -0400
Javadoc: Use "file name" instead of "filename".
Camel case vars "filename" to "fileName".
---
.../org/apache/commons/vfs2/impl/DefaultFileSystemManager.java | 2 +-
.../org/apache/commons/vfs2/provider/AbstractFileName.java | 10 +++++-----
.../org/apache/commons/vfs2/provider/AbstractFileObject.java | 2 +-
.../apache/commons/vfs2/provider/GenericURLFileNameParser.java | 4 ++--
.../org/apache/commons/vfs2/provider/HostFileNameParser.java | 4 ++--
.../apache/commons/vfs2/provider/LayeredFileNameParser.java | 4 ++--
.../org/apache/commons/vfs2/provider/URLFileNameParser.java | 4 ++--
.../commons/vfs2/provider/local/DefaultLocalFileProvider.java | 4 ++--
.../java/org/apache/commons/vfs2/provider/local/LocalFile.java | 2 +-
.../apache/commons/vfs2/provider/url/UrlFileNameParser.java | 6 +++---
.../java/org/apache/commons/vfs2/filter/BaseFilterTest.java | 4 ++--
11 files changed, 23 insertions(+), 23 deletions(-)
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 43be06c..31318a0 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
@@ -805,7 +805,7 @@ public class DefaultFileSystemManager implements
FileSystemManager, AutoCloseabl
}
final FileProvider provider = providers.get(scheme);
if (provider != null) {
- // TODO: extend the filename parser to be able to parse
+ // TODO: extend the file name parser to be able to parse
// only a pathname and take the missing informations from
// the base. Then we can get rid of the string operation.
// // String fullPath = base.getRootURI() +
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 5b14bd6..f89f218 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
@@ -27,7 +27,7 @@ import org.apache.commons.vfs2.VFS;
*/
public abstract class AbstractFileName implements FileName {
- // URI Characters that are possible in local filenames, but must be escaped
+ // URI Characters that are possible in local file names, but must be
escaped
// for proper URI handling.
//
// How reserved URI chars were selected:
@@ -37,8 +37,8 @@ public abstract class AbstractFileName implements FileName {
// http://tools.ietf.org/html/rfc3986#section-2.2
//
// Since : and / occur before the path, only chars after path are escaped
(i.e., # and ?)
- // ? is a reserved filesystem character for Windows and Unix, so can't be
part of a filename.
- // Therefore only # is a reserved char in a URI as part of the path that
can be in the filename.
+ // ? is a reserved filesystem character for Windows and Unix, so can't be
part of a file name.
+ // Therefore only # is a reserved char in a URI as part of the path that
can be in the file name.
private static final char[] RESERVED_URI_CHARS = { '#' };
private final String scheme;
@@ -273,7 +273,7 @@ public abstract class AbstractFileName implements FileName {
private String handleURISpecialCharacters(String uri) {
if (uri != null && uri.length() > 0) {
try {
- // VFS-325: Handle URI special characters in filename
+ // VFS-325: Handle URI special characters in file name
// Decode the base uri and re-encode with URI special
characters
uri = UriParser.decode(uri);
@@ -387,7 +387,7 @@ public abstract class AbstractFileName implements FileName {
final int pos = baseName.lastIndexOf('.');
// if ((pos == -1) || (pos == baseName.length() - 1))
// ima...@ops.co.at: Review of patch from adagoub...@chello.nl
- // do not treat filenames like
+ // do not treat file names like
// .bashrc c:\windows\.java c:\windows\.javaws c:\windows\.jedit
c:\windows\.appletviewer
// as extension
if (pos < 1 || pos == baseName.length() - 1) {
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 acd3b65..0df8364 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
@@ -1083,7 +1083,7 @@ public abstract class AbstractFileObject<AFS extends
AbstractFileSystem> impleme
final String file = files[i];
cache[i] =
fileSystem.getFileSystemManager().resolveName(fileName, file, NameScope.CHILD);
}
- // VFS-285: only assign the children filenames after all of
them have been
+ // VFS-285: only assign the children file names after all of
them have been
// resolved successfully to prevent an inconsistent internal
state
children = cache;
}
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 bf5cc54..81bb451 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
@@ -38,13 +38,13 @@ public class GenericURLFileNameParser extends
HostFileNameParser {
}
@Override
- public FileName parseUri(final VfsComponentContext context, final FileName
base, final String filename)
+ public FileName parseUri(final VfsComponentContext context, final FileName
base, final String fileName)
throws FileSystemException {
// FTP URI are generic URI (as per RFC 2396)
final StringBuilder name = new StringBuilder();
// Extract the scheme and authority parts
- final Authority auth = extractToPath(filename, name);
+ final Authority auth = extractToPath(fileName, name);
// Extract the queryString
final String queryString = UriParser.extractQueryString(name);
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 2f14f84..08ead99 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
@@ -43,13 +43,13 @@ public class HostFileNameParser extends
AbstractFileNameParser {
}
@Override
- public FileName parseUri(final VfsComponentContext context, final FileName
base, final String filename)
+ public FileName parseUri(final VfsComponentContext context, final FileName
base, final String fileName)
throws FileSystemException {
// FTP URI are generic URI (as per RFC 2396)
final StringBuilder name = new StringBuilder();
// Extract the scheme and authority parts
- final Authority auth = extractToPath(filename, name);
+ final Authority auth = extractToPath(fileName, name);
// Decode and normalise the file name
UriParser.canonicalizePath(name, 0, name.length(), this);
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 416198e..67b690f 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
@@ -60,12 +60,12 @@ public class LayeredFileNameParser extends
AbstractFileNameParser {
* @throws FileSystemException if an error occurs.
*/
@Override
- public FileName parseUri(final VfsComponentContext context, final FileName
base, final String filename)
+ public FileName parseUri(final VfsComponentContext context, final FileName
base, final String fileName)
throws FileSystemException {
final StringBuilder name = new StringBuilder();
// Extract the scheme
- final String scheme =
UriParser.extractScheme(VFS.getManager().getSchemes(), filename, name);
+ final String scheme =
UriParser.extractScheme(VFS.getManager().getSchemes(), fileName, name);
// Extract the Layered file URI
final String rootUriName = extractRootName(name);
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 ecc9ace..27853aa 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
@@ -39,13 +39,13 @@ public class URLFileNameParser extends HostFileNameParser {
}
@Override
- public FileName parseUri(final VfsComponentContext context, final FileName
base, final String filename)
+ public FileName parseUri(final VfsComponentContext context, final FileName
base, final String fileName)
throws FileSystemException {
// FTP URI are generic URI (as per RFC 2396)
final StringBuilder name = new StringBuilder();
// Extract the scheme and authority parts
- final Authority auth = extractToPath(filename, name);
+ final Authority auth = extractToPath(fileName, name);
// Extract the queryString
final String queryString = UriParser.extractQueryString(name);
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 0b924b0..032a6c8 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
@@ -82,8 +82,8 @@ public class DefaultLocalFileProvider extends
AbstractOriginatingFileProvider im
final StringBuilder uri = new StringBuilder(name.length() +
scheme.length());
uri.append(scheme);
uri.append(name);
- final FileName filename = parseUri(null, uri.toString());
- return findFile(filename, null);
+ final FileName fileName = parseUri(null, uri.toString());
+ return findFile(fileName, null);
}
/**
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFile.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFile.java
index 68e2979..e11a728 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFile.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFile.java
@@ -263,7 +263,7 @@ public class LocalFile extends
AbstractFileObject<LocalFileSystem> {
@Override
public String toString() {
try {
- // VFS-325: URI may contain percent-encoded values as part of
filename, so decode
+ // VFS-325: URI may contain percent-encoded values as part of file
name, so decode
// those characters before returning
return UriParser.decode(getName().getURI());
} catch (final FileSystemException e) {
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 34ecdd7..08f9a3f 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
@@ -90,11 +90,11 @@ public class UrlFileNameParser extends
AbstractFileNameParser {
* @param file name The file name.
* @return number of slashes
*/
- protected int countSlashes(final String filename) {
+ protected int countSlashes(final String fileName) {
int state = 0;
int nuofSlash = 0;
- for (int pos = 0; pos < filename.length(); pos++) {
- final char c = filename.charAt(pos);
+ for (int pos = 0; pos < fileName.length(); pos++) {
+ final char c = fileName.charAt(pos);
if (state == 0) {
if (c >= 'a' && c <= 'z') {
continue;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
index 900940f..2f4cdb3 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
@@ -281,10 +281,10 @@ public abstract class BaseFilterTest {
public static String concatPathAndFilename(final String path, final String
fileName, final String separator) {
if (fileName == null) {
- throw new IllegalArgumentException("filename cannot be null");
+ throw new IllegalArgumentException("file name cannot be null");
}
if (fileName.trim().length() == 0) {
- throw new IllegalArgumentException("filename cannot be empty");
+ throw new IllegalArgumentException("file name cannot be empty");
}
if (separator == null) {
throw new IllegalArgumentException("separator cannot be null");
