XGC-148: drop commons-io dependency

examples/java/image/writer/ImageWriterExample1.java

@@ -29,7 +29,6 @@
 import java.io.OutputStream;
 import java.text.AttributedString;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.xmlgraphics.image.writer.ImageWriter;
 import org.apache.xmlgraphics.image.writer.ImageWriterParams;
 import org.apache.xmlgraphics.image.writer.ImageWriterRegistry;
@@ -106,18 +105,15 @@ public void generateBitmapUsingJava2D(File outputFile, String format)
         //Paint something
         paintSome(g2d, 1);
 
-        OutputStream out = new java.io.FileOutputStream(outputFile);
-        out = new java.io.BufferedOutputStream(out);
-        try {
+        try (OutputStream fout = new java.io.FileOutputStream(outputFile);
+             OutputStream out = new java.io.BufferedOutputStream(fout)) {
 
             ImageWriter writer = ImageWriterRegistry.getInstance().getWriterFor(format);
             ImageWriterParams params = new ImageWriterParams();
             params.setCompressionMethod(compression);
             params.setResolution(72);
             writer.writeImage(bimg, out, params);
 
-        } finally {
-            IOUtils.closeQuietly(out);
         }
     }
 

examples/java/image/writer/ImageWriterExample2.java

@@ -26,11 +26,11 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.xmlgraphics.image.writer.ImageWriter;
 import org.apache.xmlgraphics.image.writer.ImageWriterParams;
 import org.apache.xmlgraphics.image.writer.ImageWriterRegistry;
 import org.apache.xmlgraphics.image.writer.MultiImageWriter;
+import org.apache.xmlgraphics.util.io.IOUtils;
 
 public class ImageWriterExample2 extends ImageWriterExample1 {
 
@@ -67,9 +67,8 @@ public void generateBitmapUsingJava2D(File outputFile, String format)
         //String compression = "CCITT T.6";
         String compression = "PackBits";
 
-        OutputStream out = new java.io.FileOutputStream(outputFile);
-        out = new java.io.BufferedOutputStream(out);
-        try {
+        try (OutputStream fout = new java.io.FileOutputStream(outputFile);
+             OutputStream out = new java.io.BufferedOutputStream(fout)) {
 
             ImageWriter writer = ImageWriterRegistry.getInstance().getWriterFor(format);
             ImageWriterParams params = new ImageWriterParams();
@@ -86,8 +85,6 @@ public void generateBitmapUsingJava2D(File outputFile, String format)
                         + format);
             }
 
-        } finally {
-            IOUtils.closeQuietly(out);
         }
     }
 

examples/java/java2d/ps/EPSColorsExample.java

@@ -25,8 +25,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.commons.io.IOUtils;
-
 import org.apache.xmlgraphics.java2d.color.CIELabColorSpace;
 import org.apache.xmlgraphics.java2d.color.ColorSpaces;
 import org.apache.xmlgraphics.java2d.color.DeviceCMYKColorSpace;
