You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/08/26 11:48:29 UTC
[commons-io] branch master updated: Fix typos (#375)
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-io.git
The following commit(s) were added to refs/heads/master by this push:
new 4fa1b226 Fix typos (#375)
4fa1b226 is described below
commit 4fa1b22680b852e0dde4f3842670b78c5c438d39
Author: Michael Ernst <me...@cs.washington.edu>
AuthorDate: Fri Aug 26 01:48:24 2022 -1000
Fix typos (#375)
* Fix typos
* Reintroduce auto-generated typos
---
RELEASE-NOTES.txt | 4 ++--
src/changes/release-notes.vm | 8 ++++----
src/main/java/org/apache/commons/io/file/PathUtils.java | 2 +-
.../java/org/apache/commons/io/input/MarkShieldInputStream.java | 2 +-
src/site/xdoc/upgradeto1_4.xml | 2 +-
src/site/xdoc/upgradeto2_0.xml | 2 +-
src/test/java/org/apache/commons/io/input/TailerTest.java | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index dc2ee6b2..76be6601 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -802,7 +802,7 @@ Enhancements from 1.4
- Annotate with @Override and @Deprecated
* [IO-178] New BOMInputStream and ByteOrderMark implementations - to detect and optionally exclude an initial Byte Order mark (BOM)
- * [IO-197] New BoundedInputStream (copied from from Apache JackRabbit)
+ * [IO-197] New BoundedInputStream (copied from Apache JackRabbit)
* [IO-193] New Broken Input and Output streams
* [IO-132] New File Listener/Monitor facility
* [IO-158] New ReaderInputStream and WriterOutputStream implementations
@@ -894,7 +894,7 @@ Semantic compatible - Yes
Commons IO 1.4 introduces four new implementations which depend on Java 4 features
(CharSequenceReader, FileWriterWithEncoding, IOExceptionWithCause and RegexFileFilter).
It has been built with the JDK source and target options set to Java 1.3 and, except for
-those implementations, can be used with Java 1.3 (see IO IO-127).
+those implementations, can be used with Java 1.3 (see IO-127).
Deprecations from 1.3.2
-----------------------
diff --git a/src/changes/release-notes.vm b/src/changes/release-notes.vm
index 05218e59..657b259b 100644
--- a/src/changes/release-notes.vm
+++ b/src/changes/release-notes.vm
@@ -256,7 +256,7 @@ Commons IO 1.4 requires Java 1.3.
Historical list of changes: https://commons.apache.org/proper/commons-io/changes-report.html
For complete information on Apache Commons IO, including instructions on how to submit bug reports,
-patches, or suggestions for improvement, see the Apache Apache Commons IO website:
+patches, or suggestions for improvement, see the Apache Commons IO website:
https://commons.apache.org/proper/commons-io/
@@ -371,7 +371,7 @@ Commons IO 1.4 requires Java 1.3.
Historical list of changes: https://commons.apache.org/proper/commons-io/changes-report.html
For complete information on Apache Commons IO, including instructions on how to submit bug reports,
-patches, or suggestions for improvement, see the Apache Apache Commons IO website:
+patches, or suggestions for improvement, see the Apache Commons IO website:
https://commons.apache.org/proper/commons-io/
@@ -832,7 +832,7 @@ Enhancements from 1.4
- Annotate with @Override and @Deprecated
* [IO-178] New BOMInputStream and ByteOrderMark implementations - to detect and optionally exclude an initial Byte Order mark (BOM)
- * [IO-197] New BoundedInputStream (copied from from Apache JackRabbit)
+ * [IO-197] New BoundedInputStream (copied from Apache JackRabbit)
* [IO-193] New Broken Input and Output streams
* [IO-132] New File Listener/Monitor facility
* [IO-158] New ReaderInputStream and WriterOutputStream implementations
@@ -924,7 +924,7 @@ Semantic compatible - Yes
Commons IO 1.4 introduces four new implementations which depend on Java 4 features
(CharSequenceReader, FileWriterWithEncoding, IOExceptionWithCause and RegexFileFilter).
It has been built with the JDK source and target options set to Java 1.3 and, except for
-those implementations, can be used with Java 1.3 (see IO IO-127).
+those implementations, can be used with Java 1.3 (see IO-127).
Deprecations from 1.3.2
-----------------------
diff --git a/src/main/java/org/apache/commons/io/file/PathUtils.java b/src/main/java/org/apache/commons/io/file/PathUtils.java
index e5ca2ebe..6ad6be47 100644
--- a/src/main/java/org/apache/commons/io/file/PathUtils.java
+++ b/src/main/java/org/apache/commons/io/file/PathUtils.java
@@ -877,7 +877,7 @@ public final class PathUtils {
* @param url the file to query.
* @return the file's last modified time.
* @throws IOException Thrown if an I/O error occurs.
- * @throws URISyntaxException if the URL is not formatted strictly according to to RFC2396 and cannot be converted to a
+ * @throws URISyntaxException if the URL is not formatted strictly according to RFC2396 and cannot be converted to a
* URI.
* @since 2.12.0
*/
diff --git a/src/main/java/org/apache/commons/io/input/MarkShieldInputStream.java b/src/main/java/org/apache/commons/io/input/MarkShieldInputStream.java
index b8725bd6..083525b7 100644
--- a/src/main/java/org/apache/commons/io/input/MarkShieldInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/MarkShieldInputStream.java
@@ -28,7 +28,7 @@ import java.io.InputStream;
* <p>
* This class is typically used in cases where an input stream that supports
* marking needs to be passed to a component that wants to explicitly mark
- * the stream, but it it is not desirable to allow marking of the stream.
+ * the stream, but it is not desirable to allow marking of the stream.
* </p>
*
* @since 2.8.0
diff --git a/src/site/xdoc/upgradeto1_4.xml b/src/site/xdoc/upgradeto1_4.xml
index ccc61104..de0576f8 100644
--- a/src/site/xdoc/upgradeto1_4.xml
+++ b/src/site/xdoc/upgradeto1_4.xml
@@ -47,7 +47,7 @@ Semantic compatible - Yes
Commons IO 1.4 introduces four new implementations which depend on JDK 1.4 features
(CharSequenceReader, FileWriterWithEncoding, IOExceptionWithCause and RegexFileFilter).
It has been built with the JDK source and target options set to JDK 1.3 and, except for
-those implementations, can be used with JDK 1.3 (see IO IO-127).
+those implementations, can be used with JDK 1.3 (see IO-127).
Deprecations from 1.3.2
diff --git a/src/site/xdoc/upgradeto2_0.xml b/src/site/xdoc/upgradeto2_0.xml
index 7f21cc09..78769bf5 100644
--- a/src/site/xdoc/upgradeto2_0.xml
+++ b/src/site/xdoc/upgradeto2_0.xml
@@ -72,7 +72,7 @@ Enhancements from 1.4
- Annotate with @Override and @Deprecated
* [IO-178] New BOMInputStream and ByteOrderMark implementations - to detect and optionally exclude an initial Byte Order mark (BOM)
- * [IO-197] New BoundedInputStream (copied from from Apache JackRabbit)
+ * [IO-197] New BoundedInputStream (copied from Apache JackRabbit)
* [IO-193] New Broken Input and Output streams
* [IO-132] New File Listener/Monitor facility
* [IO-158] New ReaderInputStream and WriterOutputStream implementations
diff --git a/src/test/java/org/apache/commons/io/input/TailerTest.java b/src/test/java/org/apache/commons/io/input/TailerTest.java
index 6b03d278..c7d34fa4 100644
--- a/src/test/java/org/apache/commons/io/input/TailerTest.java
+++ b/src/test/java/org/apache/commons/io/input/TailerTest.java
@@ -632,7 +632,7 @@ public class TailerTest {
assertEquals(1, listener.initialized, "Expected init to be called");
// assertEquals(0 , listener.notFound, "fileNotFound should not be called"); // there is a window when it might be
// called
- assertEquals(1, listener.rotated, "fileRotated should be be called");
+ assertEquals(1, listener.rotated, "fileRotated should be called");
}
}