CopyUtils has been deprecated, using IOUtils instead.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@124 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
@@ -38,7 +38,7 @@ import java.util.zip.Deflater;
|
|||||||
import javax.imageio.ImageIO;
|
import javax.imageio.ImageIO;
|
||||||
|
|
||||||
import org.apache.commons.digester.Digester;
|
import org.apache.commons.digester.Digester;
|
||||||
import org.apache.commons.io.CopyUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
import org.xml.sax.SAXException;
|
import org.xml.sax.SAXException;
|
||||||
|
|
||||||
import com.samskivert.io.PersistenceException;
|
import com.samskivert.io.PersistenceException;
|
||||||
@@ -417,7 +417,7 @@ public class TileSetBundler
|
|||||||
} else {
|
} else {
|
||||||
jar.putNextEntry(new JarEntry(imagePath));
|
jar.putNextEntry(new JarEntry(imagePath));
|
||||||
FileInputStream imgin = new FileInputStream(ifile);
|
FileInputStream imgin = new FileInputStream(ifile);
|
||||||
CopyUtils.copy(imgin, jar);
|
IOUtils.copy(imgin, jar);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
String msg = "Failure bundling image " + ifile +
|
String msg = "Failure bundling image " + ifile +
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ import java.util.jar.JarFile;
|
|||||||
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.CopyUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A resource bundle provides access to the resources in a jar file.
|
* A resource bundle provides access to the resources in a jar file.
|
||||||
@@ -254,7 +254,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);
|
||||||
CopyUtils.copy(jin, fout);
|
IOUtils.copy(jin, fout);
|
||||||
jin.close();
|
jin.close();
|
||||||
fout.close();
|
fout.close();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user