diff options
-rw-r--r-- | src/java/org/apache/poi/ddf/EscherComplexProperty.java | 2 | ||||
-rw-r--r-- | src/java/org/apache/poi/dev/RecordGenerator.java | 8 | ||||
-rw-r--r-- | src/java/org/apache/poi/hpsf/Decimal.java | 3 | ||||
-rw-r--r-- | src/resources/devtools/findbugs-filters.xml | 4 |
4 files changed, 14 insertions, 3 deletions
diff --git a/src/java/org/apache/poi/ddf/EscherComplexProperty.java b/src/java/org/apache/poi/ddf/EscherComplexProperty.java index 3649d98f06..9c97ec0448 100644 --- a/src/java/org/apache/poi/ddf/EscherComplexProperty.java +++ b/src/java/org/apache/poi/ddf/EscherComplexProperty.java @@ -106,7 +106,7 @@ public class EscherComplexProperty extends EscherProperty { if (this == o) { return true; } - if (!(o instanceof EscherComplexProperty)) { + if (o == null || !(o instanceof EscherComplexProperty)) { return false; } diff --git a/src/java/org/apache/poi/dev/RecordGenerator.java b/src/java/org/apache/poi/dev/RecordGenerator.java index f841edec42..2d3cdf3a99 100644 --- a/src/java/org/apache/poi/dev/RecordGenerator.java +++ b/src/java/org/apache/poi/dev/RecordGenerator.java @@ -92,7 +92,9 @@ public class RecordGenerator { // Generate record String destinationPath = destSrcPathDir + "/" + packageName; File destinationPathFile = new File(destinationPath); - destinationPathFile.mkdirs(); + if (destinationPathFile.mkdirs()) { + System.out.println("Created destination directory: " + destinationPath); + } String destinationFilepath = destinationPath + "/" + recordName + suffix + ".java"; transform(file, new File(destinationFilepath), new File(recordStyleDir + "/" + extendstg.toLowerCase(Locale.ROOT) + ".xsl")); @@ -101,7 +103,9 @@ public class RecordGenerator { // Generate test (if not already generated) destinationPath = testSrcPathDir + "/" + packageName; destinationPathFile = new File(destinationPath); - destinationPathFile.mkdirs(); + if (destinationPathFile.mkdirs()) { + System.out.println("Created destination directory: " + destinationPath); + } destinationFilepath = destinationPath + "/Test" + recordName + suffix + ".java"; if (new File(destinationFilepath).exists() == false) { String temp = (recordStyleDir + "/" + extendstg.toLowerCase(Locale.ROOT) + "_test.xsl"); diff --git a/src/java/org/apache/poi/hpsf/Decimal.java b/src/java/org/apache/poi/hpsf/Decimal.java index 8897d3d5b2..d8c404c31c 100644 --- a/src/java/org/apache/poi/hpsf/Decimal.java +++ b/src/java/org/apache/poi/hpsf/Decimal.java @@ -24,6 +24,9 @@ class Decimal { static final int SIZE = 16; + /** + * Findbugs: UNR_UNREAD_FIELD + */ private short field_1_wReserved; private byte field_2_scale; private byte field_3_sign; diff --git a/src/resources/devtools/findbugs-filters.xml b/src/resources/devtools/findbugs-filters.xml index 458f5eaa1c..cb9c4f3607 100644 --- a/src/resources/devtools/findbugs-filters.xml +++ b/src/resources/devtools/findbugs-filters.xml @@ -80,6 +80,10 @@ <Class name="org.apache.poi.xssf.model.IndexedUDFFinder"/> <Bug code="Nm" /> </Match> + <Match> + <Class name="org.apache.poi.hpsf.Decimal"/> + <Bug pattern="URF_UNREAD_FIELD" /> + </Match> <!-- named this way on purpose --> <Match> |