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/12/17 19:46:10 UTC
[commons-net] branch master updated: Fix 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-net.git
The following commit(s) were added to refs/heads/master by this push:
new 2f9721c Fix spelling.
2f9721c is described below
commit 2f9721c3574637f3ef9aa20e0a5e9820e9ce85a1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 17 14:46:05 2020 -0500
Fix spelling.
---
.../apache/commons/net/examples/ftp/FTPClientExample.java | 4 ++--
src/main/java/org/apache/commons/net/ftp/FTPClient.java | 2 +-
.../java/org/apache/commons/net/ftp/FTPClientConfig.java | 2 +-
src/main/java/org/apache/commons/net/ftp/FTPFile.java | 6 +++---
.../org/apache/commons/net/ftp/parser/MLSxEntryParser.java | 2 +-
src/main/java/org/apache/commons/net/imap/IMAPClient.java | 12 ++++++------
src/main/java/org/apache/commons/net/time/TimeTCPClient.java | 4 ++--
src/main/java/org/apache/commons/net/time/TimeUDPClient.java | 4 ++--
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java b/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java
index 887037d..bc234e1 100644
--- a/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java
+++ b/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java
@@ -80,8 +80,8 @@ public final class FTPClientExample
"\t-T all|valid|none - use one of the built-in TrustManager implementations (none = JVM default)\n" +
"\t-y format - set default date format string\n" +
"\t-Y format - set recent date format string\n" +
- "\t-Z timezone - set the server timezone for parsing LIST responses\n" +
- "\t-z timezone - set the timezone for displaying MDTM, LIST, MLSD, MLST responses\n" +
+ "\t-Z timezone - set the server time zone for parsing LIST responses\n" +
+ "\t-z timezone - set the time zone for displaying MDTM, LIST, MLSD, MLST responses\n" +
"\t-PrH server[:port] - HTTP Proxy host and optional port[80] \n" +
"\t-PrU user - HTTP Proxy server username\n" +
"\t-PrP password - HTTP Proxy server password\n" +
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 d309e32..9646fa4 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -237,7 +237,7 @@ import org.apache.commons.net.io.Util;
* <ul>
* <li>use languages other than English</li>
* <li>use date formats other than the American English "standard" <code>MM d yyyy</code></li>
- * <li>are in different timezones and you need accurate timestamps for dependency checking
+ * <li>are in different time zones and you need accurate timestamps for dependency checking
* as in Ant</li>
* </ul>see {@link FTPClientConfig FTPClientConfig}.
* <p>
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java b/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
index b1b46fb..5d7c404 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
@@ -52,7 +52,7 @@ import java.util.TreeMap;
* than English</li>
* <li>lists files with timestamps that use date formats other
* than the American English "standard" <code>MM dd yyyy</code></li>
- * <li>is in different timezone and you need accurate timestamps for
+ * <li>is in different time zone and you need accurate timestamps for
* dependency checking as in Ant</li>
* </ul>
* <p>
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPFile.java b/src/main/java/org/apache/commons/net/ftp/FTPFile.java
index 0692610..235f173 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPFile.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPFile.java
@@ -378,7 +378,7 @@ public class FTPFile implements Serializable {
/**
* Gets a string representation of the FTPFile information. This currently mimics the Unix listing format. This
- * method uses the timezone of the Calendar entry, which is the server time zone (if one was provided) otherwise it
+ * method uses the time zone of the Calendar entry, which is the server time zone (if one was provided) otherwise it
* is the local time zone.
* <p>
* Note: if the instance is not valid {@link #isValid()}, no useful information can be returned. In this case, use
@@ -400,8 +400,8 @@ public class FTPFile implements Serializable {
* {@link #getRawListing()} instead.
* </p>
*
- * @param timezone the timezone to use for displaying the time stamp If {@code null}, then use the Calendar entry
- * timezone
+ * @param timezone the time zone to use for displaying the time stamp If {@code null}, then use the Calendar entry
+ *
* @return A string representation of the FTPFile information.
* @since 3.4
*/
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
index a917b8a..ae23c81 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
@@ -194,7 +194,7 @@ public class MLSxEntryParser extends FTPFileEntryParserImpl
hasMillis = false;
}
final TimeZone GMT = TimeZone.getTimeZone("GMT");
- // both timezones need to be set for the parse to work OK
+ // both time zones need to be set for the parse to work OK
sdf.setTimeZone(GMT);
final GregorianCalendar gc = new GregorianCalendar(GMT);
final ParsePosition pos = new ParsePosition(0);
diff --git a/src/main/java/org/apache/commons/net/imap/IMAPClient.java b/src/main/java/org/apache/commons/net/imap/IMAPClient.java
index 86f297d..edef6d8 100644
--- a/src/main/java/org/apache/commons/net/imap/IMAPClient.java
+++ b/src/main/java/org/apache/commons/net/imap/IMAPClient.java
@@ -464,7 +464,7 @@ public class IMAPClient extends IMAP
*/
BCC,
/**
- * Messages whose internal date (disregarding time and timezone)
+ * Messages whose internal date (disregarding time and time zone)
* is earlier than the specified date.
*/
BEFORE,
@@ -519,7 +519,7 @@ public class IMAPClient extends IMAP
*/
OLD,
/**
- * Messages whose internal date (disregarding time and timezone)
+ * Messages whose internal date (disregarding time and time zone)
* is within the specified date.
*/
ON,
@@ -531,21 +531,21 @@ public class IMAPClient extends IMAP
SEEN,
/**
* Messages whose [RFC-2822] Date: header (disregarding time and
- * timezone) is earlier than the specified date.
+ * time zone) is earlier than the specified date.
*/
SENTBEFORE,
/**
* Messages whose [RFC-2822] Date: header (disregarding time and
- * timezone) is within the specified date.
+ * time zone) is within the specified date.
*/
SENTON,
/**
* Messages whose [RFC-2822] Date: header (disregarding time and
- * timezone) is within or later than the specified date.
+ * time zone) is within or later than the specified date.
*/
SENTSINCE,
/**
- * Messages whose internal date (disregarding time and timezone)
+ * Messages whose internal date (disregarding time and time zone)
* is within or later than the specified date.
*/
SINCE,
diff --git a/src/main/java/org/apache/commons/net/time/TimeTCPClient.java b/src/main/java/org/apache/commons/net/time/TimeTCPClient.java
index 9a53af8..7cc47ae 100644
--- a/src/main/java/org/apache/commons/net/time/TimeTCPClient.java
+++ b/src/main/java/org/apache/commons/net/time/TimeTCPClient.java
@@ -85,7 +85,7 @@ public final class TimeTCPClient extends SocketClient
/**
* Retrieves the time from the server and returns a Java Date
- * containing the time converted to the local timezone.
+ * containing the time converted to the local time zone.
* <p>
* The server will have closed the connection at this point, so you should
* call
@@ -96,7 +96,7 @@ public final class TimeTCPClient extends SocketClient
* before calling <code> getDate() </code> again.
*
* @return A Date value containing the time retrieved from the server
- * converted to the local timezone.
+ * converted to the local time zone.
* @throws IOException If an error occurs while fetching the time.
*/
public Date getDate() throws IOException
diff --git a/src/main/java/org/apache/commons/net/time/TimeUDPClient.java b/src/main/java/org/apache/commons/net/time/TimeUDPClient.java
index dc48c14..806bc0d 100644
--- a/src/main/java/org/apache/commons/net/time/TimeUDPClient.java
+++ b/src/main/java/org/apache/commons/net/time/TimeUDPClient.java
@@ -105,12 +105,12 @@ public final class TimeUDPClient extends DatagramSocketClient
/**
* Retrieves the time from the server and returns a Java Date
- * containing the time converted to the local timezone.
+ * containing the time converted to the local time zone.
*
* @param host The address of the server.
* @param port The port of the service.
* @return A Date value containing the time retrieved from the server
- * converted to the local timezone.
+ * converted to the local time zone.
* @throws IOException If an error occurs while fetching the time.
*/
public Date getDate(final InetAddress host, final int port) throws IOException