IO-192 use the new exception handling methods

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@744372 13f79535-47bb-0310-9956-ffa450edef68

Author: Niall Pemberton

src/java/org/apache/commons/io/input/TaggedInputStream.java

@@ -105,67 +105,15 @@ public void throwIfCauseOf(Exception exception) throws IOException {
         }
     }
 
+    /**
+     * Tags any IOExceptions thrown, wrapping and re-throwing.
+     * 
+     * @param e The IOException thrown
+     * @throws IOException if an I/O error occurs
+     */
     @Override
-    public int available() throws IOException {
-        try {
-            return super.available();
-        } catch (IOException e) {
-            throw new TaggedIOException(e, this);
-        }
-    }
-
-    @Override
-    public int read() throws IOException {
-        try {
-            return super.read();
-        } catch (IOException e) {
-            throw new TaggedIOException(e, this);
-        }
-    }
-
-    @Override
-    public int read(byte[] bts, int st, int end) throws IOException {
-        try {
-            return super.read(bts, st, end);
-        } catch (IOException e) {
-            throw new TaggedIOException(e, this);
-        }
-    }
-
-    @Override
-    public int read(byte[] bts) throws IOException {
-        try {
-            return super.read(bts);
-        } catch (IOException e) {
-            throw new TaggedIOException(e, this);
-        }
-    }
-
-    @Override
-    public long skip(long ln) throws IOException {
-        try {
-            return super.skip(ln);
-        } catch (IOException e) {
-            throw new TaggedIOException(e, this);
-        }
-    }
-
-    @Override
-    public void reset() throws IOException {
-        try {
-            super.reset();
-        } catch (IOException e) {
-            throw new TaggedIOException(e, this);
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-        try {
-            super.close();
-        } catch (IOException e) {
-            throw new TaggedIOException(e, this);
-        }
+    protected void handleIOException(IOException e) throws IOException {
+        throw new TaggedIOException(e, this);
     }
 
 }

src/java/org/apache/commons/io/output/TaggedOutputStream.java

@@ -105,49 +105,15 @@ public void throwIfCauseOf(Exception exception) throws IOException {
         }
     }
 
+    /**
+     * Tags any IOExceptions thrown, wrapping and re-throwing.
+     *
+     * @param e The IOException thrown
+     * @throws IOException if an I/O error occurs
+     */
     @Override
-    public void write(byte[] bts, int st, int end) throws IOException {
-        try {
-            super.write(bts, st, end);
-        } catch (IOException e) {
-            throw new TaggedIOException(e, this);
-        }
-    }
-
-    @Override
-    public void write(byte[] bts) throws IOException {
-        try {
-            super.write(bts);
-        } catch (IOException e) {
-            throw new TaggedIOException(e, this);
-        }
-    }
-
-    @Override
-    public void write(int idx) throws IOException {
-        try {
-            super.write(idx);
-        } catch (IOException e) {
-            throw new TaggedIOException(e, this);
-        }
-    }
-
-    @Override
-    public void flush() throws IOException {
-        try {
-            super.flush();
-        } catch (IOException e) {
-            throw new TaggedIOException(e, this);
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-        try {
-            super.close();
-        } catch (IOException e) {
-            throw new TaggedIOException(e, this);
-        }
+    protected void handleIOException(IOException e) throws IOException {
+        throw new TaggedIOException(e, this);
     }
 
 }