Author: bodewig
Date: Fri Feb 6 17:27:40 2009
New Revision: 741643
URL: http://svn.apache.org/viewvc?rev=741643&view=rev
Log:
rename ZipOutputStream to ZipArchiveOutputStream
Added:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
(contents, props changed)
- copied, changed from r741641,
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipOutputStream.java
Removed:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipOutputStream.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java?rev=741643&r1=741642&r2=741643&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
Fri Feb 6 17:27:40 2009
@@ -31,7 +31,7 @@
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
-import org.apache.commons.compress.archivers.zip.ZipOutputStream;
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
/**
* Factory to create Archive[In|Out]putStreams from names
@@ -65,7 +65,7 @@
if ("ar".equalsIgnoreCase(archiverName)) {
return new ArArchiveOutputStream(out);
} else if("zip".equalsIgnoreCase(archiverName)) {
- return new ZipOutputStream(out);
+ return new ZipArchiveOutputStream(out);
} else if("tar".equalsIgnoreCase(archiverName)) {
return new TarArchiveOutputStream(out);
} else if("jar".equalsIgnoreCase(archiverName)) {
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java?rev=741643&r1=741642&r2=741643&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
Fri Feb 6 17:27:40 2009
@@ -23,9 +23,9 @@
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-import org.apache.commons.compress.archivers.zip.ZipOutputStream;
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
-public class JarArchiveOutputStream extends ZipOutputStream {
+public class JarArchiveOutputStream extends ZipArchiveOutputStream {
public JarArchiveOutputStream( final OutputStream out ) {
super(out);
Copied:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
(from r741641,
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipOutputStream.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java?p2=commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java&p1=commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipOutputStream.java&r1=741641&r2=741643&rev=741643&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
Fri Feb 6 17:27:40 2009
@@ -57,7 +57,7 @@
* #putNextEntry putNextEntry} can be called.</p>
*
*/
-public class ZipOutputStream extends ArchiveOutputStream {
+public class ZipArchiveOutputStream extends ArchiveOutputStream {
private static final int BYTE_MASK = 0xFF;
private static final int SHORT = 2;
@@ -251,7 +251,7 @@
* @param out the outputstream to zip
* @since 1.1
*/
- public ZipOutputStream(OutputStream out) {
+ public ZipArchiveOutputStream(OutputStream out) {
super(out);
}
@@ -262,7 +262,7 @@
* @since 1.14
* @throws IOException on error
*/
- public ZipOutputStream(File file) throws IOException {
+ public ZipArchiveOutputStream(File file) throws IOException {
super(null);
try {
Propchange:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java?rev=741643&r1=741642&r2=741643&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
Fri Feb 6 17:27:40 2009
@@ -279,7 +279,7 @@
byte[] signatureBytes = new byte[WORD];
archive.readFully(signatureBytes);
long sig = ZipLong.getValue(signatureBytes);
- final long cfhSig = ZipLong.getValue(ZipOutputStream.CFH_SIG);
+ final long cfhSig = ZipLong.getValue(ZipArchiveOutputStream.CFH_SIG);
if (sig != cfhSig && startsWithLocalFileHeader()) {
throw new IOException("central directory is empty, can't expand"
+ " corrupt archive.");
@@ -404,7 +404,7 @@
long stopSearching = Math.max(0L, archive.length() - MAX_EOCD_SIZE);
if (off >= 0) {
archive.seek(off);
- byte[] sig = ZipOutputStream.EOCD_SIG;
+ byte[] sig = ZipArchiveOutputStream.EOCD_SIG;
int curr = archive.read();
while (off >= stopSearching && curr != -1) {
if (curr == sig[POS_0]) {
@@ -546,7 +546,7 @@
final byte[] start = new byte[WORD];
archive.readFully(start);
for (int i = 0; i < start.length; i++) {
- if (start[i] != ZipOutputStream.LFH_SIG[i]) {
+ if (start[i] != ZipArchiveOutputStream.LFH_SIG[i]) {
return false;
}
}
