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 2020/08/30 23:05:20 UTC
[commons-io] branch master updated: Use US English spelling.
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 35453bd Use US English spelling.
35453bd is described below
commit 35453bd6db39cebe898de32a75ea92896d323306
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 30 19:05:13 2020 -0400
Use US English spelling.
---
.../org/apache/commons/io/output/FileWriterWithEncoding.java | 2 +-
.../org/apache/commons/io/output/LockableFileWriter.java | 2 +-
src/test/java/org/apache/commons/io/input/TailerTest.java | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java b/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
index b4ee314..0e29be9 100644
--- a/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
+++ b/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
@@ -220,7 +220,7 @@ public class FileWriterWithEncoding extends Writer {
* @param file the file to be accessed
* @param encoding the encoding to use - may be Charset, CharsetEncoder or String
* @param append true to append
- * @return the initialised writer
+ * @return the initialized writer
* @throws NullPointerException if the file or encoding is null
* @throws IOException if an error occurs
*/
diff --git a/src/main/java/org/apache/commons/io/output/LockableFileWriter.java b/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
index 0d46fd3..19deb55 100644
--- a/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
+++ b/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
@@ -259,7 +259,7 @@ public class LockableFileWriter extends Writer {
* @param file the file to be accessed
* @param charset the charset to use
* @param append true to append
- * @return The initialised writer
+ * @return The initialized writer
* @throws IOException if an error occurs
*/
private Writer initWriter(final File file, final Charset charset, final boolean append) throws IOException {
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 0069799..f334ce0 100644
--- a/src/test/java/org/apache/commons/io/input/TailerTest.java
+++ b/src/test/java/org/apache/commons/io/input/TailerTest.java
@@ -255,7 +255,7 @@ public class TailerTest {
assertEquals(0, listener.getLines().size(), "4 line count");
assertNotNull(listener.exception, "Missing InterruptedException");
assertTrue(listener.exception instanceof InterruptedException, "Unexpected Exception: " + listener.exception);
- assertEquals(1 , listener.initialised, "Expected init to be called");
+ 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");
}
@@ -355,7 +355,7 @@ public class TailerTest {
tailer.stop();
TestUtils.sleep(delay+idle);
assertNull(listener.exception, "Should not generate Exception");
- assertEquals(1 , listener.initialised, "Expected init to be called");
+ assertEquals(1 , listener.initialized, "Expected init to be called");
assertTrue(listener.notFound > 0, "fileNotFound should be called");
assertEquals(0 , listener.rotated, "fileRotated should be not be called");
assertEquals(0, listener.reachedEndOfFile, "end of file never reached");
@@ -381,7 +381,7 @@ public class TailerTest {
TestUtils.sleep(delay + idle);
assertNotNull(listener.exception, "Missing InterruptedException");
assertTrue(listener.exception instanceof InterruptedException, "Unexpected Exception: " + listener.exception);
- assertEquals(1, listener.initialised, "Expected init to be called");
+ assertEquals(1, listener.initialized, "Expected init to be called");
assertTrue(listener.notFound > 0, "fileNotFound should be called");
assertEquals(0, listener.rotated, "fileRotated should be not be called");
assertEquals(0, listener.reachedEndOfFile, "end of file never reached");
@@ -401,7 +401,7 @@ public class TailerTest {
tailer.stop();
TestUtils.sleep(delay+idle);
assertNull(listener.exception, "Should not generate Exception");
- assertEquals(1 , listener.initialised, "Expected init to be called");
+ assertEquals(1 , listener.initialized, "Expected init to be called");
assertTrue(listener.notFound > 0, "fileNotFound should be called");
assertEquals(0 , listener.rotated, "fileRotated should be not be called");
assertEquals(0, listener.reachedEndOfFile, "end of file never reached");
@@ -444,7 +444,7 @@ public class TailerTest {
volatile int rotated = 0;
- volatile int initialised = 0;
+ volatile int initialized = 0;
volatile int reachedEndOfFile = 0;
@@ -468,7 +468,7 @@ public class TailerTest {
@Override
public void init(final Tailer tailer) {
- initialised++; // not atomic, but OK because only updated here.
+ initialized++; // not atomic, but OK because only updated here.
}
@Override