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
The following commit(s) were added to refs/heads/master by this push:
new 9849d9f17 Use preferred spelling for "cannot"
9849d9f17 is described below
commit 9849d9f171413b7e2a61c2a2653825830ca8fbc3
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Nov 5 06:05:56 2024 -0500
Use preferred spelling for "cannot"
---
.../java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java | 2 +-
.../org/apache/commons/compress/archivers/tar/TarArchiveEntry.java | 2 +-
.../commons/compress/archivers/zip/ParallelScatterZipCreator.java | 2 +-
.../org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java | 4 ++--
.../apache/commons/compress/archivers/zip/ZipArchiveInputStream.java | 2 +-
.../apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java | 2 +-
.../apache/commons/compress/archivers/zip/ZipSplitOutputStream.java | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
index af3b6dde9..fcd74b5ed 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
@@ -959,7 +959,7 @@ public class SevenZFile implements Closeable {
/**
* Gets a copy of meta-data of all archive entries.
* <p>
- * This method only provides meta-data, the entries can not be used to
read the contents, you still need to process all entries in order using
+ * This method only provides meta-data, the entries cannot be used to read
the contents, you still need to process all entries in order using
* {@link #getNextEntry} for that.
* </p>
* <p>
diff --git
a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
index e02eeb3a2..a06bc26ce 100644
---
a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
+++
b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
@@ -1720,7 +1720,7 @@ public class TarArchiveEntry implements ArchiveEntry,
TarConstants, EntryStreamO
*/
public void setDataOffset(final long dataOffset) {
if (dataOffset < 0) {
- throw new IllegalArgumentException("The offset can not be smaller
than 0");
+ throw new IllegalArgumentException("The offset cannot be smaller
than 0");
}
this.dataOffset = dataOffset;
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
index da7d71444..b327a008a 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
@@ -264,7 +264,7 @@ public class ParallelScatterZipCreator {
* </p>
* <p>
* Calling this method will shut down the {@link ExecutorService} used by
this class. If any of the {@link Callable}s {@link #submitStreamAwareCallable
- * submit}ted to this instance throws an exception, the archive can not be
created properly and this method will throw an exception.
+ * submit}ted to this instance throws an exception, the archive cannot be
created properly and this method will throw an exception.
* </p>
*
* @param targetStream The {@link ZipArchiveOutputStream} to receive the
contents of the scatter streams
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
index 1ae2e3fc6..1c8e1cab5 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
@@ -719,7 +719,7 @@ public class ZipArchiveEntry extends ZipEntry implements
ArchiveEntry, EntryStre
*
* @param parsingBehavior controls parsing of extra fields.
* @return an array of the extra fields
- * @throws ZipException if parsing fails, can not happen if {@code
+ * @throws ZipException if parsing fails, cannot happen if {@code
* parsingBehavior} is {@link ExtraFieldParsingMode#BEST_EFFORT}.
* @since 1.19
*/
@@ -1365,7 +1365,7 @@ public class ZipArchiveEntry extends ZipEntry implements
ArchiveEntry, EntryStre
@Override
public void setMethod(final int method) {
if (method < 0) {
- throw new IllegalArgumentException("ZIP compression method can not
be negative: " + method);
+ throw new IllegalArgumentException("ZIP compression method cannot
be negative: " + method);
}
this.method = method;
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
index ebf3b9eb2..2b9a67042 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
@@ -196,7 +196,7 @@ public class ZipArchiveInputStream extends
ArchiveInputStream<ZipArchiveEntry> i
private static final long TWO_EXP_32 = ZIP64_MAGIC + 1;
private static final String USE_ZIPFILE_INSTEAD_OF_STREAM_DISCLAIMER = "
while reading a stored entry using data descriptor. Either the archive is
broken"
- + " or it can not be read using ZipArchiveInputStream and you must
use ZipFile."
+ + " or it cannot be read using ZipArchiveInputStream and you must
use ZipFile."
+ " A common cause for this is a ZIP archive containing a ZIP
archive."
+ " See
https://commons.apache.org/proper/commons-compress/zip.html#ZipArchiveInputStream_vs_ZipFile";;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
index f617c2b7e..b35085522 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
@@ -54,7 +54,7 @@ import org.apache.commons.compress.utils.Charsets;
* </p>
* <p>
* As of Apache Commons Compress 1.3, the class transparently supports Zip64
extensions and thus individual entries and archives larger than 4 GB or with
more
- * than 65,536 entries in most cases but explicit control is provided via
{@link #setUseZip64}. If the stream can not use SeekableByteChannel and you try
to
+ * than 65,536 entries in most cases but explicit control is provided via
{@link #setUseZip64}. If the stream cannot use SeekableByteChannel and you try
to
* write a ZipArchiveEntry of unknown size, then Zip64 extensions will be
disabled by default.
* </p>
*
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java
index 17b75ddea..c162e0650 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java
@@ -213,7 +213,7 @@ final class ZipSplitOutputStream extends
RandomAccessOutputStream {
}
/**
- * Some data can not be written to different split segments, for example:
+ * Some data cannot be written to different split segments, for example:
* <p>
* 4.4.1.5 The end of central directory record and the Zip64 end of
central directory locator record MUST reside on the same disk when splitting or
spanning
* an archive.
