You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2016/04/06 11:06:42 UTC
commons-compress git commit: The static field should be accessed
directly.
Repository: commons-compress
Updated Branches:
refs/heads/master 9045ef936 -> 18dcf3843
The static field should be accessed directly.
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/18dcf384
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/18dcf384
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/18dcf384
Branch: refs/heads/master
Commit: 18dcf384371013df8b79da55e258bb5ddbb4d5f0
Parents: 9045ef9
Author: ggregory <gg...@apache.org>
Authored: Wed Apr 6 02:06:40 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Apr 6 02:06:40 2016 -0700
----------------------------------------------------------------------
.../compress/archivers/zip/ParallelScatterZipCreatorTest.java | 3 ++-
.../compress/archivers/zip/ScatterZipOutputStreamTest.java | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/18dcf384/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java
index a6d6df4..e96dc31 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java
@@ -35,6 +35,7 @@ import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.zip.ZipEntry;
import static org.apache.commons.compress.AbstractTestCase.tryHardToDelete;
import static org.junit.Assert.*;
@@ -139,7 +140,7 @@ public class ParallelScatterZipCreatorTest {
private ZipArchiveEntry createZipArchiveEntry(Map<String, byte[]> entries, int i, byte[] payloadBytes) {
ZipArchiveEntry za = new ZipArchiveEntry( "file" + i);
entries.put( za.getName(), payloadBytes);
- za.setMethod(ZipArchiveEntry.DEFLATED);
+ za.setMethod(ZipEntry.DEFLATED);
za.setSize(payloadBytes.length);
za.setUnixMode(UnixStat.FILE_FLAG | 0664);
return za;
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/18dcf384/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java
index 6ac094b..88836e4 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java
@@ -25,6 +25,7 @@ import org.junit.Test;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.InputStream;
+import java.util.zip.ZipEntry;
import static org.apache.commons.compress.AbstractTestCase.tryHardToDelete;
import static org.apache.commons.compress.archivers.zip.ZipArchiveEntryRequest.createZipArchiveEntryRequest;
@@ -50,12 +51,12 @@ public class ScatterZipOutputStreamTest {
final byte[] A_PAYLOAD = "XAAY".getBytes();
ZipArchiveEntry zab = new ZipArchiveEntry("b.txt");
- zab.setMethod(ZipArchiveEntry.DEFLATED);
+ zab.setMethod(ZipEntry.DEFLATED);
final ByteArrayInputStream payload = new ByteArrayInputStream(B_PAYLOAD);
scatterZipOutputStream.addArchiveEntry(createZipArchiveEntryRequest(zab, createPayloadSupplier(payload)));
ZipArchiveEntry zae = new ZipArchiveEntry("a.txt");
- zae.setMethod(ZipArchiveEntry.DEFLATED);
+ zae.setMethod(ZipEntry.DEFLATED);
ByteArrayInputStream payload1 = new ByteArrayInputStream(A_PAYLOAD);
scatterZipOutputStream.addArchiveEntry(createZipArchiveEntryRequest(zae, createPayloadSupplier(payload1)));