From a6f005de81496e6b80690defe406eae788849bed Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Sat, 12 Nov 2016 00:52:10 +0000 Subject: [PATCH] SonarCube fixes git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1769366 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/ss/examples/ExcelComparator.java | 4 +-- .../src/org/apache/poi/ss/examples/ToCSV.java | 36 ++++++++++--------- .../ss/formula/atp/NetworkdaysFunction.java | 2 +- .../ss/formula/function/FunctionMetadata.java | 2 +- .../function/FunctionMetadataRegistry.java | 2 +- .../java/org/apache/poi/util/OOXMLLite.java | 7 ++-- 6 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/examples/src/org/apache/poi/ss/examples/ExcelComparator.java b/src/examples/src/org/apache/poi/ss/examples/ExcelComparator.java index d6f846a6b..5ed404e2d 100644 --- a/src/examples/src/org/apache/poi/ss/examples/ExcelComparator.java +++ b/src/examples/src/org/apache/poi/ss/examples/ExcelComparator.java @@ -318,9 +318,7 @@ public class ExcelComparator { if (!name1.equals(name2)) { String str = String.format(Locale.ROOT, "%s\nworkbook1 -> %s [%d] != workbook2 -> %s [%d]", - "Name of the sheets do not match ::", - loc1.sheet.getSheetName(), name1, i+1, - loc2.sheet.getSheetName(), name2, i+1 + "Name of the sheets do not match ::", name1, i+1, name2, i+1 ); listOfDifferences.add(str); } diff --git a/src/examples/src/org/apache/poi/ss/examples/ToCSV.java b/src/examples/src/org/apache/poi/ss/examples/ToCSV.java index 532b89c0f..b6c5ea972 100644 --- a/src/examples/src/org/apache/poi/ss/examples/ToCSV.java +++ b/src/examples/src/org/apache/poi/ss/examples/ToCSV.java @@ -344,23 +344,25 @@ public class ToCSV { // (.xls) and the other a SpreadsheetML file (.xlsx), then the names // for both CSV files will be identical and one CSV file will, // therefore, over-write the other. - for(File excelFile : filesList) { - // Open the workbook - this.openWorkbook(excelFile); - - // Convert it's contents into a CSV file - this.convertToCSV(); - - // Build the name of the csv folder from that of the Excel workbook. - // Simply replace the .xls or .xlsx file extension with .csv - destinationFilename = excelFile.getName(); - destinationFilename = destinationFilename.substring( - 0, destinationFilename.lastIndexOf(".")) + - ToCSV.CSV_FILE_EXTENSION; - - // Save the CSV file away using the newly constricted file name - // and to the specified directory. - this.saveCSVFile(new File(destination, destinationFilename)); + if (filesList != null) { + for(File excelFile : filesList) { + // Open the workbook + this.openWorkbook(excelFile); + + // Convert it's contents into a CSV file + this.convertToCSV(); + + // Build the name of the csv folder from that of the Excel workbook. + // Simply replace the .xls or .xlsx file extension with .csv + destinationFilename = excelFile.getName(); + destinationFilename = destinationFilename.substring( + 0, destinationFilename.lastIndexOf(".")) + + ToCSV.CSV_FILE_EXTENSION; + + // Save the CSV file away using the newly constricted file name + // and to the specified directory. + this.saveCSVFile(new File(destination, destinationFilename)); + } } } diff --git a/src/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java b/src/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java index 6c07ed9d3..95e054864 100644 --- a/src/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java +++ b/src/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java @@ -58,7 +58,7 @@ final class NetworkdaysFunction implements FreeRefFunction { * * @return {@link ValueEval} for the number of days between two dates. */ - public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) { + public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) { // NOSONAR if (args.length < 2 || args.length > 3) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/ss/formula/function/FunctionMetadata.java b/src/java/org/apache/poi/ss/formula/function/FunctionMetadata.java index 0a72bba38..6ab06f0ad 100644 --- a/src/java/org/apache/poi/ss/formula/function/FunctionMetadata.java +++ b/src/java/org/apache/poi/ss/formula/function/FunctionMetadata.java @@ -47,7 +47,7 @@ public final class FunctionMetadata { _minParams = minParams; _maxParams = maxParams; _returnClassCode = returnClassCode; - _parameterClassCodes = parameterClassCodes; + _parameterClassCodes = (parameterClassCodes == null) ? null : parameterClassCodes.clone(); } public int getIndex() { return _index; diff --git a/src/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java b/src/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java index bbe9ecfd8..34317fe6d 100644 --- a/src/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java +++ b/src/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java @@ -49,7 +49,7 @@ public final class FunctionMetadataRegistry { } /* package */ FunctionMetadataRegistry(FunctionMetadata[] functionDataByIndex, Map functionDataByName) { - _functionDataByIndex = functionDataByIndex; + _functionDataByIndex = (functionDataByIndex == null) ? null : functionDataByIndex.clone(); _functionDataByName = functionDataByName; } diff --git a/src/ooxml/java/org/apache/poi/util/OOXMLLite.java b/src/ooxml/java/org/apache/poi/util/OOXMLLite.java index c8d361049..c42ba5e03 100644 --- a/src/ooxml/java/org/apache/poi/util/OOXMLLite.java +++ b/src/ooxml/java/org/apache/poi/util/OOXMLLite.java @@ -207,8 +207,11 @@ public final class OOXMLLite { private static void collectTests(File root, File arg, List> out, String ptrn, String exclude) throws ClassNotFoundException { if (arg.isDirectory()) { - for (File f : arg.listFiles()) { - collectTests(root, f, out, ptrn, exclude); + File files[] = arg.listFiles(); + if (files != null) { + for (File f : files) { + collectTests(root, f, out, ptrn, exclude); + } } } else { String path = arg.getAbsolutePath();