Adjust comments and IDE warnings, duplicate code reduction

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

diff --git a/src/java/org/apache/poi/ss/usermodel/Workbook.java b/src/java/org/apache/poi/ss/usermodel/Workbook.java
index bd34cb2b78d747b01a9d984d30c2caeba717399f..3b6a3ea11f5638002e5b15a3769415d69a96b0b9 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/Workbook.java
+++ b/src/java/org/apache/poi/ss/usermodel/Workbook.java
@@ -369,10 +369,10 @@ public interface Workbook extends Closeable, Iterable<Sheet> {
      * @param nameIndex position of the named range (0-based)
      * @return the defined name at the specified index
      * @throws IllegalArgumentException if the supplied index is invalid
-     * @deprecated 3.18. New projects should avoid accessing named ranges by index.
+     * @deprecated 4.0.0. New projects should avoid accessing named ranges by index.
      */
     @Deprecated
-    @Removal(version="3.20")
+    @Removal(version="5.0.0")
     Name getNameAt(int nameIndex);
 
     /**

diff --git a/src/java/org/apache/poi/util/IOUtils.java b/src/java/org/apache/poi/util/IOUtils.java
index 523f7c7de9bcd322d9718609c60f7b4ce7289fcc..839663cda3facc448b9e648f4fbd0ec05ecf1035 100644 (file)
--- a/src/java/org/apache/poi/util/IOUtils.java
+++ b/src/java/org/apache/poi/util/IOUtils.java
@@ -140,13 +140,7 @@ public final class IOUtils {
         if (length > (long)Integer.MAX_VALUE) {
             throw new RecordFormatException("Can't allocate an array > "+Integer.MAX_VALUE);
         }
-        if (BYTE_ARRAY_MAX_OVERRIDE > 0) {
-            if (length > BYTE_ARRAY_MAX_OVERRIDE) {
-                throwRFE(length, BYTE_ARRAY_MAX_OVERRIDE);
-            }
-        } else if (length > maxLength) {
-            throwRFE(length, maxLength);
-        }
+        checkLength(length, maxLength);
 
         final int len = Math.min((int)length, maxLength);
         ByteArrayOutputStream baos = new ByteArrayOutputStream(len == Integer.MAX_VALUE ? 4096 : len);
@@ -172,7 +166,17 @@ public final class IOUtils {
         return baos.toByteArray();
     }
 
-    
+    private static void checkLength(long length, int maxLength) {
+        if (BYTE_ARRAY_MAX_OVERRIDE > 0) {
+            if (length > BYTE_ARRAY_MAX_OVERRIDE) {
+                throwRFE(length, BYTE_ARRAY_MAX_OVERRIDE);
+            }
+        } else if (length > maxLength) {
+            throwRFE(length, maxLength);
+        }
+    }
+
+
     /**
      * Returns an array (that shouldn't be written to!) of the
      *  ByteBuffer. Will be of the requested length, or possibly
@@ -540,13 +544,7 @@ public final class IOUtils {
         if (length > (long)Integer.MAX_VALUE) {
             throw new RecordFormatException("Can't allocate an array > "+Integer.MAX_VALUE);
         }
-        if (BYTE_ARRAY_MAX_OVERRIDE > 0) {
-            if (length > BYTE_ARRAY_MAX_OVERRIDE) {
-                throwRFE(length, BYTE_ARRAY_MAX_OVERRIDE);
-            }
-        } else if (length > maxLength) {
-            throwRFE(length, maxLength);
-        }
+        checkLength(length, maxLength);
         return new byte[(int)length];
     }
 

diff --git a/src/testcases/org/apache/poi/util/TestIOUtils.java b/src/testcases/org/apache/poi/util/TestIOUtils.java
index 0acef2fa7d2ddcd93306a851bcb4982515edf17c..f47a92fc5807a287f1ac80771dd068067ba5d667 100644 (file)
--- a/src/testcases/org/apache/poi/util/TestIOUtils.java
+++ b/src/testcases/org/apache/poi/util/TestIOUtils.java
@@ -59,7 +59,7 @@ public final class TestIOUtils {
     }
 
     @AfterClass
-    public static void tearDown() throws IOException {
+    public static void tearDown() {
         assertTrue(TMP.delete());
     }
 
@@ -99,13 +99,13 @@ public final class TestIOUtils {
     }
 
     @Test
-    public void testToByteArrayByteBuffer() throws Exception {
+    public void testToByteArrayByteBuffer() {
         assertArrayEquals(new byte[] { 1, 2, 3},
                 IOUtils.toByteArray(ByteBuffer.wrap(new byte[]{1, 2, 3}), 10));
     }
 
     @Test
-    public void testToByteArrayByteBufferToSmall() throws Exception {
+    public void testToByteArrayByteBufferToSmall() {
         assertArrayEquals(new byte[] { 1, 2, 3, 4, 5, 6, 7},
                 IOUtils.toByteArray(ByteBuffer.wrap(new byte[]{1, 2, 3, 4, 5, 6, 7}), 3));
     }
@@ -210,19 +210,19 @@ public final class TestIOUtils {
         int readCalled;
 
         @Override
-        public int read() throws IOException {
+        public int read() {
             readCalled++;
             return 0;
         }
 
         @Override
-        public int read(byte[] arr, int offset, int len) throws IOException {
+        public int read(byte[] arr, int offset, int len) {
             readCalled++;
             return len;
         }
 
         @Override
-        public long skip(long len) throws IOException {
+        public long skip(long len) {
             skipCalled++;
             if (skipCalled == 1) {
                 return 0;