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

SonarCube fixes 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1769366 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2016-11-12 00:52:10 +00:00
parent 446ed93c4a
commit b717382548
6 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/examples/src/org/apache/poi/ss/examples/ExcelComparator.java
View File

@ -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);
}

36
src/examples/src/org/apache/poi/ss/examples/ToCSV.java
View File

@ -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));
}
}
}

2
src/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java
View File

@ -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;
}

2
src/java/org/apache/poi/ss/formula/function/FunctionMetadata.java
View File

@ -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;

2
src/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java
View File

@ -49,7 +49,7 @@ public final class FunctionMetadataRegistry {
}
/* package */ FunctionMetadataRegistry(FunctionMetadata[] functionDataByIndex, Map<String, FunctionMetadata> functionDataByName) {
_functionDataByIndex = functionDataByIndex;
_functionDataByIndex = (functionDataByIndex == null) ? null : functionDataByIndex.clone();
_functionDataByName = functionDataByName;
}

7
src/ooxml/java/org/apache/poi/util/OOXMLLite.java
View File

@ -207,8 +207,11 @@ public final class OOXMLLite {
private static void collectTests(File root, File arg, List<Class<?>> 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();