Fix some compiler warnings, close resources in tests

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

diff --git a/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java b/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java
index 5304b3121af7b83a8cf66d1d45f7ddbd79127b43..b703d73d87a65ee76b126447e5da72dc3e747ab1 100644 (file)
--- a/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java
+++ b/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java
@@ -77,8 +77,7 @@ public class POIXMLTypeLoader {
     }\r
     \r
     private static XmlOptions getXmlOptions(XmlOptions options) {\r
-        XmlOptions opt = (options == null) ? DEFAULT_XML_OPTIONS : options;\r
-        return opt;\r
+        return options == null ? DEFAULT_XML_OPTIONS : options;\r
     }\r
 \r
     public static XmlObject newInstance(SchemaType type, XmlOptions options) {\r

diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java
index ec9017aefaf21c81ff7b37e443c68ec6293cc4e4..2d6fe20f4a03901aa4302d7da6690d6c495510c5 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java
+++ b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java
@@ -55,7 +55,7 @@ public class SXSSFRow implements Row, Comparable<SXSSFRow>
      * @param initialSize - no longer needed
      * @deprecated 2015-11-30 (circa POI 3.14beta1). Use {@link #SXSSFRow(SXSSFSheet)} instead.
      */
-    public SXSSFRow(SXSSFSheet sheet, int initialSize)
+    public SXSSFRow(SXSSFSheet sheet, @SuppressWarnings("UnusedParameters") int initialSize)
     {
         this(sheet);
     }
@@ -433,7 +433,6 @@ public class SXSSFRow implements Row, Comparable<SXSSFRow>
     public void setRowStyle(CellStyle style) {
        if(style == null) {
           _style = -1;
-          return;
        } else {
           _style = style.getIndex();
        }

diff --git a/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java b/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java
index 44cd2a58b2f67298d3bafbeb8fd473e684d210c7..0a471419caeaf5b01a038a4f0bdad103f37fbc3d 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java
@@ -59,7 +59,7 @@ public abstract class BaseTestXCell extends BaseTestCell {
     }
 
     @Test
-    public void testSetNullValues() {
+    public void testSetNullValues() throws IOException {
         Workbook wb = _testDataProvider.createWorkbook();
         Cell cell = wb.createSheet("test").createRow(0).createCell(0);
 
@@ -68,5 +68,7 @@ public abstract class BaseTestXCell extends BaseTestCell {
         cell.setCellValue((String)null);
         cell.setCellValue((RichTextString) null);
         cell.setCellValue((String)null);
+
+        wb.close();
     }
 }