This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-net.git
commit 72d9068857fab020ee0a8e8054f3503ebbe51a96
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Feb 8 14:07:18 2021 -0500
Normalize to US English spelling.
---
src/main/java/org/apache/commons/net/SocketClient.java | 4 ++--
src/main/java/org/apache/commons/net/ftp/FTPClient.java | 9 ++++++++-
src/main/java/org/apache/commons/net/io/CopyStreamException.java | 2 +-
src/main/java/org/apache/commons/net/util/SSLContextUtils.java | 4 ++--
.../java/org/apache/commons/net/ftp/parser/MLSDComparison.java | 4 ++--
5 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/SocketClient.java
b/src/main/java/org/apache/commons/net/SocketClient.java
index 0d5ed10..33068db 100644
--- a/src/main/java/org/apache/commons/net/SocketClient.java
+++ b/src/main/java/org/apache/commons/net/SocketClient.java
@@ -508,7 +508,7 @@ public abstract class SocketClient
/**
* Get the current sendBuffer size
- * @return the size, or -1 if not initialised
+ * @return the size, or -1 if not initialized
* @since 3.0
*/
protected int getSendBufferSize(){
@@ -528,7 +528,7 @@ public abstract class SocketClient
/**
* Get the current receivedBuffer size
- * @return the size, or -1 if not initialised
+ * @return the size, or -1 if not initialized
* @since 3.0
*/
protected int getReceiveBufferSize(){
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
index 504c0d9..fc8f8ae 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.commons.net.ftp;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
@@ -415,6 +416,7 @@ public class FTPClient extends FTP implements Configurable {
}
}
+
/**
* The system property ({@value}) which can be used to override the system
type.<br>
* If defined, the value will be used to create any automatically created
parsers.
@@ -422,6 +424,7 @@ public class FTPClient extends FTP implements Configurable {
* @since 3.0
*/
public static final String FTP_SYSTEM_TYPE =
"org.apache.commons.net.ftp.systemType";
+
/**
* The system property ({@value}) which can be used as the default system
type.<br>
* If defined, the value will be used if the SYST command fails.
@@ -429,6 +432,7 @@ public class FTPClient extends FTP implements Configurable {
* @since 3.1
*/
public static final String FTP_SYSTEM_TYPE_DEFAULT =
"org.apache.commons.net.ftp.systemType.default";
+
/**
* The name of an optional systemType properties file ({@value}), which is
loaded
* using {@link Class#getResourceAsStream(String)}.<br>
@@ -453,6 +457,7 @@ public class FTPClient extends FTP implements Configurable {
* is created.
*/
public static final int ACTIVE_LOCAL_DATA_CONNECTION_MODE = 0;
+
/**
* A constant indicating the FTP session is expecting all transfers
* to occur between two remote servers and that the server
@@ -460,6 +465,7 @@ public class FTPClient extends FTP implements Configurable {
* data port to initiate a data transfer.
*/
public static final int ACTIVE_REMOTE_DATA_CONNECTION_MODE = 1;
+
/**
* A constant indicating the FTP session is expecting all transfers
* to occur between the client (local) and server and that the server
@@ -467,6 +473,7 @@ public class FTPClient extends FTP implements Configurable {
* server's data port to initiate a transfer.
*/
public static final int PASSIVE_LOCAL_DATA_CONNECTION_MODE = 2;
+
/**
* A constant indicating the FTP session is expecting all transfers
* to occur between two remote servers and that the server
@@ -611,7 +618,7 @@ public class FTPClient extends FTP implements Configurable {
/** Controls the automatic server encoding detection (only UTF-8
supported). */
private boolean autodetectEncoding = false;
- /** Map of FEAT responses. If null, has not been initialised. */
+ /** Map of FEAT responses. If null, has not been initialized. */
private HashMap<String, Set<String>> featuresMap;
/**
diff --git a/src/main/java/org/apache/commons/net/io/CopyStreamException.java
b/src/main/java/org/apache/commons/net/io/CopyStreamException.java
index 6122d57..7f3f31f 100644
--- a/src/main/java/org/apache/commons/net/io/CopyStreamException.java
+++ b/src/main/java/org/apache/commons/net/io/CopyStreamException.java
@@ -65,6 +65,6 @@ public class CopyStreamException extends IOException
*/
public IOException getIOException()
{
- return (IOException) getCause(); // cast is OK because it was
initialised with an IOException
+ return (IOException) getCause(); // cast is OK because it was
initialized with an IOException
}
}
diff --git a/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
b/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
index f71dd3b..dd03604 100644
--- a/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
+++ b/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
@@ -40,7 +40,7 @@ public class SSLContextUtils {
* @param protocol the protocol used to instatiate the context
* @param keyManager the key manager, may be {@code null}
* @param trustManager the trust manager, may be {@code null}
- * @return the initialised context.
+ * @return the initialized context.
* @throws IOException this is used to wrap any {@link
GeneralSecurityException} that occurs
*/
public static SSLContext createSSLContext(final String protocol, final
KeyManager keyManager, final TrustManager trustManager)
@@ -55,7 +55,7 @@ public class SSLContextUtils {
* @param protocol the protocol used to instatiate the context
* @param keyManagers the array of key managers, may be {@code null} but
array entries must not be {@code null}
* @param trustManagers the array of trust managers, may be {@code null}
but array entries must not be {@code null}
- * @return the initialised context.
+ * @return the initialized context.
* @throws IOException this is used to wrap any {@link
GeneralSecurityException} that occurs
*/
public static SSLContext createSSLContext(final String protocol, final
KeyManager[] keyManagers,
diff --git
a/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
b/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
index bbdedb4..09f0fd9 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
@@ -133,10 +133,10 @@ public class MLSDComparison {
}
/**
* Compare two instances to see if they are the same,
- * ignoring any uninitialised fields.
+ * ignoring any uninitialized fields.
* @param a first instance
* @param b second instance
- * @return true if the initialised fields are the same
+ * @return true if the initialized fields are the same
* @since 3.0
*/
public boolean areEquivalent(final FTPFile a, final FTPFile b) {
