pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

sonar issues

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1896511 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2021-12-29 17:18:44 +00:00
parent 2e52cb7452
commit efe404a2c7
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
poi/src/main/java/org/apache/poi/ss/formula/OperatorEnum.java
View File

@ -32,7 +32,7 @@ enum OperatorEnum {
NO_COMPARISON(OperatorEnum::noComp, false),
BETWEEN(OperatorEnum::between, false),
NOT_BETWEEN(OperatorEnum::notBetween, true),
EQUAL(OperatorEnum::equal, false),
EQUAL(OperatorEnum::equalCheck, false),
NOT_EQUAL(OperatorEnum::notEqual, true),
GREATER_THAN(OperatorEnum::greaterThan, false),
LESS_THAN(OperatorEnum::lessThan, false),
@ -111,7 +111,7 @@ enum OperatorEnum {
return cellValue.compareTo(v1) < 0 || cellValue.compareTo(v2) > 0;
}
private static <C extends Comparable<C>> boolean equal(C cellValue, C v1, C v2) {
private static <C extends Comparable<C>> boolean equalCheck(C cellValue, C v1, C v2) {
if (v1 == null) {
if (cellValue instanceof Number) {
// use zero for null
@ -121,8 +121,7 @@ enum OperatorEnum {
} else if (cellValue instanceof Boolean) return false;
return false; // just in case - not a typical possibility
}
// need to avoid instanceof, to work around a 1.6 compiler bug
if (cellValue.getClass() == String.class) {
if (cellValue instanceof String) {
return cellValue.toString().compareToIgnoreCase(v1.toString()) == 0;
}
return cellValue.compareTo(v1) == 0;

6
poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
View File

@ -114,7 +114,7 @@ public final class LookupUtils {
default Iterator<Integer> indexIterator() {
return new Iterator<Integer>() {
int pos = 0;
private int pos = 0;
@Override
public boolean hasNext() {
@ -123,7 +123,9 @@ public final class LookupUtils {
@Override
public Integer next() {
return pos++;
pos++;
if (pos > getSize()) throw new NoSuchElementException();
return pos;
}
};
}