findbugs fixes

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1749238 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java b/src/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java
index d5212e5b94efc63fc7230cb209ce5fe73766f828..e7577c3f67d9813b2fe3594ee5c6cbb40c518211 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java
+++ b/src/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java
@@ -60,7 +60,7 @@ public interface IconMultiStateFormatting {
         protected static final IconSet DEFAULT_ICONSET = IconSet.GYR_3_TRAFFIC_LIGHTS;\r
         \r
         /** Numeric ID of the icon set */\r
-        public int id;\r
+        public final int id;\r
         /** How many icons in the set */\r
         public final int num;\r
         /** Name (system) of the set */\r

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java
index a0cd24d450ebdf9fad763390edece67098e3c33e..0286740e08b5efe1754e48bb958eaf70a8b5a097 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java
@@ -79,7 +79,9 @@ final class XSSFEvaluationSheet implements EvaluationSheet {
         
         @Override
         public boolean equals(Object obj) {
-            if (obj == null) return false;
+            if (!(obj instanceof CellKey)) {
+                return false;
+            }
             // assumes other object is one of us, otherwise ClassCastException is thrown
             final CellKey oKey = (CellKey) obj;
             return _row == oKey._row && _col == oKey._col;

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
index 3918053103a0c302bb768d5b7738e736a491407e..17a5ac77c150237b3b6ed70304b382836238a047 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
@@ -221,16 +221,17 @@ public final class HWPFDocument extends HWPFDocumentCore
     _fib.fillVariableFields(_mainStream, _tableStream);
 
     // read in the data stream.
-    try
-    {
-      DocumentEntry dataProps =
-          (DocumentEntry)directory.getEntry(STREAM_DATA);
-      _dataStream = new byte[dataProps.getSize()];
-      directory.createDocumentInputStream(STREAM_DATA).read(_dataStream);
-    }
-    catch(java.io.FileNotFoundException e)
-    {
+    InputStream dis = null;
+    try {
+      DocumentEntry dataProps = (DocumentEntry)directory.getEntry(STREAM_DATA);
+      dis = directory.createDocumentInputStream(STREAM_DATA);
+      _dataStream = IOUtils.toByteArray(dis, dataProps.getSize());
+    } catch(IOException e) {
         _dataStream = new byte[0];
+    } finally {
+        if (dis != null) {
+            dis.close();
+        }
     }
 
     // Get the cp of the start of text in the main stream

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java
index 12153e6abd2133bc7858d673cf0b13c3921ea923..69c1997cb7e0a343f3934d95b5b48e875f896e69 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java
@@ -37,6 +37,7 @@ import org.apache.poi.hwpf.usermodel.Range;
 import org.apache.poi.poifs.filesystem.DirectoryEntry;
 import org.apache.poi.poifs.filesystem.DirectoryNode;
 import org.apache.poi.poifs.filesystem.DocumentEntry;
+import org.apache.poi.poifs.filesystem.DocumentInputStream;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.util.Internal;
@@ -147,11 +148,16 @@ public abstract class HWPFDocumentCore extends POIDocument
     super(directory);
 
     // read in the main stream.
-    DocumentEntry documentProps = (DocumentEntry)
-            directory.getEntry("WordDocument");
-    _mainStream = new byte[documentProps.getSize()];
-
-    directory.createDocumentInputStream(STREAM_WORD_DOCUMENT).read(_mainStream);
+    DocumentEntry documentProps = (DocumentEntry)directory.getEntry("WordDocument");
+    DocumentInputStream dis = null;
+    try {
+        dis = directory.createDocumentInputStream(STREAM_WORD_DOCUMENT);
+        _mainStream = IOUtils.toByteArray(dis, documentProps.getSize());
+    } finally {
+        if (dis != null) {
+            dis.close();
+        }
+    }
 
     // Create our FIB, and check for the doc being encrypted
     _fib = new FileInformationBlock(_mainStream);