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 2020/06/17 15:05:14 UTC
[commons-lang] branch master updated: Merge conditions using the
same blocks.
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-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 9214c65 Merge conditions using the same blocks.
9214c65 is described below
commit 9214c65371dded64f0a8068e7b877f97d50a024f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Jun 17 11:05:04 2020 -0400
Merge conditions using the same blocks.
---
src/main/java/org/apache/commons/lang3/StringUtils.java | 4 +---
.../apache/commons/lang3/event/EventListenerSupport.java | 4 +---
.../java/org/apache/commons/lang3/reflect/MethodUtils.java | 14 ++++----------
src/main/java/org/apache/commons/lang3/text/WordUtils.java | 5 +----
4 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java
index 507cba0..ec9f616 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -8879,9 +8879,7 @@ public class StringUtils {
for (int i = 0; i < strLen; ) {
final int oldCodepoint = str.codePointAt(i);
final int newCodePoint;
- if (Character.isUpperCase(oldCodepoint)) {
- newCodePoint = Character.toLowerCase(oldCodepoint);
- } else if (Character.isTitleCase(oldCodepoint)) {
+ if (Character.isUpperCase(oldCodepoint) || Character.isTitleCase(oldCodepoint)) {
newCodePoint = Character.toLowerCase(oldCodepoint);
} else if (Character.isLowerCase(oldCodepoint)) {
newCodePoint = Character.toUpperCase(oldCodepoint);
diff --git a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
index 499032d..bd79519 100644
--- a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
+++ b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
@@ -195,9 +195,7 @@ public class EventListenerSupport<L> implements Serializable {
*/
public void addListener(final L listener, final boolean allowDuplicate) {
Validate.notNull(listener, "Listener object cannot be null.");
- if (allowDuplicate) {
- listeners.add(listener);
- } else if (!listeners.contains(listener)) {
+ if (allowDuplicate || !listeners.contains(listener)) {
listeners.add(listener);
}
}
diff --git a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
index 63260e8..125bba3 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
@@ -757,10 +757,8 @@ public class MethodUtils {
return method;
} else if (methodName.equals(method.getName()) &&
ClassUtils.isAssignable(parameterTypes, method.getParameterTypes(), true)) {
- if (inexactMatch == null) {
- inexactMatch = method;
- } else if (distance(parameterTypes, method.getParameterTypes())
- < distance(parameterTypes, inexactMatch.getParameterTypes())) {
+ if ((inexactMatch == null) || (distance(parameterTypes, method.getParameterTypes())
+ < distance(parameterTypes, inexactMatch.getParameterTypes()))) {
inexactMatch = method;
}
}
@@ -1007,14 +1005,10 @@ public class MethodUtils {
Class<?> acls;
if (interfaceIndex >= allInterfaces.size()) {
acls = allSuperclasses.get(superClassIndex++);
- } else if (superClassIndex >= allSuperclasses.size()) {
- acls = allInterfaces.get(interfaceIndex++);
- } else if (interfaceIndex < superClassIndex) {
+ } else if ((superClassIndex >= allSuperclasses.size()) || (interfaceIndex < superClassIndex) || !(superClassIndex < interfaceIndex)) {
acls = allInterfaces.get(interfaceIndex++);
- } else if (superClassIndex < interfaceIndex) {
- acls = allSuperclasses.get(superClassIndex++);
} else {
- acls = allInterfaces.get(interfaceIndex++);
+ acls = allSuperclasses.get(superClassIndex++);
}
allSuperClassesAndInterfaces.add(acls);
}
diff --git a/src/main/java/org/apache/commons/lang3/text/WordUtils.java b/src/main/java/org/apache/commons/lang3/text/WordUtils.java
index ee1249e..5eb9ead 100644
--- a/src/main/java/org/apache/commons/lang3/text/WordUtils.java
+++ b/src/main/java/org/apache/commons/lang3/text/WordUtils.java
@@ -582,10 +582,7 @@ public class WordUtils {
for (int i = 0; i < buffer.length; i++) {
final char ch = buffer[i];
- if (Character.isUpperCase(ch)) {
- buffer[i] = Character.toLowerCase(ch);
- whitespace = false;
- } else if (Character.isTitleCase(ch)) {
+ if (Character.isUpperCase(ch) || Character.isTitleCase(ch)) {
buffer[i] = Character.toLowerCase(ch);
whitespace = false;
} else if (Character.isLowerCase(ch)) {