You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2013/12/20 15:52:14 UTC
svn commit: r1552689 - in /commons/proper/compress/trunk/src: changes/
main/java/org/apache/commons/compress/archivers/sevenz/
main/java/org/apache/commons/compress/archivers/zip/
Author: bodewig
Date: Fri Dec 20 14:52:13 2013
New Revision: 1552689
URL: http://svn.apache.org/r1552689
Log:
try-with-resources support for the *File classes
Modified:
commons/proper/compress/trunk/src/changes/changes.xml
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
Modified: commons/proper/compress/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/changes/changes.xml?rev=1552689&r1=1552688&r2=1552689&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/changes/changes.xml (original)
+++ commons/proper/compress/trunk/src/changes/changes.xml Fri Dec 20 14:52:13 2013
@@ -81,6 +81,10 @@ The <action> type attribute can be add,u
<action issue="COMPRESS-115" type="add" date="2012-12-19" due-to="Emmanuel Bourg">
ZipFile and ZipArchiveInputStream now support reading entries compressed using the IMPLODE method.
</action>
+ <action type="add" date="2013-12-20">
+ ZipFile and the 7z file classes now implement Closeable and
+ can be used in try-with-resources constructs.
+ </action>
</release>
<release version="1.6" date="2013-10-26"
description="Release 1.6">
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java?rev=1552689&r1=1552688&r2=1552689&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java Fri Dec 20 14:52:13 2013
@@ -18,6 +18,7 @@
package org.apache.commons.compress.archivers.sevenz;
import java.io.ByteArrayInputStream;
+import java.io.Closeable;
import java.io.DataInput;
import java.io.DataInputStream;
import java.io.File;
@@ -61,7 +62,7 @@ import org.apache.commons.compress.utils
* @NotThreadSafe
* @since 1.6
*/
-public class SevenZFile {
+public class SevenZFile implements Closeable {
static final int SIGNATURE_HEADER_SIZE = 32;
private static final int DRAIN_BUF_SIZE = 64 * 1024;
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java?rev=1552689&r1=1552688&r2=1552689&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java Fri Dec 20 14:52:13 2013
@@ -18,6 +18,7 @@
package org.apache.commons.compress.archivers.sevenz;
import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.File;
@@ -37,7 +38,7 @@ import org.apache.commons.compress.utils
* Writes a 7z file.
* @since 1.6
*/
-public class SevenZOutputFile {
+public class SevenZOutputFile implements Closeable {
private final RandomAccessFile file;
private final List<SevenZArchiveEntry> files = new ArrayList<SevenZArchiveEntry>();
private int numNonEmptyStreams = 0;
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java?rev=1552689&r1=1552688&r2=1552689&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java Fri Dec 20 14:52:13 2013
@@ -18,6 +18,7 @@
package org.apache.commons.compress.archivers.zip;
import java.io.BufferedInputStream;
+import java.io.Closeable;
import java.io.EOFException;
import java.io.File;
import java.io.IOException;
@@ -75,7 +76,7 @@ import static org.apache.commons.compres
* </ul>
*
*/
-public class ZipFile {
+public class ZipFile implements Closeable {
private static final int HASH_SIZE = 509;
static final int NIBLET_MASK = 0x0f;
static final int BYTE_SHIFT = 8;