Author: fanningpj
Date: Tue Feb 22 01:06:13 2022
New Revision: 1898297
URL: http://svn.apache.org/viewvc?rev=1898297&view=rev
Log:
sonar issues
Removed:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/model/InternalSheet.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BesselJ.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarFr.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/model/InternalSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/model/InternalSheet.java?rev=1898297&r1=1898296&r2=1898297&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/model/InternalSheet.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/model/InternalSheet.java
Tue Feb 22 01:06:13 2022
@@ -561,17 +561,17 @@ public final class InternalSheet {
boolean haveSerializedIndex = false;
for (int k = 0; k < _records.size(); k++) {
- RecordBase record = _records.get(k);
+ RecordBase recordBase = _records.get(k);
- if (record instanceof RecordAggregate) {
- RecordAggregate agg = (RecordAggregate) record;
+ if (recordBase instanceof RecordAggregate) {
+ RecordAggregate agg = (RecordAggregate) recordBase;
agg.visitContainedRecords(ptv);
- } else {
- ptv.visitRecord((Record) record);
+ } else if (recordBase instanceof Record) {
+ ptv.visitRecord((Record) recordBase);
}
// If the BOF record was just serialized then add the IndexRecord
- if (record instanceof BOFRecord) {
+ if (recordBase instanceof BOFRecord) {
if (!haveSerializedIndex) {
haveSerializedIndex = true;
// Add an optional UncalcedRecord. However, we should add
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java?rev=1898297&r1=1898296&r2=1898297&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
Tue Feb 22 01:06:13 2022
@@ -1763,7 +1763,7 @@ public final class HSSFWorkbook extends
}
}
if (refModeRecord == null) {
- continue;
+ //no-op
} else if (refModeRecord.getMode() == RefModeRecord.USE_R1C1_MODE)
{
return CellReferenceType.R1C1;
} else if (refModeRecord.getMode() == RefModeRecord.USE_A1_MODE) {
@@ -2043,7 +2043,7 @@ public final class HSSFWorkbook extends
public List<HSSFPictureData> getAllPictures() {
// The drawing group record always exists at the top level, so we
won't need to do this recursively.
List<HSSFPictureData> pictures = new ArrayList<>();
- for (RecordBase r : workbook.getRecords()) {
+ for (org.apache.poi.hssf.record.Record r : workbook.getRecords()) {
if (r instanceof AbstractEscherHolderRecord) {
((AbstractEscherHolderRecord) r).decode();
List<EscherRecord> escherRecords =
((AbstractEscherHolderRecord) r).getEscherRecords();
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java?rev=1898297&r1=1898296&r2=1898297&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
Tue Feb 22 01:06:13 2022
@@ -36,33 +36,33 @@ public class WorkdayCalculator {
public static final WorkdayCalculator instance = new WorkdayCalculator();
private static final Set<Integer> standardWeekend =
- new HashSet<>(Arrays.asList(new Integer[]{Calendar.SATURDAY,
Calendar.SUNDAY}));
+ new HashSet<>(Arrays.asList(Calendar.SATURDAY, Calendar.SUNDAY));
private static final Set<Integer> sunMonWeekend =
- new HashSet<>(Arrays.asList(new Integer[]{Calendar.SUNDAY,
Calendar.MONDAY}));
+ new HashSet<>(Arrays.asList(Calendar.SUNDAY, Calendar.MONDAY));
private static final Set<Integer> monTuesWeekend =
- new HashSet<>(Arrays.asList(new Integer[]{Calendar.MONDAY,
Calendar.TUESDAY}));
+ new HashSet<>(Arrays.asList(Calendar.MONDAY, Calendar.TUESDAY));
private static final Set<Integer> tuesWedsWeekend =
- new HashSet<>(Arrays.asList(new Integer[]{Calendar.TUESDAY,
Calendar.WEDNESDAY}));
+ new HashSet<>(Arrays.asList(Calendar.TUESDAY, Calendar.WEDNESDAY));
private static final Set<Integer> wedsThursWeekend =
- new HashSet<>(Arrays.asList(new Integer[]{Calendar.WEDNESDAY,
Calendar.THURSDAY}));
+ new HashSet<>(Arrays.asList(Calendar.WEDNESDAY,
Calendar.THURSDAY));
private static final Set<Integer> thursFriWeekend =
- new HashSet<>(Arrays.asList(new Integer[]{Calendar.THURSDAY,
Calendar.FRIDAY}));
+ new HashSet<>(Arrays.asList(Calendar.THURSDAY, Calendar.FRIDAY));
private static final Set<Integer> friSatWeekend =
- new HashSet<>(Arrays.asList(new Integer[]{Calendar.FRIDAY,
Calendar.SATURDAY}));
+ new HashSet<>(Arrays.asList(Calendar.FRIDAY, Calendar.SATURDAY));
private static final Set<Integer> monWeekend =
- new HashSet<>(Arrays.asList(new Integer[]{Calendar.MONDAY}));
+ new HashSet<>(Arrays.asList(Calendar.MONDAY));
private static final Set<Integer> tuesWeekend =
- new HashSet<>(Arrays.asList(new Integer[]{Calendar.TUESDAY}));
+ new HashSet<>(Arrays.asList(Calendar.TUESDAY));
private static final Set<Integer> wedsWeekend =
- new HashSet<>(Arrays.asList(new Integer[]{Calendar.WEDNESDAY}));
+ new HashSet<>(Arrays.asList(Calendar.WEDNESDAY));
private static final Set<Integer> thursWeekend =
- new HashSet<>(Arrays.asList(new Integer[]{Calendar.THURSDAY}));
+ new HashSet<>(Arrays.asList(Calendar.THURSDAY));
private static final Set<Integer> friWeekend =
- new HashSet<>(Arrays.asList(new Integer[]{Calendar.FRIDAY}));
+ new HashSet<>(Arrays.asList(Calendar.FRIDAY));
private static final Set<Integer> satWeekend =
- new HashSet<>(Arrays.asList(new Integer[]{Calendar.SATURDAY}));
+ new HashSet<>(Arrays.asList(Calendar.SATURDAY));
private static final Set<Integer> sunWeekend =
- new HashSet<>(Arrays.asList(new Integer[]{Calendar.SUNDAY}));
+ new HashSet<>(Arrays.asList(Calendar.SUNDAY));
private static final Map<Integer, Set<Integer>> weekendTypeMap = new
HashMap<>();
static {
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BesselJ.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BesselJ.java?rev=1898297&r1=1898296&r2=1898297&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BesselJ.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BesselJ.java
Tue Feb 22 01:06:13 2022
@@ -24,9 +24,6 @@ import org.apache.poi.ss.formula.eval.Nu
import org.apache.poi.ss.formula.eval.OperandResolver;
import org.apache.poi.ss.formula.eval.ValueEval;
-import java.math.BigDecimal;
-import java.math.MathContext;
-
/**
* Implementation for Excel BESSELJ() function.
* <p>
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarFr.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarFr.java?rev=1898297&r1=1898296&r2=1898297&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarFr.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarFr.java
Tue Feb 22 01:06:13 2022
@@ -26,8 +26,6 @@ import org.apache.poi.ss.formula.eval.Va
import java.math.BigDecimal;
import java.math.MathContext;
-import java.text.NumberFormat;
-import java.util.Locale;
/**
* Implementation for Excel DOLLARFR() function.
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java?rev=1898297&r1=1898296&r2=1898297&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
[UTF-8] (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
[UTF-8] Tue Feb 22 01:06:13 2022
@@ -23,7 +23,6 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
-import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.temporal.ChronoField;
@@ -42,8 +41,7 @@ import org.apache.poi.util.LocaleUtil;
* Contains methods for dealing with Excel dates.
*/
public class DateUtil {
- // FIXME this should be changed to private and the class marked final once
HSSFDateUtil can be removed
- protected DateUtil() {
+ private DateUtil() {
// no instances of this class
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
