AfflictionNetworks/nenya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Out with commons-io.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@835 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Michael Bayne
2009-07-12 21:26:06 +00:00
parent dd77edca9c
commit 1443bd59cb
7 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundler.java
+2 -2
View File
@@ -31,7 +31,7 @@ import java.io.ObjectOutputStream;
import javax.imageio.ImageIO;
import org.apache.commons.io.IOUtils;
import com.samskivert.io.StreamUtil;
import com.threerings.media.tile.ImageProvider;
import com.threerings.media.tile.ObjectTileSet;
@@ -137,7 +137,7 @@ public class DirectoryTileSetBundler extends TileSetBundler
outFile.getParentFile().mkdirs();
FileOutputStream fout = new FileOutputStream(outFile);
FileInputStream imgin = new FileInputStream(ifile);
IOUtils.copy(imgin, fout);
StreamUtil.copy(imgin, fout);
} catch (Exception e) {
String msg = "Failure bundling image " + ifile + ": " + e;
throw (IOException) new IOException(msg).initCause(e);
src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
+4 -7
View File
@@ -35,17 +35,14 @@ import java.io.IOException;
import java.io.ObjectOutputStream;
import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
import com.google.common.collect.Lists;
import org.apache.commons.digester.Digester;
import org.xml.sax.SAXException;
import org.apache.commons.digester.Digester;
import org.apache.commons.io.IOUtils;
import com.google.common.collect.Lists;
import com.samskivert.io.PersistenceException;
import com.samskivert.io.StreamUtil;
import com.samskivert.util.HashIntMap;
import com.threerings.resource.FastImageIO;
@@ -429,7 +426,7 @@ public class TileSetBundler
} else {
jar.putNextEntry(new JarEntry(imagePath));
FileInputStream imgin = new FileInputStream(ifile);
IOUtils.copy(imgin, jar);
StreamUtil.copy(imgin, jar);
}
} catch (Exception e) {
String msg = "Failure bundling image " + ifile +