Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Raise embedded if into parent if.

This commit is contained in:
Gary Gregory 2021-02-28 12:19:37 -05:00
parent 4a845dc8bc
commit 11eb27dfb0
3 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
View File

@ -203,12 +203,10 @@ public class SequencesComparator<T> {
++y;
}
// Second step
if (delta % 2 != 0 && delta - d <= k && k <= delta + d) {
if (vUp[i-delta] <= vDown[i]) { // NOPMD
if ((delta % 2 != 0 && delta - d <= k && k <= delta + d) && (vUp[i-delta] <= vDown[i])) { // NOPMD
return buildSnake(vUp[i-delta], k + start1 - start2, end1, end2);
}
}
}
// Up
for (int k = delta - d; k <= delta + d; k += 2) {
@ -229,13 +227,11 @@ public class SequencesComparator<T> {
y--;
}
// Second step
if (delta % 2 == 0 && -d <= k && k <= d ) {
if (vUp[i] <= vDown[i + delta]) { // NOPMD
if ((delta % 2 == 0 && -d <= k && k <= d) && (vUp[i] <= vDown[i + delta])) { // NOPMD
return buildSnake(vUp[i], k + start1 - start2, end1, end2);
}
}
}
}
// this should not happen
throw new RuntimeException("Internal Error");

8
src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
View File

@ -172,16 +172,12 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
}
return root.setKeyValue(key, value);
} else if (KeyAnalyzer.isEqualBitKey(bitIndex)) {
// This is a very special and rare case.
/* REPLACE OLD KEY+VALUE */
if (found != root) { // NOPMD
} else /* REPLACE OLD KEY+VALUE */
if (KeyAnalyzer.isEqualBitKey(bitIndex) && found != root) { // NOPMD
incrementModCount();
return found.setKeyValue(key, value);
}
}
}
throw new IllegalArgumentException("Failed to put: " + key + " -> " + value + ", " + bitIndex);
}

8
src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
View File

@ -164,11 +164,9 @@ public class FactoryUtilsTest {
}
@Override
public boolean equals(final Object obj) {
if (obj instanceof Mock1) {
if (iVal == ((Mock1) obj).iVal) {
if (obj instanceof Mock1 && (iVal == ((Mock1) obj).iVal)) {
return true;
}
}
return false;
}
@Override
@ -188,11 +186,9 @@ public class FactoryUtilsTest {
}
@Override
public boolean equals(final Object obj) {
if (obj instanceof Mock2) {
if (iVal == ((Mock2) obj).iVal) {
if (obj instanceof Mock2 && (iVal == ((Mock2) obj).iVal)) {
return true;
}
}
return false;
}
@Override