You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/02/05 04:09:26 UTC
[commons-vfs] branch master updated: Combine nested if.
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 15b5e86 Combine nested if.
15b5e86 is described below
commit 15b5e862f769356e67cd1c37c936ed8849bd6e24
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Feb 4 23:09:21 2021 -0500
Combine nested if.
---
.../commons/vfs2/provider/webdav/WebdavFileObject.java | 8 +++-----
.../commons/vfs2/provider/webdav4/Webdav4FileObject.java | 8 +++-----
.../apache/commons/vfs2/auth/StaticUserAuthenticator.java | 10 ++++------
.../org/apache/commons/vfs2/filter/WildcardFileFilter.java | 8 +++-----
.../org/apache/commons/vfs2/impl/DefaultFileMonitor.java | 12 +++++-------
.../java/org/apache/commons/vfs2/impl/VFSClassLoader.java | 6 ++----
.../org/apache/commons/vfs2/provider/AbstractFileObject.java | 6 ++----
.../commons/vfs2/provider/DefaultURLStreamHandler.java | 10 ++++------
8 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java b/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
index 695eee5..b6930bc 100644
--- a/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
+++ b/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
@@ -203,11 +203,9 @@ public class WebdavFileObject extends HttpFileObject<WebdavFileSystem> {
final String userName = fileName.getUserName();
if (name == null) {
name = userName;
- } else {
- if (userName != null) {
- final String comment = "Modified by user " + userName;
- list.add(new DefaultDavProperty(DeltaVConstants.COMMENT, comment));
- }
+ } else if (userName != null) {
+ final String comment = "Modified by user " + userName;
+ list.add(new DefaultDavProperty(DeltaVConstants.COMMENT, comment));
}
list.add(new DefaultDavProperty(DeltaVConstants.CREATOR_DISPLAYNAME, name));
final PropPatchMethod method = new PropPatchMethod(urlStr, list);
diff --git a/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObject.java b/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObject.java
index 91a137d..83790b0 100644
--- a/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObject.java
+++ b/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObject.java
@@ -203,11 +203,9 @@ public class Webdav4FileObject extends Http4FileObject<Webdav4FileSystem> {
final String userName = fileName.getUserName();
if (name == null) {
name = userName;
- } else {
- if (userName != null) {
- final String comment = "Modified by user " + userName;
- setProperties.add(new DefaultDavProperty(DeltaVConstants.COMMENT, comment));
- }
+ } else if (userName != null) {
+ final String comment = "Modified by user " + userName;
+ setProperties.add(new DefaultDavProperty(DeltaVConstants.COMMENT, comment));
}
setProperties.add(new DefaultDavProperty(DeltaVConstants.CREATOR_DISPLAYNAME, name));
final HttpProppatch request = new HttpProppatch(urlStr, setProperties, removeProperties);
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/auth/StaticUserAuthenticator.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/auth/StaticUserAuthenticator.java
index 788caba..4087029 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/auth/StaticUserAuthenticator.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/auth/StaticUserAuthenticator.java
@@ -56,12 +56,10 @@ public class StaticUserAuthenticator implements UserAuthenticator, Comparable<St
data.setData(UserAuthenticationData.USERNAME, UserAuthenticatorUtils.toChar(username));
} else if (type == UserAuthenticationData.PASSWORD) {
data.setData(UserAuthenticationData.PASSWORD, UserAuthenticatorUtils.toChar(password));
- } else {
- if (LOG.isDebugEnabled()) {
- LOG.debug(StaticUserAuthenticator.class.getSimpleName()
- + " does not support authentication data type '" + type
- + "'; authentication request for this type ignored.");
- }
+ } else if (LOG.isDebugEnabled()) {
+ LOG.debug(StaticUserAuthenticator.class.getSimpleName()
+ + " does not support authentication data type '" + type
+ + "'; authentication request for this type ignored.");
}
}
return data;
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/WildcardFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/WildcardFileFilter.java
index 746b008..350f584 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/WildcardFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/WildcardFileFilter.java
@@ -275,12 +275,10 @@ public class WildcardFileFilter implements FileFilter, Serializable {
if (repeat >= 0) {
backtrack.push(new int[] { wcsIdx, repeat });
}
- } else {
+ } else if (!caseSensitivity.checkRegionMatches(fileName, textIdx, wcs[wcsIdx])) {
// matching from current position
- if (!caseSensitivity.checkRegionMatches(fileName, textIdx, wcs[wcsIdx])) {
- // couldnt match token
- break;
- }
+ // couldnt match token
+ break;
}
// matched text token, move text index to end of matched
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
index 697f6ca..c37ecbe 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
@@ -472,14 +472,12 @@ public class DefaultFileMonitor implements Runnable, FileMonitor {
}
}
- } else {
+ } else if (newChildren.length > 0) {
// First set of children - Break out the cigars
- if (newChildren.length > 0) {
- this.children = new HashMap<>();
- for (final FileObject element : newChildren) {
- this.children.put(element.getName(), new Object()); // null?
- this.fireAllCreate(element);
- }
+ this.children = new HashMap<>();
+ for (final FileObject element : newChildren) {
+ this.children.put(element.getName(), new Object()); // null?
+ this.fireAllCreate(element);
}
}
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
index 58a78ea..5103599 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
@@ -168,10 +168,8 @@ public class VFSClassLoader extends SecureClassLoader {
if (!pkg.isSealed(url)) {
throw new FileSystemException("vfs.impl/pkg-sealed-other-url", pkgName);
}
- } else {
- if (isSealed(res)) {
- throw new FileSystemException("vfs.impl/pkg-sealing-unsealed", pkgName);
- }
+ } else if (isSealed(res)) {
+ throw new FileSystemException("vfs.impl/pkg-sealing-unsealed", pkgName);
}
} else {
definePackage(pkgName, res);
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 a1b0d83..494a120 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
@@ -1680,10 +1680,8 @@ public abstract class AbstractFileObject<AFS extends AbstractFileSystem> impleme
throw new FileSystemException("vfs.provider/rename-parent-read-only.error", getName(),
getParent().getName());
}
- } else {
- if (!isWriteable()) {
- throw new FileSystemException("vfs.provider/rename-read-only.error", getName());
- }
+ } else if (!isWriteable()) {
+ throw new FileSystemException("vfs.provider/rename-read-only.error", getName());
}
if (destFile.exists() && !isSameFile(destFile)) {
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultURLStreamHandler.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultURLStreamHandler.java
index 5846286..19c902d 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultURLStreamHandler.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultURLStreamHandler.java
@@ -55,13 +55,11 @@ public class DefaultURLStreamHandler extends URLStreamHandler {
final FileObject newURL;
if (start > 0 && spec.charAt(start - 1) == ':') {
newURL = context.resolveFile(old, spec, fileSystemOptions);
+ } else if (old.isFile() && old.getParent() != null) {
+ // for files we have to resolve relative
+ newURL = old.getParent().resolveFile(spec);
} else {
- if (old.isFile() && old.getParent() != null) {
- // for files we have to resolve relative
- newURL = old.getParent().resolveFile(spec);
- } else {
- newURL = old.resolveFile(spec);
- }
+ newURL = old.resolveFile(spec);
}
final String url = newURL.getName().getURI();