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

New commons world order.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3059 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2004-07-13 16:37:40 +00:00
parent 1da753e14d
commit c7223a89e1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/resource/ResourceBundle.java
+4 -4
View File
@@ -1,5 +1,5 @@
// //
// $Id: ResourceBundle.java,v 1.28 2004/07/03 03:21:05 mdb Exp $ // $Id: ResourceBundle.java,v 1.29 2004/07/13 16:37:40 mdb Exp $
package com.threerings.resource; package com.threerings.resource;
@@ -19,7 +19,7 @@ import com.samskivert.io.StreamUtil;
import com.samskivert.util.FileUtil; import com.samskivert.util.FileUtil;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import org.apache.commons.io.StreamUtils; import org.apache.commons.io.CopyUtils;
/** /**
* A resource bundle provides access to the resources in a jar file. * A resource bundle provides access to the resources in a jar file.
@@ -148,7 +148,7 @@ public class ResourceBundle
fout = new BufferedOutputStream( fout = new BufferedOutputStream(
new FileOutputStream(efile)); new FileOutputStream(efile));
jin = _jarSource.getInputStream(entry); jin = _jarSource.getInputStream(entry);
StreamUtils.pipe(jin, fout); CopyUtils.copy(jin, fout);
} catch (Exception e) { } catch (Exception e) {
Log.warning("Failure unpacking " + efile + ": " + e); Log.warning("Failure unpacking " + efile + ": " + e);
failure = true; failure = true;
@@ -280,7 +280,7 @@ public class ResourceBundle
BufferedOutputStream fout = BufferedOutputStream fout =
new BufferedOutputStream(new FileOutputStream(tfile)); new BufferedOutputStream(new FileOutputStream(tfile));
InputStream jin = _jarSource.getInputStream(entry); InputStream jin = _jarSource.getInputStream(entry);
StreamUtils.pipe(jin, fout); CopyUtils.copy(jin, fout);
jin.close(); jin.close();
fout.close(); fout.close();
src/java/com/threerings/resource/ResourceManager.java
+3 -3
View File
@@ -1,5 +1,5 @@
// //
// $Id: ResourceManager.java,v 1.42 2004/06/18 17:41:39 mdb Exp $ // $Id: ResourceManager.java,v 1.43 2004/07/13 16:37:40 mdb Exp $
package com.threerings.resource; package com.threerings.resource;
@@ -28,7 +28,7 @@ import javax.imageio.stream.FileImageInputStream;
import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.ImageInputStream;
import javax.imageio.stream.MemoryCacheImageInputStream; import javax.imageio.stream.MemoryCacheImageInputStream;
import org.apache.commons.io.StreamUtils; import org.apache.commons.io.CopyUtils;
import com.samskivert.util.ResultListener; import com.samskivert.util.ResultListener;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
@@ -299,7 +299,7 @@ public class ResourceManager
try { try {
if (curl != null) { if (curl != null) {
// download the properties file into a buffer // download the properties file into a buffer
StreamUtils.pipe(curl.openStream(), bout); CopyUtils.copy(curl.openStream(), bout);
config.load(new ByteArrayInputStream(bout.toByteArray())); config.load(new ByteArrayInputStream(bout.toByteArray()));
} }