@@ -45,9 +43,8 @@ public class EPSColorsExample {
      * @throws IOException In case of an I/O error
      */
     public static void generateEPSusingJava2D(File outputFile) throws IOException {
-        OutputStream out = new java.io.FileOutputStream(outputFile);
-        out = new java.io.BufferedOutputStream(out);
-        try {
+        try (OutputStream fout = new java.io.FileOutputStream(outputFile);
+             OutputStream out = new java.io.BufferedOutputStream(fout)) {
             //Instantiate the EPSDocumentGraphics2D instance
             EPSDocumentGraphics2D g2d = new EPSDocumentGraphics2D(false);
             g2d.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext());
@@ -96,8 +93,6 @@ public static void generateEPSusingJava2D(File outputFile) throws IOException {
 
             //Cleanup
             g2d.finish();
-        } finally {
-            IOUtils.closeQuietly(out);
         }
     }
 

examples/java/java2d/ps/EPSExample1.java

@@ -26,7 +26,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.xmlgraphics.java2d.ps.EPSDocumentGraphics2D;
 
 /**
@@ -42,9 +41,8 @@ public class EPSExample1 {
      * @throws IOException In case of an I/O error
      */
     public static void generateEPSusingJava2D(File outputFile) throws IOException {
-        OutputStream out = new java.io.FileOutputStream(outputFile);
-        out = new java.io.BufferedOutputStream(out);
-        try {
+        try (OutputStream fout = new java.io.FileOutputStream(outputFile);
+             OutputStream out = new java.io.BufferedOutputStream(fout)) {
             //Instantiate the EPSDocumentGraphics2D instance
             EPSDocumentGraphics2D g2d = new EPSDocumentGraphics2D(false);
             g2d.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext());
@@ -78,8 +76,6 @@ public static void generateEPSusingJava2D(File outputFile) throws IOException {
 
             //Cleanup
             g2d.finish();
-        } finally {
-            IOUtils.closeQuietly(out);
         }
     }
 

examples/java/java2d/ps/TilingPatternExample.java

@@ -33,8 +33,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.commons.io.IOUtils;
-
 import org.apache.xmlgraphics.image.writer.ImageWriterUtil;
 import org.apache.xmlgraphics.java2d.ps.PSDocumentGraphics2D;
 
@@ -71,9 +69,8 @@ public TilingPatternExample() {
      * @throws IOException In case of an I/O error
      */
     public void generatePSusingJava2D(File outputFile) throws IOException {
-        OutputStream out = new java.io.FileOutputStream(outputFile);
-        out = new java.io.BufferedOutputStream(out);
-        try {
+        try (OutputStream fout = new java.io.FileOutputStream(outputFile);
+             OutputStream out = new java.io.BufferedOutputStream(out)) {
             //Instantiate the PSDocumentGraphics2D instance
             PSDocumentGraphics2D g2d = new PSDocumentGraphics2D(false);
             g2d.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext());
@@ -91,8 +88,6 @@ public void generatePSusingJava2D(File outputFile) throws IOException {
 
             //Cleanup
             g2d.finish();
-        } finally {
-            IOUtils.closeQuietly(out);
         }
     }
 

examples/java/ps/DSCProcessingExample1.java

@@ -24,7 +24,6 @@
 import java.io.OutputStream;
 import java.io.InputStream;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.xmlgraphics.ps.dsc.DSCException;
 import org.apache.xmlgraphics.ps.dsc.tools.PageExtractor;
 
@@ -44,20 +43,13 @@ public class DSCProcessingExample1 {
      * @throws IOException In case of an I/O error
      */
     public void extractPages(File srcFile, File tgtFile, int from, int to) throws IOException {
-        InputStream in = new java.io.FileInputStream(srcFile);
-        in = new java.io.BufferedInputStream(in);
-        try {
-            OutputStream out = new java.io.FileOutputStream(tgtFile);
-            out = new java.io.BufferedOutputStream(out);
-            try {
-                PageExtractor.extractPages(in, out, from, to);
-            } catch (DSCException e) {
-                throw new RuntimeException(e.getMessage());
-            } finally {
-                IOUtils.closeQuietly(out);
-            }
-        } finally {
-            IOUtils.closeQuietly(in);
+        try (InputStream fin = new java.io.FileInputStream(srcFile);
+             InputStream in = new java.io.BufferedInputStream(fin);
+             OutputStream fout = new java.io.FileOutputStream(tgtFile);
+             OutputStream out = new java.io.BufferedOutputStream(fout)) {
+            PageExtractor.extractPages(in, out, from, to);
+        } catch (DSCException e) {
+            throw new RuntimeException(e.getMessage());
         }
     }
 

lib/README.txt

@@ -11,15 +11,6 @@ http://www.apache.org/licenses/
 Normal Dependencies
 ----------------------
 
-- Apache Commons IO
-
-    commons-io-*.jar
-    http://jakarta.apache.org/commons/io/
-    (I/O routines)
-
-    Apache License v2.0
-
-
 - Apache Commons Logging
 
     commons-logging-*.jar