Repository: commons-compress Updated Branches: refs/heads/compress-2.0 613f4dc47 -> 77d9195c1
canReadEntryData(A entry) looks out of place in ArchiveInput Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/77d9195c Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/77d9195c Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/77d9195c Branch: refs/heads/compress-2.0 Commit: 77d9195c1d4c61e7e30d83c0cba155a22c8367f0 Parents: 613f4dc Author: Stefan Bodewig <bode...@apache.org> Authored: Sun Mar 27 16:49:14 2016 +0200 Committer: Stefan Bodewig <bode...@apache.org> Committed: Sun Mar 27 16:49:33 2016 +0200 ---------------------------------------------------------------------- .../apache/commons/compress2/archivers/ArchiveInput.java | 10 ++++------ .../compress2/archivers/RandomAccessArchiveInput.java | 11 +++++++++++ .../compress2/archivers/spi/AbstractArchiveInput.java | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-compress/blob/77d9195c/src/main/java/org/apache/commons/compress2/archivers/ArchiveInput.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress2/archivers/ArchiveInput.java b/src/main/java/org/apache/commons/compress2/archivers/ArchiveInput.java index 1fbb85b..6a6b98a 100644 --- a/src/main/java/org/apache/commons/compress2/archivers/ArchiveInput.java +++ b/src/main/java/org/apache/commons/compress2/archivers/ArchiveInput.java @@ -37,23 +37,21 @@ public interface ArchiveInput<A extends ArchiveEntry> extends AutoCloseable { * Obtains a channel the contents of the current entry can be read from. * @return a channel to read the entry's contents from */ - // TODO use some sort of Tuple or Map.Entry<A, ReadableByteChannel> and combine with next() ? ReadableByteChannel getChannel(); /** - * Whether this channel is able to read the contents of the given entry. + * Whether this channel is able to read the contents of the current entry. * * <p>Some archive formats support variants or details that are not supported (yet).</p> * - * @param entry - * the entry to test - * @return whether the entry's content can be read + * @return whether the current entry's content can be read */ - boolean canReadEntryData(A entry); + boolean canReadEntryData(); /** * Returns the current number of bytes read from this channel. * @return the number of read bytes */ long getBytesRead(); + } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/77d9195c/src/main/java/org/apache/commons/compress2/archivers/RandomAccessArchiveInput.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress2/archivers/RandomAccessArchiveInput.java b/src/main/java/org/apache/commons/compress2/archivers/RandomAccessArchiveInput.java index a970e93..39a8746 100644 --- a/src/main/java/org/apache/commons/compress2/archivers/RandomAccessArchiveInput.java +++ b/src/main/java/org/apache/commons/compress2/archivers/RandomAccessArchiveInput.java @@ -39,4 +39,15 @@ public interface RandomAccessArchiveInput<A extends ArchiveEntry> extends Archiv * @return a channel to read the entry's contents from or null if the entry is not part of this archive. */ ReadableByteChannel getChannel(A entry); + + /** + * Whether this channel is able to read the contents of the given entry. + * + * <p>Some archive formats support variants or details that are not supported (yet).</p> + * + * @param entry + * the entry to test + * @return whether the entry's content can be read + */ + boolean canReadEntryData(A entry); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/77d9195c/src/main/java/org/apache/commons/compress2/archivers/spi/AbstractArchiveInput.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress2/archivers/spi/AbstractArchiveInput.java b/src/main/java/org/apache/commons/compress2/archivers/spi/AbstractArchiveInput.java index 7feeae8..37ceb98 100644 --- a/src/main/java/org/apache/commons/compress2/archivers/spi/AbstractArchiveInput.java +++ b/src/main/java/org/apache/commons/compress2/archivers/spi/AbstractArchiveInput.java @@ -40,7 +40,7 @@ public abstract class AbstractArchiveInput<A extends ArchiveEntry> implements Ar * <p>This implementation always returns true.</p> */ @Override - public boolean canReadEntryData(A archiveEntry) { + public boolean canReadEntryData() { return true; }
