Adjust unused local variables to also make FindBugs happy

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

diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmap16.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmap16.java
index 4439b784dd6a5c2a79353ab6ef58d26d8e1f954d..3a774af2e4df965c37b2dae0e4d7f4a24997ace6 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmap16.java
+++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmap16.java
@@ -84,8 +84,6 @@ public class HwmfBitmap16 {
     }\r
 \r
     public BufferedImage getImage() {\r
-        BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_4BYTE_ABGR);\r
-        return bi;\r
+        return new BufferedImage(width, height, BufferedImage.TYPE_4BYTE_ABGR);\r
     }\r
-\r
 }\r

diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfColorRef.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfColorRef.java
index 541b98219b7b6cb65726f09bcabb869f6b4072b3..a3b1aa206a76cba8348cd684c2d5971c10911021 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfColorRef.java
+++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfColorRef.java
@@ -43,8 +43,7 @@ public class HwmfColorRef implements Cloneable {
         int red = leis.readUByte();\r
         int green = leis.readUByte();\r
         int blue = leis.readUByte();\r
-        @SuppressWarnings("unused")\r
-        int reserved = leis.readUByte();\r
+        /*int reserved =*/ leis.readUByte();\r
 \r
         colorRef = new Color(red, green, blue);\r
         return 4*LittleEndianConsts.BYTE_SIZE;\r

diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java
index e13164f348abf3bbb944b3cfac5f5e5c7bbeec99..4b227f7d163e5d9ef0e3bbbdffab5668a8dd2101 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java
+++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java
@@ -482,8 +482,7 @@ public class HwmfFill {
             xSrc = leis.readShort();\r
             size = 6*LittleEndianConsts.SHORT_SIZE;\r
             if (!hasBitmap) {\r
-                @SuppressWarnings("unused")\r
-                int reserved = leis.readShort();\r
+                /*int reserved =*/ leis.readShort();\r
                 size += LittleEndianConsts.SHORT_SIZE;\r
             }\r
             destHeight = leis.readShort();\r
@@ -685,8 +684,7 @@ public class HwmfFill {
             size = 4*LittleEndianConsts.SHORT_SIZE;\r
             \r
             if (!hasBitmap) {\r
-                @SuppressWarnings("unused")\r
-                int reserved = leis.readShort();\r
+                /*int reserved =*/ leis.readShort();\r
                 size += LittleEndianConsts.SHORT_SIZE;\r
             }\r
             \r
@@ -872,8 +870,7 @@ public class HwmfFill {
             xSrc = leis.readShort();\r
             size = 4*LittleEndianConsts.SHORT_SIZE;\r
             if (!hasBitmap) {\r
-                @SuppressWarnings("unused")\r
-                int reserved = leis.readShort();\r
+                /*int reserved =*/ leis.readShort();\r
                 size += LittleEndianConsts.SHORT_SIZE;\r
             }\r
             height = leis.readShort();\r
@@ -979,8 +976,7 @@ public class HwmfFill {
             xSrc = leis.readShort();\r
             size = 6*LittleEndianConsts.SHORT_SIZE;\r
             if (!hasBitmap) {\r
-                @SuppressWarnings("unused")\r
-                int reserved = leis.readShort();\r
+                /*int reserved =*/ leis.readShort();\r
                 size += LittleEndianConsts.SHORT_SIZE;\r
             }\r
             destHeight = leis.readShort();\r

diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMisc.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMisc.java
index c597b1d9648407c776c5343604a32bb404580d63..c8f280ecddbcfe546972bb3a8c613f357bb350db 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMisc.java
+++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMisc.java
@@ -184,12 +184,11 @@ public class HwmfMisc {
             return HwmfRecordType.setLayout;\r
         }\r
 \r
-        @SuppressWarnings("unused")\r
         @Override\r
         public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {\r
             layout = leis.readUShort();\r
             // A 16-bit field that MUST be ignored.\r
-            int reserved = leis.readShort();\r
+            /*int reserved =*/ leis.readShort();\r
             return 2*LittleEndianConsts.SHORT_SIZE;\r
         }\r
 \r