mirror of
https://github.com/apache/commons-collections.git
synced 2025-03-01 22:39:08 +00:00
Use if-else
This commit is contained in:
parent
7e152d4935
commit
1835a52a8e
@ -774,13 +774,11 @@ public abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K,
|
|||||||
Map.Entry<K, V> e = null;
|
Map.Entry<K, V> e = null;
|
||||||
if (fromKey == null) {
|
if (fromKey == null) {
|
||||||
e = firstEntry();
|
e = firstEntry();
|
||||||
} else {
|
} else if (fromInclusive) {
|
||||||
if (fromInclusive) {
|
|
||||||
e = ceilingEntry(fromKey);
|
e = ceilingEntry(fromKey);
|
||||||
} else {
|
} else {
|
||||||
e = higherEntry(fromKey);
|
e = higherEntry(fromKey);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
final K first = e != null ? e.getKey() : null;
|
final K first = e != null ? e.getKey() : null;
|
||||||
if (e == null || toKey != null && !inToRange(first, false)) {
|
if (e == null || toKey != null && !inToRange(first, false)) {
|
||||||
@ -814,13 +812,11 @@ public abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K,
|
|||||||
final Map.Entry<K, V> e;
|
final Map.Entry<K, V> e;
|
||||||
if (toKey == null) {
|
if (toKey == null) {
|
||||||
e = lastEntry();
|
e = lastEntry();
|
||||||
} else {
|
} else if (toInclusive) {
|
||||||
if (toInclusive) {
|
|
||||||
e = floorEntry(toKey);
|
e = floorEntry(toKey);
|
||||||
} else {
|
} else {
|
||||||
e = lowerEntry(toKey);
|
e = lowerEntry(toKey);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
final K last = e != null ? e.getKey() : null;
|
final K last = e != null ? e.getKey() : null;
|
||||||
if (e == null || fromKey != null && !inFromRange(last, false)) {
|
if (e == null || fromKey != null && !inFromRange(last, false)) {
|
||||||
@ -2314,11 +2310,9 @@ public abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K,
|
|||||||
if (selectR(h.left, h.bitIndex, key, lengthInBits, reference)) {
|
if (selectR(h.left, h.bitIndex, key, lengthInBits, reference)) {
|
||||||
return selectR(h.right, h.bitIndex, key, lengthInBits, reference);
|
return selectR(h.right, h.bitIndex, key, lengthInBits, reference);
|
||||||
}
|
}
|
||||||
} else {
|
} else if (selectR(h.right, h.bitIndex, key, lengthInBits, reference)) {
|
||||||
if (selectR(h.right, h.bitIndex, key, lengthInBits, reference)) {
|
|
||||||
return selectR(h.left, h.bitIndex, key, lengthInBits, reference);
|
return selectR(h.left, h.bitIndex, key, lengthInBits, reference);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user