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
commit ef4038b63ef977cf25117566f7769fa99523289c
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Thu Oct 17 11:56:03 2019 -0400
Typos in Javadoc and comments: "uri" -> "URI".
---
.../main/java/org/apache/commons/vfs2/FileSystemConfigBuilder.java | 2 +-
.../java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java | 2 +-
.../main/java/org/apache/commons/vfs2/provider/AbstractFileName.java | 4 ++--
.../src/main/java/org/apache/commons/vfs2/provider/URLFileName.java | 4 ++--
.../src/main/java/org/apache/commons/vfs2/provider/UriParser.java | 2 +-
.../main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java | 2 +-
.../java/org/apache/commons/vfs2/provider/res/ResourceFileName.java | 2 +-
.../org/apache/commons/vfs2/provider/res/ResourceFileNameParser.java | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemConfigBuilder.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemConfigBuilder.java
index ea4f81f..9d8ca84 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemConfigBuilder.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemConfigBuilder.java
@@ -24,7 +24,7 @@ public abstract class FileSystemConfigBuilder {
/** Default prefix to use when resolving system properties */
private static final String PREFIX = "vfs.";
- /** The root uri of the file system */
+ /** The root URI of the file system */
private static final String ROOTURI = "rootURI";
/** The prefix to use when resolving system properties */
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 5c95ed8..f7a2545 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
@@ -782,7 +782,7 @@ public class DefaultFileSystemManager implements
FileSystemManager {
if (name.length() == 0 || (scheme == null && buffer.charAt(0) !=
FileName.SEPARATOR_CHAR)) {
// Supplied path is not absolute
if (!VFS.isUriStyle()) {
- // when using uris the parent already do have the trailing "/"
+ // when using URIs the parent already do have the trailing "/"
buffer.insert(0, FileName.SEPARATOR_CHAR);
}
buffer.insert(0, realBase.getPath());
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 f89f218..b08f468 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
@@ -274,12 +274,12 @@ public abstract class AbstractFileName implements
FileName {
if (uri != null && uri.length() > 0) {
try {
// VFS-325: Handle URI special characters in file name
- // Decode the base uri and re-encode with URI special
characters
+ // Decode the base URI and re-encode with URI special
characters
uri = UriParser.decode(uri);
return UriParser.encode(uri, RESERVED_URI_CHARS);
} catch (final FileSystemException e) {
- // Default to base uri value
+ // Default to base URI value
}
}
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 14954a1..893502d 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
@@ -104,9 +104,9 @@ public class URLFileName extends GenericFileName {
}
/**
- * Appends query string to the uri.
+ * Appends query string to the URI.
*
- * @return the uri
+ * @return the URI
*/
@Override
protected String createURI() {
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
index d2e7262..177a883 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
@@ -320,7 +320,7 @@ public final class UriParser {
* </p>
* <p>
* This allows us to handle varying scheme's without making assumptions
based on the ':' character. Specifically
- * handle scheme extraction calls for URI parameters that are not actually
uri's, but may be names with ':' in them.
+ * handle scheme extraction calls for URI parameters that are not actually
URI's, but may be names with ':' in them.
* </p>
* @param schemes The schemes to check.
* @param uri The potential URI. May also just be a name.
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
index 6c783a7..091acb2 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
@@ -83,7 +83,7 @@ public class FtpFileObject extends
AbstractFileObject<FtpFileSystem> {
/**
* Called by child file objects, to locate their ftp file info.
*
- * @param name the file name in its native form ie. without uri stuff (%nn)
+ * @param name the file name in its native form ie. without URI stuff (%nn)
* @param flush recreate children cache
*/
private FTPFile getChildFile(final String name, final boolean flush)
throws IOException {
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileName.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileName.java
index 623a018..45323a8 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileName.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileName.java
@@ -69,7 +69,7 @@ public class ResourceFileName extends AbstractFileName {
@Override
public String getRootURI() {
- // resource uris have a blank root.
+ // resource URIs have a blank root.
return "";
}
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileNameParser.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileNameParser.java
index b244a6f..11dbe4e 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileNameParser.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileNameParser.java
@@ -39,7 +39,7 @@ public class ResourceFileNameParser extends
GenericFileNameParser {
@Override
protected String extractRootPrefix(final String uri, final StringBuilder
name) throws FileSystemException {
- // Resource uri (as used by ClassLoader.getResource()) are assumed to
be absolute despite
+ // Resource URI (as used by ClassLoader.getResource()) are assumed to
be absolute despite
// lacking a leading '/'. All leading '/' will be stripped from the
name.
int index = 0;
