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-beanutils.git
The following commit(s) were added to refs/heads/master by this push:
new e2e6119b Javadoc: Better wording
e2e6119b is described below
commit e2e6119b491c7b234d0fe8b0ba89579ae18c94c2
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Oct 19 10:39:24 2023 -0400
Javadoc: Better wording
---
.../java/org/apache/commons/beanutils2/ContextClassLoaderLocal.java | 4 ++--
src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java | 2 +-
src/main/java/org/apache/commons/beanutils2/MethodUtils.java | 2 +-
.../org/apache/commons/beanutils2/converters/BooleanConverter.java | 6 +++---
.../org/apache/commons/beanutils2/converters/DateTimeConverter.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/src/main/java/org/apache/commons/beanutils2/ContextClassLoaderLocal.java
b/src/main/java/org/apache/commons/beanutils2/ContextClassLoaderLocal.java
index 1ebb3c42..95440699 100644
--- a/src/main/java/org/apache/commons/beanutils2/ContextClassLoaderLocal.java
+++ b/src/main/java/org/apache/commons/beanutils2/ContextClassLoaderLocal.java
@@ -94,9 +94,9 @@ import java.util.WeakHashMap;
* <p><strong>Note:</strong> A WeakHashMap bug in several 1.3 JVMs results in
* a memory leak for those JVMs.</p>
*
- * <p><strong>Note:</strong> Of course all of this would be unnecessary if
+ * <p><strong>Note:</strong> Of course, all of this would be unnecessary if
* containers required each component to load the full set of classes it
- * needs, ie avoided providing classes loaded via a "shared" classloader.</p>
+ * needs, that is, avoided providing classes loaded via a "shared"
classloader.</p>
*
* @param <T> the type of data stored in an instance
* @see Thread#getContextClassLoader
diff --git a/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
b/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
index dc9ddaa0..860cd53f 100644
--- a/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
@@ -144,7 +144,7 @@ import org.apache.commons.logging.LogFactory;
*
* <p>
* Converters generally treat null input as if it were invalid
- * input, ie they return their default value if one was specified when the
+ * input, that is, they return their default value if one was specified when
the
* converter was constructed, and throw an exception otherwise. If you prefer
* nulls to be preserved for converters that are converting to objects (not
* primitives) then register a converter as above, passing a default value of
diff --git a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
index ec3b435f..a0467005 100644
--- a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
@@ -144,7 +144,7 @@ public class MethodUtils {
* The keys into this map only ever exist as temporary variables within
* methods of this class, and are never exposed to users of this class.
* This means that the WeakHashMap is used only as a mechanism for
- * limiting the size of the cache, ie a way to tell the garbage collector
+ * limiting the size of the cache, that is, a way to tell the garbage
collector
* that the contents of the cache can be completely garbage-collected
* whenever it needs the memory. Whether this is a good approach to
* this problem is doubtful; something like the commons-collections
diff --git
a/src/main/java/org/apache/commons/beanutils2/converters/BooleanConverter.java
b/src/main/java/org/apache/commons/beanutils2/converters/BooleanConverter.java
index b84559f8..7656ea19 100644
---
a/src/main/java/org/apache/commons/beanutils2/converters/BooleanConverter.java
+++
b/src/main/java/org/apache/commons/beanutils2/converters/BooleanConverter.java
@@ -75,7 +75,7 @@ public final class BooleanConverter extends
AbstractConverter<Boolean> {
/**
* Constructs a {@link org.apache.commons.beanutils2.Converter} that will
throw a
* {@link org.apache.commons.beanutils2.ConversionException}
- * if a conversion error occurs, ie the string value being converted is
+ * if a conversion error occurs, that is, if the string value being
converted is
* not one of the known true strings, nor one of the known false strings.
*/
public BooleanConverter() {
@@ -83,7 +83,7 @@ public final class BooleanConverter extends
AbstractConverter<Boolean> {
/**
* Constructs a {@link org.apache.commons.beanutils2.Converter} that will
return the specified default value
- * if a conversion error occurs, ie the string value being converted is
+ * if a conversion error occurs, that is, the string value being converted
is
* not one of the known true strings, nor one of the known false strings.
*
* @param defaultValue The default value to be returned if the value
@@ -100,7 +100,7 @@ public final class BooleanConverter extends
AbstractConverter<Boolean> {
/**
* Constructs a {@link org.apache.commons.beanutils2.Converter} that will
throw a
* {@link org.apache.commons.beanutils2.ConversionException}
- * if a conversion error occurs, ie the string value being converted is
+ * if a conversion error occurs, that is, the string value being converted
is
* not one of the known true strings, nor one of the known false strings.
* <p>
* The provided string arrays are copied, so that changes to the elements
diff --git
a/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
b/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
index 387930cb..623f36a4 100644
---
a/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
+++
b/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
@@ -305,9 +305,9 @@ public abstract class DateTimeConverter<D> extends
AbstractConverter<D> {
protected DateFormat getFormat(final Locale locale, final TimeZone
timeZone) {
DateFormat format = null;
if (locale == null) {
- format = DateFormat.getDateInstance(DateFormat.SHORT);
+ format = DateFormat.getDateTimeInstance(DateFormat.SHORT,
DateFormat.SHORT);
} else {
- format = DateFormat.getDateInstance(DateFormat.SHORT, locale);
+ format = DateFormat.getDateTimeInstance(DateFormat.SHORT,
DateFormat.SHORT, locale);
}
if (timeZone != null) {
format.setTimeZone(timeZone);
