This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-compress.git
commit 65cad7c3e2687908907cbc4ff465bb6a8ee54a92 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Tue Jan 16 09:28:35 2024 -0500 Javadoc - Whitespace - Format --- .../org/apache/commons/compress/archivers/sevenz/BindPair.java | 1 + .../java/org/apache/commons/compress/archivers/sevenz/Folder.java | 8 ++++---- .../apache/commons/compress/archivers/sevenz/LZMA2Decoder.java | 2 +- .../org/apache/commons/compress/archivers/sevenz/LZMADecoder.java | 1 + .../commons/compress/archivers/sevenz/SevenZArchiveEntry.java | 2 -- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/BindPair.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/BindPair.java index dc400964f..77385416e 100644 --- a/src/main/java/org/apache/commons/compress/archivers/sevenz/BindPair.java +++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/BindPair.java @@ -17,6 +17,7 @@ package org.apache.commons.compress.archivers.sevenz; final class BindPair { + long inIndex; long outIndex; diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java index c32db3ddd..67220e5c2 100644 --- a/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java +++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java @@ -91,17 +91,17 @@ final class Folder { if (packedStreams == null || coders == null || packedStreams.length == 0 || coders.length == 0) { return Collections.emptyList(); } - final LinkedList<Coder> l = new LinkedList<>(); + final LinkedList<Coder> list = new LinkedList<>(); int current = (int) packedStreams[0]; // more that 2^31 coders? while (current >= 0 && current < coders.length) { - if (l.contains(coders[current])) { + if (list.contains(coders[current])) { throw new IOException("folder uses the same coder more than once in coder chain"); } - l.addLast(coders[current]); + list.addLast(coders[current]); final int pair = findBindPairForOutStream(current); current = pair != -1 ? (int) bindPairs[pair].inIndex : -1; } - return l; + return list; } long getUnpackSize() { diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.java index 36c89c0e3..5954f366d 100644 --- a/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.java +++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.java @@ -46,7 +46,7 @@ final class LZMA2Decoder extends AbstractCoder { } } - @SuppressWarnings("resource") // Caller closes result. + @SuppressWarnings("resource") // Caller closes. @Override OutputStream encode(final OutputStream out, final Object opts) throws IOException { return getOptions(opts).getOutputStream(new FinishableWrapperOutputStream(out)); diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMADecoder.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMADecoder.java index 23b6df6ce..de7eb8644 100644 --- a/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMADecoder.java +++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMADecoder.java @@ -28,6 +28,7 @@ import org.tukaani.xz.LZMAInputStream; import org.tukaani.xz.LZMAOutputStream; final class LZMADecoder extends AbstractCoder { + LZMADecoder() { super(LZMA2Options.class, Number.class); } diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java index f6a6633f7..9dce92875 100644 --- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java +++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java @@ -77,9 +77,7 @@ public class SevenZArchiveEntry implements ArchiveEntry { private int windowsAttributes; private boolean hasCrc; private long crc, compressedCrc; - private long size, compressedSize; - private Iterable<? extends SevenZMethodConfiguration> contentMethods; /**