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 388974f Javadoc standardize "behaviour" -> "behavior".
388974f is described below
commit 388974fc856fc5b87d179f3302d3ee43c0974bf6
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Tue Nov 5 11:07:08 2019 -0500
Javadoc standardize "behaviour" -> "behavior".
---
src/main/java/org/apache/commons/io/CopyUtils.java | 2 +-
src/main/java/org/apache/commons/io/DirectoryWalker.java | 4 ++--
src/main/java/org/apache/commons/io/FileUtils.java | 2 +-
src/main/java/org/apache/commons/io/input/ProxyInputStream.java | 2 +-
src/main/java/org/apache/commons/io/input/ProxyReader.java | 2 +-
.../java/org/apache/commons/io/input/ReversedLinesFileReader.java | 2 +-
src/main/java/org/apache/commons/io/output/ProxyCollectionWriter.java | 2 +-
src/main/java/org/apache/commons/io/output/ProxyOutputStream.java | 2 +-
src/main/java/org/apache/commons/io/output/ProxyWriter.java | 2 +-
.../apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java | 2 +-
src/test/java/org/apache/commons/io/input/TailerTest.java | 4 ++--
src/test/java/org/apache/commons/io/testtools/YellOnCloseWriter.java | 2 +-
.../apache/commons/io/testtools/YellOnFlushAndCloseOutputStream.java | 2 +-
13 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/CopyUtils.java
b/src/main/java/org/apache/commons/io/CopyUtils.java
index 9b70bfb..3971e42 100644
--- a/src/main/java/org/apache/commons/io/CopyUtils.java
+++ b/src/main/java/org/apache/commons/io/CopyUtils.java
@@ -105,7 +105,7 @@ import java.nio.charset.Charset;
*
* @deprecated Use IOUtils. Will be removed in 2.0.
* Methods renamed to IOUtils.write() or IOUtils.copy().
- * Null handling behaviour changed in IOUtils (null data does not
+ * Null handling behavior changed in IOUtils (null data does not
* throw NullPointerException).
*/
@Deprecated
diff --git a/src/main/java/org/apache/commons/io/DirectoryWalker.java
b/src/main/java/org/apache/commons/io/DirectoryWalker.java
index faf2a1e..d60d2cf 100644
--- a/src/main/java/org/apache/commons/io/DirectoryWalker.java
+++ b/src/main/java/org/apache/commons/io/DirectoryWalker.java
@@ -27,7 +27,7 @@ import org.apache.commons.io.filefilter.TrueFileFilter;
/**
* Abstract class that walks through a directory hierarchy and provides
- * subclasses with convenient hooks to add specific behaviour.
+ * subclasses with convenient hooks to add specific behavior.
* <p>
* This class operates with a {@link FileFilter} and maximum depth to
* limit the files and directories visited.
@@ -43,7 +43,7 @@ import org.apache.commons.io.filefilter.TrueFileFilter;
* <li><a href="#filter">2. Filter Example</a> - using
* {@link FileFilter}(s) with <code>DirectoryWalker</code>.</li>
* <li><a href="#cancel">3. Cancellation</a> - how to implement
cancellation
- * behaviour.</li>
+ * behavior.</li>
* </ul>
*
* <h2 id="example">1. Example Implementation</h2>
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java
b/src/main/java/org/apache/commons/io/FileUtils.java
index dbbbcad..da87cf8 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -2586,7 +2586,7 @@ public class FileUtils {
//-----------------------------------------------------------------------
/**
- * Implements the same behaviour as the "touch" utility on Unix. It creates
+ * Implements the same behavior as the "touch" utility on Unix. It creates
* a new file with size 0 or, if the file exists already, it is opened and
* closed without modifying it, but updating the file date and time.
* <p>
diff --git a/src/main/java/org/apache/commons/io/input/ProxyInputStream.java
b/src/main/java/org/apache/commons/io/input/ProxyInputStream.java
index 0616d13..2ad32eb 100644
--- a/src/main/java/org/apache/commons/io/input/ProxyInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/ProxyInputStream.java
@@ -229,7 +229,7 @@ public abstract class ProxyInputStream extends
FilterInputStream {
* Handle any IOExceptions thrown.
* <p>
* This method provides a point to implement custom exception
- * handling. The default behaviour is to re-throw the exception.
+ * handling. The default behavior is to re-throw the exception.
* @param e The IOException thrown
* @throws IOException if an I/O error occurs
* @since 2.0
diff --git a/src/main/java/org/apache/commons/io/input/ProxyReader.java
b/src/main/java/org/apache/commons/io/input/ProxyReader.java
index 5c27159..bb0ef90 100644
--- a/src/main/java/org/apache/commons/io/input/ProxyReader.java
+++ b/src/main/java/org/apache/commons/io/input/ProxyReader.java
@@ -252,7 +252,7 @@ public abstract class ProxyReader extends FilterReader {
* Handle any IOExceptions thrown.
* <p>
* This method provides a point to implement custom exception
- * handling. The default behaviour is to re-throw the exception.
+ * handling. The default behavior is to re-throw the exception.
* @param e The IOException thrown
* @throws IOException if an I/O error occurs
* @since 2.0
diff --git
a/src/main/java/org/apache/commons/io/input/ReversedLinesFileReader.java
b/src/main/java/org/apache/commons/io/input/ReversedLinesFileReader.java
index f8306a4..e126bfc 100644
--- a/src/main/java/org/apache/commons/io/input/ReversedLinesFileReader.java
+++ b/src/main/java/org/apache/commons/io/input/ReversedLinesFileReader.java
@@ -241,7 +241,7 @@ public class ReversedLinesFileReader implements Closeable {
}
}
- // aligned behaviour with BufferedReader that doesn't return a last,
empty line
+ // aligned behavior with BufferedReader that doesn't return a last,
empty line
if(EMPTY_STRING.equals(line) && !trailingNewlineOfFileSkipped) {
trailingNewlineOfFileSkipped = true;
line = readLine();
diff --git
a/src/main/java/org/apache/commons/io/output/ProxyCollectionWriter.java
b/src/main/java/org/apache/commons/io/output/ProxyCollectionWriter.java
index b5fdcfb..9e61ff8 100644
--- a/src/main/java/org/apache/commons/io/output/ProxyCollectionWriter.java
+++ b/src/main/java/org/apache/commons/io/output/ProxyCollectionWriter.java
@@ -175,7 +175,7 @@ public class ProxyCollectionWriter extends
FilterCollectionWriter {
/**
* Handle any IOExceptions thrown.
* <p>
- * This method provides a point to implement custom exception handling.
The default behaviour is to re-throw the
+ * This method provides a point to implement custom exception handling.
The default behavior is to re-throw the
* exception.
* </p>
*
diff --git a/src/main/java/org/apache/commons/io/output/ProxyOutputStream.java
b/src/main/java/org/apache/commons/io/output/ProxyOutputStream.java
index 34d7044..94c2fdd 100644
--- a/src/main/java/org/apache/commons/io/output/ProxyOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/ProxyOutputStream.java
@@ -160,7 +160,7 @@ public class ProxyOutputStream extends FilterOutputStream {
* Handle any IOExceptions thrown.
* <p>
* This method provides a point to implement custom exception
- * handling. The default behaviour is to re-throw the exception.
+ * handling. The default behavior is to re-throw the exception.
* @param e The IOException thrown
* @throws IOException if an I/O error occurs
* @since 2.0
diff --git a/src/main/java/org/apache/commons/io/output/ProxyWriter.java
b/src/main/java/org/apache/commons/io/output/ProxyWriter.java
index b71e670..5d62ba8 100644
--- a/src/main/java/org/apache/commons/io/output/ProxyWriter.java
+++ b/src/main/java/org/apache/commons/io/output/ProxyWriter.java
@@ -253,7 +253,7 @@ public class ProxyWriter extends FilterWriter {
* Handle any IOExceptions thrown.
* <p>
* This method provides a point to implement custom exception
- * handling. The default behaviour is to re-throw the exception.
+ * handling. The default behavior is to re-throw the exception.
* </p>
*
* @param e The IOException thrown
diff --git
a/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java
b/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java
index 3aa017d..2258afc 100644
---
a/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java
+++
b/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
/**
- * Test checks symmetric behaviour with BufferedReader
+ * Test checks symmetric behavior with BufferedReader
*/
public class ReversedLinesFileReaderTestParamFile {
public static Stream<Arguments> testDataIntegrityWithBufferedReader() {
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 8185781..2232125 100644
--- a/src/test/java/org/apache/commons/io/input/TailerTest.java
+++ b/src/test/java/org/apache/commons/io/input/TailerTest.java
@@ -283,7 +283,7 @@ public class TailerTest {
write(file, "line7", "line8", "line9");
TestUtils.sleep(testDelayMillis);
- // May be > 3 times due to underlying OS behaviour wrt streams
+ // May be > 3 times due to underlying OS behavior wrt streams
assertTrue(listener.reachedEndOfFile >= 3, "end of file reached at
least 3 times");
}
@@ -401,7 +401,7 @@ public class TailerTest {
}
@Test
- public void testIO335() throws Exception { // test CR behaviour
+ public void testIO335() throws Exception { // test CR behavior
// Create & start the Tailer
final long delayMillis = 50;
final File file = new File(temporaryFolder, "tailer-testio334.txt");
diff --git
a/src/test/java/org/apache/commons/io/testtools/YellOnCloseWriter.java
b/src/test/java/org/apache/commons/io/testtools/YellOnCloseWriter.java
index 8ce4b71..20824e5 100644
--- a/src/test/java/org/apache/commons/io/testtools/YellOnCloseWriter.java
+++ b/src/test/java/org/apache/commons/io/testtools/YellOnCloseWriter.java
@@ -23,7 +23,7 @@ import org.apache.commons.io.output.NullWriter;
import org.apache.commons.io.output.ProxyWriter;
/**
- * Helper class for checking behaviour of IO classes.
+ * Helper class for checking behavior of IO classes.
*/
public class YellOnCloseWriter extends ProxyWriter {
diff --git
a/src/test/java/org/apache/commons/io/testtools/YellOnFlushAndCloseOutputStream.java
b/src/test/java/org/apache/commons/io/testtools/YellOnFlushAndCloseOutputStream.java
index 0245c66..705c098 100644
---
a/src/test/java/org/apache/commons/io/testtools/YellOnFlushAndCloseOutputStream.java
+++
b/src/test/java/org/apache/commons/io/testtools/YellOnFlushAndCloseOutputStream.java
@@ -24,7 +24,7 @@ import java.io.OutputStream;
import org.apache.commons.io.output.ProxyOutputStream;
/**
- * Helper class for checking behaviour of IO classes.
+ * Helper class for checking behavior of IO classes.
*/
public class YellOnFlushAndCloseOutputStream extends ProxyOutputStream {
