In-line local var. Better local name. Formatting. Comment empty blocks.
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 4b7ef76..4ee98d6 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
@@ -292,8 +292,7 @@
@Override
public FileObject resolveFile(final String nameStr) throws FileSystemException {
// Resolve the name, and create the file
- final FileName name = getFileSystemManager().resolveName(rootName, nameStr);
- return resolveFile(name);
+ return resolveFile(getFileSystemManager().resolveName(rootName, nameStr));
}
/**
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 8789177..aa24f88 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
@@ -333,8 +333,8 @@
buffer.setLength(0);
buffer.append(uri);
}
- for(final String scheme : schemes) {
- if(uri.startsWith(scheme + ":")) {
+ for (final String scheme : schemes) {
+ if (uri.startsWith(scheme + ":")) {
if (buffer != null) {
buffer.delete(0, uri.indexOf(':') + 1);
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java
index b012932..676a93b 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java
@@ -71,10 +71,10 @@
@Override
public FileName parseUri(final VfsComponentContext context, final FileName base, final String uri)
throws FileSystemException {
- final StringBuilder name = new StringBuilder();
+ final StringBuilder nameBuilder = new StringBuilder();
// Extract the scheme
- String scheme = UriParser.extractScheme(getSchemes(context, base, uri), uri, name);
+ String scheme = UriParser.extractScheme(getSchemes(context, base, uri), uri, nameBuilder);
if (scheme == null && base != null) {
scheme = base.getScheme();
}
@@ -83,17 +83,17 @@
}
// Remove encoding, and adjust the separators
- UriParser.canonicalizePath(name, 0, name.length(), this);
+ UriParser.canonicalizePath(nameBuilder, 0, nameBuilder.length(), this);
- UriParser.fixSeparators(name);
+ UriParser.fixSeparators(nameBuilder);
// Extract the root prefix
- final String rootFile = extractRootPrefix(uri, name);
+ final String rootFile = extractRootPrefix(uri, nameBuilder);
// Normalise the path
- final FileType fileType = UriParser.normalisePath(name);
+ final FileType fileType = UriParser.normalisePath(nameBuilder);
- final String path = name.toString();
+ final String path = nameBuilder.toString();
return createFileName(scheme, rootFile, path, fileType);
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/WindowsFileNameParser.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/WindowsFileNameParser.java
index 68a2939..64b8642 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/WindowsFileNameParser.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/WindowsFileNameParser.java
@@ -78,6 +78,7 @@
final int maxpos = name.length();
int pos = 0;
for (; pos < maxpos && name.charAt(pos) != '/'; pos++) {
+ // empty
}
pos++;
if (pos >= maxpos) {
@@ -87,6 +88,7 @@
// Now have <name> '/'
final int startShareName = pos;
for (; pos < maxpos && name.charAt(pos) != '/'; pos++) {
+ // empty
}
if (pos == startShareName) {
throw new FileSystemException("vfs.provider.local/missing-share-name.error", uri);
@@ -110,6 +112,7 @@
int startPos = 0;
final int maxlen = Math.min(4, name.length());
for (; startPos < maxlen && name.charAt(startPos) == '/'; startPos++) {
+ // empty
}
if (startPos == maxlen && name.length() > (startPos + 1) && name.charAt(startPos + 1) == '/') {
// Too many '/'
