From 186327b3d1252133ca82bc96a74ded85a9087ecb Mon Sep 17 00:00:00 2001 From: Mike Thomas Date: Wed, 24 Jan 2007 21:36:24 +0000 Subject: [PATCH] CopyUtils has been deprecated, using IOUtils instead. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@124 ed5b42cb-e716-0410-a449-f6a68f950b19 --- .../threerings/media/tile/bundle/tools/TileSetBundler.java | 4 ++-- src/java/com/threerings/resource/ResourceBundle.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java index 70ec79b1..8cc5e550 100644 --- a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java +++ b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java @@ -38,7 +38,7 @@ import java.util.zip.Deflater; import javax.imageio.ImageIO; import org.apache.commons.digester.Digester; -import org.apache.commons.io.CopyUtils; +import org.apache.commons.io.IOUtils; import org.xml.sax.SAXException; import com.samskivert.io.PersistenceException; @@ -417,7 +417,7 @@ public class TileSetBundler } else { jar.putNextEntry(new JarEntry(imagePath)); FileInputStream imgin = new FileInputStream(ifile); - CopyUtils.copy(imgin, jar); + IOUtils.copy(imgin, jar); } } catch (Exception e) { String msg = "Failure bundling image " + ifile + diff --git a/src/java/com/threerings/resource/ResourceBundle.java b/src/java/com/threerings/resource/ResourceBundle.java index b1133d1f..a3f41803 100644 --- a/src/java/com/threerings/resource/ResourceBundle.java +++ b/src/java/com/threerings/resource/ResourceBundle.java @@ -34,7 +34,7 @@ import java.util.jar.JarFile; import com.samskivert.util.FileUtil; import com.samskivert.util.StringUtil; -import org.apache.commons.io.CopyUtils; +import org.apache.commons.io.IOUtils; /** * A resource bundle provides access to the resources in a jar file. @@ -254,7 +254,7 @@ public class ResourceBundle BufferedOutputStream fout = new BufferedOutputStream(new FileOutputStream(tfile)); InputStream jin = _jarSource.getInputStream(entry); - CopyUtils.copy(jin, fout); + IOUtils.copy(jin, fout); jin.close(); fout.close();