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 2018/04/29 18:21:11 UTC
[1/2] commons-compress git commit: COMPRESS-118 and one more missing
generic
Repository: commons-compress
Updated Branches:
refs/heads/master 251936e2e -> d1f9ac3a0
COMPRESS-118 and one more missing generic
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/5694aaa8
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/5694aaa8
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/5694aaa8
Branch: refs/heads/master
Commit: 5694aaa8f624b9eb48bd12ae56575682bc85c57e
Parents: 251936e
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sun Apr 29 19:51:13 2018 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sun Apr 29 19:51:13 2018 +0200
----------------------------------------------------------------------
.../org/apache/commons/compress/archivers/examples/Archive.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/5694aaa8/src/main/java/org/apache/commons/compress/archivers/examples/Archive.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/examples/Archive.java b/src/main/java/org/apache/commons/compress/archivers/examples/Archive.java
index 3415c3b..2247fcc 100644
--- a/src/main/java/org/apache/commons/compress/archivers/examples/Archive.java
+++ b/src/main/java/org/apache/commons/compress/archivers/examples/Archive.java
@@ -104,7 +104,7 @@ public class Archive {
}
});
}
- public ChainBuilder map(Transformer transformer) {
+ public ChainBuilder map(Transformer<File> transformer) {
chainDef.add(transformer);
return this;
}
[2/2] commons-compress git commit: COMPRESS-118 simplify code
Posted by bo...@apache.org.
COMPRESS-118 simplify code
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/d1f9ac3a
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/d1f9ac3a
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/d1f9ac3a
Branch: refs/heads/master
Commit: d1f9ac3a0b322b11b5cfc656237fb3627c23a9ee
Parents: 5694aaa
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sun Apr 29 20:20:52 2018 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sun Apr 29 20:20:52 2018 +0200
----------------------------------------------------------------------
.../examples/DirectoryBasedSupplier.java | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/d1f9ac3a/src/main/java/org/apache/commons/compress/archivers/examples/DirectoryBasedSupplier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/examples/DirectoryBasedSupplier.java b/src/main/java/org/apache/commons/compress/archivers/examples/DirectoryBasedSupplier.java
index a6947b0..e224040 100644
--- a/src/main/java/org/apache/commons/compress/archivers/examples/DirectoryBasedSupplier.java
+++ b/src/main/java/org/apache/commons/compress/archivers/examples/DirectoryBasedSupplier.java
@@ -23,6 +23,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -57,22 +58,7 @@ public class DirectoryBasedSupplier
DirectoryIterator(String namePrefix, File dir) throws IOException {
this.namePrefix = namePrefix;
File[] fs = dir.listFiles();
- files = fs == null
- ? new Iterator<File>() {
- @Override
- public boolean hasNext() {
- return false;
- }
- @Override
- public File next() {
- throw new NoSuchElementException();
- }
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
- }
- : Arrays.asList(fs).iterator();
+ files = fs == null ? Collections.<File>emptyIterator() : Arrays.asList(fs).iterator();
}
@Override