channel is ambiguos here
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/0a6d97a1 Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/0a6d97a1 Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/0a6d97a1 Branch: refs/heads/compress-2.0 Commit: 0a6d97a1200eb415959131c76236e0e0cf8c66eb Parents: 822bc57 Author: Stefan Bodewig <bode...@apache.org> Authored: Sat Apr 29 18:03:04 2017 +0200 Committer: Stefan Bodewig <bode...@apache.org> Committed: Sat Apr 29 18:03:04 2017 +0200 ---------------------------------------------------------------------- .../org/apache/commons/compress2/archivers/ArchiveInput.java | 6 +++--- .../apache/commons/compress2/archivers/ArchiveOutput.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-compress/blob/0a6d97a1/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 6a6b98a..7e3d528 100644 --- a/src/main/java/org/apache/commons/compress2/archivers/ArchiveInput.java +++ b/src/main/java/org/apache/commons/compress2/archivers/ArchiveInput.java @@ -29,7 +29,7 @@ public interface ArchiveInput<A extends ArchiveEntry> extends AutoCloseable { /** * Obtains the next entry. - * @return the next entry or null if the end of the channel has been reached. + * @return the next entry or null if the end of the input has been reached. */ A next() throws IOException; @@ -40,7 +40,7 @@ public interface ArchiveInput<A extends ArchiveEntry> extends AutoCloseable { ReadableByteChannel getChannel(); /** - * Whether this channel is able to read the contents of the current entry. + * Whether this input is able to read the contents of the current entry. * * <p>Some archive formats support variants or details that are not supported (yet).</p> * @@ -49,7 +49,7 @@ public interface ArchiveInput<A extends ArchiveEntry> extends AutoCloseable { boolean canReadEntryData(); /** - * Returns the current number of bytes read from this channel. + * Returns the current number of bytes read from this input. * @return the number of read bytes */ long getBytesRead(); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/0a6d97a1/src/main/java/org/apache/commons/compress2/archivers/ArchiveOutput.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress2/archivers/ArchiveOutput.java b/src/main/java/org/apache/commons/compress2/archivers/ArchiveOutput.java index 1f6e93e..a0f389e 100644 --- a/src/main/java/org/apache/commons/compress2/archivers/ArchiveOutput.java +++ b/src/main/java/org/apache/commons/compress2/archivers/ArchiveOutput.java @@ -35,7 +35,7 @@ public interface ArchiveOutput<A extends ArchiveEntry> extends AutoCloseable { A createEntry(ArchiveEntryParameters params); /** - * Whether this channel is able to write the contents of the given entry. + * Whether this output is able to write the contents of the given entry. * * <p>Some archive formats support variants or details that are not supported (yet).</p> * @@ -46,7 +46,7 @@ public interface ArchiveOutput<A extends ArchiveEntry> extends AutoCloseable { boolean canWriteEntryData(A archiveEntry); /** - * Initializes the channel for writing a new {@link ArchiveEntry}. + * Initializes the output for writing a new {@link ArchiveEntry}. * * <p>The caller must then write the content to the channel and call {@link #closeEntry()} to complete the * process.</p> @@ -64,7 +64,7 @@ public interface ArchiveOutput<A extends ArchiveEntry> extends AutoCloseable { void closeEntry() throws IOException; /** - * Finishes the addition of entries to this stream, without closing it. + * Finishes the addition of entries to this output, without closing it. * * <p>Additional data can be written, if the format supports it.<p> * @@ -73,7 +73,7 @@ public interface ArchiveOutput<A extends ArchiveEntry> extends AutoCloseable { void finish() throws IOException; /** - * Returns the current number of bytes written to this channel. + * Returns the current number of bytes written to this output. * @return the number of written bytes */ long getBytesWritten();