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 2022/11/06 14:55:33 UTC
[commons-collections] branch master updated: (chore) Fix minor typos (#323)
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-collections.git
The following commit(s) were added to refs/heads/master by this push:
new 3a5c5c283 (chore) Fix minor typos (#323)
3a5c5c283 is described below
commit 3a5c5c2838d0dacbed2722c4f860d36d0c32f325
Author: Marc Wrobel <ma...@gmail.com>
AuthorDate: Sun Nov 6 15:55:27 2022 +0100
(chore) Fix minor typos (#323)
Fix various minor typos in :
- project documentations,
- javadoc and comments,
- method attribute and variable names,
- test method names.
---
RELEASE-NOTES.txt | 6 +-
pom.xml | 2 +-
src/changes/changes.xml | 6 +-
.../apache/commons/collections4/ArrayStack.java | 2 +-
.../java/org/apache/commons/collections4/Bag.java | 2 +-
.../apache/commons/collections4/ClosureUtils.java | 4 +-
.../commons/collections4/ComparatorUtils.java | 4 +-
.../commons/collections4/FluentIterable.java | 2 +-
.../org/apache/commons/collections4/MapUtils.java | 8 +--
.../org/apache/commons/collections4/MultiSet.java | 4 +-
.../commons/collections4/MultiValuedMap.java | 34 +++++------
.../apache/commons/collections4/OrderedMap.java | 2 +-
.../org/apache/commons/collections4/SetUtils.java | 10 ++--
.../commons/collections4/bag/SynchronizedBag.java | 2 +-
.../collections4/bag/SynchronizedSortedBag.java | 2 +-
.../commons/collections4/bag/package-info.java | 2 +-
.../collections4/bidimap/AbstractDualBidiMap.java | 4 +-
.../commons/collections4/bidimap/TreeBidiMap.java | 66 +++++++++++-----------
.../collection/PredicatedCollection.java | 2 +-
.../collection/SynchronizedCollection.java | 2 +-
.../collections4/collection/package-info.java | 2 +-
.../comparators/BooleanComparator.java | 2 +-
.../comparators/ComparableComparator.java | 2 +-
.../collections4/comparators/ComparatorChain.java | 2 +-
.../comparators/FixedOrderComparator.java | 2 +-
.../comparators/ReverseComparator.java | 2 +-
.../comparators/TransformingComparator.java | 2 +-
.../collections4/iterators/ArrayListIterator.java | 2 +-
.../collections4/iterators/CollatingIterator.java | 4 +-
.../collections4/iterators/FilterIterator.java | 2 +-
.../collections4/iterators/LazyIteratorChain.java | 2 +-
.../iterators/LoopingListIterator.java | 2 +-
.../iterators/ObjectArrayListIterator.java | 2 +-
.../iterators/PermutationIterator.java | 2 +-
.../commons/collections4/keyvalue/MultiKey.java | 4 +-
.../collections4/list/AbstractLinkedList.java | 4 +-
.../collections4/list/CursorableLinkedList.java | 2 +-
.../apache/commons/collections4/list/LazyList.java | 2 +-
.../collections4/list/NodeCachingLinkedList.java | 2 +-
.../apache/commons/collections4/list/TreeList.java | 4 +-
.../map/AbstractInputCheckedMapDecorator.java | 2 +-
.../collections4/map/AbstractReferenceMap.java | 6 +-
.../commons/collections4/map/CompositeMap.java | 8 +--
.../collections4/map/PassiveExpiringMap.java | 2 +-
.../commons/collections4/map/StaticBucketMap.java | 2 +-
.../collections4/map/UnmodifiableEntrySet.java | 2 +-
.../multimap/AbstractMultiValuedMap.java | 4 +-
.../multimap/AbstractMultiValuedMapDecorator.java | 2 +-
.../multiset/AbstractMultiSetDecorator.java | 2 +-
.../multiset/SynchronizedMultiSet.java | 2 +-
.../collections4/multiset/package-info.java | 2 +-
.../properties/AbstractPropertiesFactory.java | 2 +-
.../collections4/queue/SynchronizedQueue.java | 2 +-
.../commons/collections4/sequence/EditCommand.java | 2 +-
.../collections4/sequence/SequencesComparator.java | 2 +-
.../collections4/sequence/package-info.java | 2 +-
.../collections4/splitmap/package-info.java | 2 +-
.../collections4/trie/AbstractBitwiseTrie.java | 2 +-
.../collections4/trie/AbstractPatriciaTrie.java | 6 +-
.../collections4/trie/UnmodifiableTrie.java | 2 +-
src/site/xdoc/compatibility.xml | 2 +-
src/site/xdoc/history.xml | 4 +-
src/site/xdoc/mail-lists.xml | 2 +-
src/site/xdoc/pick.xml | 2 +-
src/site/xdoc/release_3_2.xml | 16 +++---
src/site/xdoc/release_3_2_1.xml | 2 +-
src/site/xdoc/release_3_2_2.xml | 2 +-
src/site/xdoc/release_4_0.xml | 6 +-
src/site/xdoc/release_4_1.xml | 2 +-
src/site/xdoc/release_4_2.xml | 2 +-
src/site/xdoc/release_4_3.xml | 2 +-
src/site/xdoc/release_4_4.xml | 2 +-
src/site/xdoc/security-reports.xml | 2 +-
src/site/xdoc/userguide.xml | 4 +-
.../commons/collections4/AbstractObjectTest.java | 4 +-
.../org/apache/commons/collections4/BulkTest.java | 4 +-
.../apache/commons/collections4/ListUtilsTest.java | 6 +-
.../commons/collections4/SplitMapUtilsTest.java | 2 +-
.../collections4/bag/AbstractSortedBagTest.java | 12 ++--
.../collections4/bag/PredicatedBagTest.java | 2 +-
.../collection/AbstractCollectionTest.java | 8 +--
.../comparators/ComparatorChainTest.java | 2 +-
.../comparators/ReverseComparatorTest.java | 2 +-
.../collections4/iterators/FilterIteratorTest.java | 2 +-
.../iterators/ListIteratorWrapper2Test.java | 4 +-
.../iterators/ListIteratorWrapperTest.java | 4 +-
.../collections4/list/AbstractListTest.java | 2 +-
.../list/CursorableLinkedListTest.java | 4 +-
.../commons/collections4/list/TreeListTest.java | 2 +-
.../commons/collections4/map/AbstractMapTest.java | 6 +-
.../collections4/map/MultiValueMapTest.java | 2 +-
.../commons/collections4/map/SingletonMapTest.java | 4 +-
.../collections4/set/AbstractNavigableSetTest.java | 52 ++++++++---------
.../collections4/set/AbstractSortedSetTest.java | 54 +++++++++---------
94 files changed, 249 insertions(+), 249 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 129d96fcf..bc2f8efb5 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -90,7 +90,7 @@ o COLLECTIONS-660: Uncomment test in AbstractMapTest regarding LRUMap equals.
o COLLECTIONS-656: Fix site build on Java 8.
o COLLECTIONS-653: Update Javadoc to Build on Java 1.8.
o COLLECTIONS-606: Build status, Coverage status and Maven central weren't in README.md Thanks to Vamsi Kavuri.
-o COLLECTIONS-594: Web site spelling error: MultiValuedMapeList. Thanks to Javen O'Neal.
+o COLLECTIONS-594: Website spelling error: MultiValuedMapList. Thanks to Javen O'Neal.
o COLLECTIONS-597: Correction of Javadoc for org.apache.commons.collections4.functors.CatchAndRethrowClosure. Thanks to Enrique.
o COLLECTIONS-678: The verification of unsupported iterator methods is not complete. Thanks to Oscar Luis Vera Pérez.
o COLLECTIONS-673: ListUtils.partition potential integer overflow. Thanks to John Mark, Stephan Fuhrmann.
@@ -128,7 +128,7 @@ mechanism. Serialization support for unsafe classes in the functor package has b
completely removed (classes do not implement the Serializable interface anymore).
For more details, please refer to COLLECTIONS-580.
-All users are strongly encouraged to updated to this release.
+All users are strongly encouraged to update to this release.
Compatibility
@@ -295,7 +295,7 @@ By default, serialization support for unsafe classes in the functor package is
disabled and will result in an exception when either trying to serialize or de-serialize
an instance of these classes. For more details, please refer to COLLECTIONS-580.
-All users are strongly encouraged to updated to this release.
+All users are strongly encouraged to update to this release.
Changes in this version include:
diff --git a/pom.xml b/pom.xml
index 64405a0dc..7c5252e62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -566,7 +566,7 @@
<commons.release.4.name>commons-collections-${commons.release.4.version}</commons.release.4.name>
<!-- Older release has sha256 only -->
<commons.release.4.hash>sha256</commons.release.4.hash>
- <!-- This is needed uptil CP49 is released -->
+ <!-- This is needed until CP49 is released -->
<commons.release.4.binary.suffix>-bin</commons.release.4.binary.suffix>
<commons.jira.id>COLLECTIONS</commons.jira.id>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 50a1e054c..a9b9ae18e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -807,7 +807,7 @@ features, this release includes numerous bug fixes.
Added method "CollectionUtils#isEqualCollection(Collection, Collection, Equator)".
</action>
<action issue="COLLECTIONS-445" dev="tn" type="fix">
- Adapt and/or ignore several unit tests when run on a IBM J9 VM (specification version 1.6.0)
+ Adapt and/or ignore several unit tests when run on an IBM J9 VM (specification version 1.6.0)
due to a faulty "java.util.TreeMap" implementation.
</action>
<action issue="COLLECTIONS-444" dev="tn" type="fix" due-to="Thomas Vahrst, John Vasileff">
@@ -1024,7 +1024,7 @@ features, this release includes numerous bug fixes.
</action>
<action issue="COLLECTIONS-322" dev="tn" type="add" due-to="Thomas Vahrst">
Added NodeListIterator and convenience methods in IteratorUtils to iterate over
- a org.w3c.dom.NodeList.
+ an org.w3c.dom.NodeList.
</action>
<action issue="COLLECTIONS-320" dev="bayard" type="fix" due-to="sebb">
Improved performance of "StaticBucketMap#putAll(Map)" by iterating over the entry set.
@@ -1061,7 +1061,7 @@ features, this release includes numerous bug fixes.
"SetUniqueList#set(int, Object)" will now correctly enforce the uniqueness constraint.
</action>
<action issue="COLLECTIONS-303" dev="bayard" type="fix" due-to="Emmanuel Bourg">
- Improved javadoc for "Unmodifiable*" classes wrt behavior when the users tries
+ Improved javadoc for "Unmodifiable*" classes wrt behavior when the user tries
to modify the collection.
</action>
<action issue="COLLECTIONS-298" dev="bayard" type="update" due-to="Benjamin Bentmann">
diff --git a/src/main/java/org/apache/commons/collections4/ArrayStack.java b/src/main/java/org/apache/commons/collections4/ArrayStack.java
index f4b693eac..4b5dd3069 100644
--- a/src/main/java/org/apache/commons/collections4/ArrayStack.java
+++ b/src/main/java/org/apache/commons/collections4/ArrayStack.java
@@ -22,7 +22,7 @@ import java.util.EmptyStackException;
/**
* An implementation of the {@link java.util.Stack} API that is based on an
* {@code ArrayList} instead of a {@code Vector}, so it is not
- * synchronized to protect against multi-threaded access. The implementation
+ * synchronized to protect against multithreaded access. The implementation
* is therefore operates faster in environments where you do not need to
* worry about multiple thread contention.
* <p>
diff --git a/src/main/java/org/apache/commons/collections4/Bag.java b/src/main/java/org/apache/commons/collections4/Bag.java
index 9495d23c1..24958751e 100644
--- a/src/main/java/org/apache/commons/collections4/Bag.java
+++ b/src/main/java/org/apache/commons/collections4/Bag.java
@@ -32,7 +32,7 @@ import java.util.Set;
* <i>NOTE: This interface violates the {@link Collection} contract.</i>
* The behavior specified in many of these methods is <i>not</i> the same
* as the behavior specified by {@code Collection}.
- * The noncompliant methods are clearly marked with "(Violation)".
+ * The non-compliant methods are clearly marked with "(Violation)".
* Exercise caution when using a bag as a {@code Collection}.
* </p>
* <p>
diff --git a/src/main/java/org/apache/commons/collections4/ClosureUtils.java b/src/main/java/org/apache/commons/collections4/ClosureUtils.java
index 86ce902ad..59f7203ee 100644
--- a/src/main/java/org/apache/commons/collections4/ClosureUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ClosureUtils.java
@@ -278,7 +278,7 @@ public class ClosureUtils {
* @param predicates an array of predicates to check, not null
* @param closures an array of closures to call, not null
* @return the {@code switch} closure
- * @throws NullPointerException if the either array is null
+ * @throws NullPointerException if either array is null
* @throws NullPointerException if any element in the arrays is null
* @throws IllegalArgumentException if the arrays have different sizes
*/
@@ -303,7 +303,7 @@ public class ClosureUtils {
* @param closures an array of closures to call, not null
* @param defaultClosure the default to call if no predicate matches
* @return the {@code switch} closure
- * @throws NullPointerException if the either array is null
+ * @throws NullPointerException if either array is null
* @throws NullPointerException if any element in the arrays is null
* @throws IllegalArgumentException if the arrays are different sizes
*/
diff --git a/src/main/java/org/apache/commons/collections4/ComparatorUtils.java b/src/main/java/org/apache/commons/collections4/ComparatorUtils.java
index 0fac39bb7..ed89a16bb 100644
--- a/src/main/java/org/apache/commons/collections4/ComparatorUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ComparatorUtils.java
@@ -202,7 +202,7 @@ public class ComparatorUtils {
}
/**
- * Returns the smaller of the given objects according to the given
+ * Returns the smallest of the given objects according to the given
* comparator, returning the second object if the comparator
* returns equal.
*
@@ -222,7 +222,7 @@ public class ComparatorUtils {
}
/**
- * Returns the larger of the given objects according to the given
+ * Returns the largest of the given objects according to the given
* comparator, returning the second object if the comparator
* returns equal.
*
diff --git a/src/main/java/org/apache/commons/collections4/FluentIterable.java b/src/main/java/org/apache/commons/collections4/FluentIterable.java
index 36cbbc464..0b6d28b81 100644
--- a/src/main/java/org/apache/commons/collections4/FluentIterable.java
+++ b/src/main/java/org/apache/commons/collections4/FluentIterable.java
@@ -192,7 +192,7 @@ public class FluentIterable<E> implements Iterable<E> {
/**
* Returns a new FluentIterable whose iterator will traverse the
* elements of the current and provided iterable according to the
- * ordering defined by an comparator.
+ * ordering defined by a comparator.
* <p>
* Example: descending order
* <ul>
diff --git a/src/main/java/org/apache/commons/collections4/MapUtils.java b/src/main/java/org/apache/commons/collections4/MapUtils.java
index 1f4554045..dd9280c01 100644
--- a/src/main/java/org/apache/commons/collections4/MapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/MapUtils.java
@@ -648,7 +648,7 @@ public class MapUtils {
}
/**
- * Gets a Integer from a Map in a null-safe manner.
+ * Gets an Integer from a Map in a null-safe manner.
* <p>
* The Integer is obtained from the results of {@link #getNumber(Map,Object)}.
* </p>
@@ -656,7 +656,7 @@ public class MapUtils {
* @param <K> the key type
* @param map the map to use
* @param key the key to look up
- * @return the value in the Map as a Integer, {@code null} if null map input
+ * @return the value in the Map as an Integer, {@code null} if null map input
*/
public static <K> Integer getInteger(final Map<? super K, ?> map, final K key) {
final Number answer = getNumber(map, key);
@@ -1409,7 +1409,7 @@ public class MapUtils {
}
/**
- * Creates a mult-value map backed by the given map which returns collections of type ArrayList.
+ * Creates a multi-value map backed by the given map which returns collections of type ArrayList.
*
* @param <K> the key type
* @param <V> the value type
@@ -1953,7 +1953,7 @@ public class MapUtils {
* Implementation providing functionality for {@link #debugPrint} and for {@link #verbosePrint}. This prints the
* given map with nice line breaks. If the debug flag is true, it additionally prints the type of the object value.
* If the contents of a map include the map itself, then the text <em>(this Map)</em> is printed out. If the
- * contents include a parent container of the map, the text <em>(ancestor[i] Map)</em> is printed, where i actually
+ * contents include a parent container of the map, the text <em>(ancestor[i] Map)</em> is printed, where it actually
* indicates the number of levels which must be traversed in the sequential list of ancestors (e.g. father,
* grandfather, great-grandfather, etc).
*
diff --git a/src/main/java/org/apache/commons/collections4/MultiSet.java b/src/main/java/org/apache/commons/collections4/MultiSet.java
index 51dd135d7..eef64f0ee 100644
--- a/src/main/java/org/apache/commons/collections4/MultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/MultiSet.java
@@ -92,7 +92,7 @@ public interface MultiSet<E> extends Collection<E> {
/**
* Removes one occurrence of the given object from the MultiSet.
* <p>
- * If the number of occurrences after this operations is reduced
+ * If the number of occurrences after this operation is reduced
* to zero, the object will be removed from the {@link #uniqueSet()}.
*
* @param object the object to remove
@@ -215,7 +215,7 @@ public interface MultiSet<E> extends Collection<E> {
* An unmodifiable entry for an element and its occurrence as contained in a MultiSet.
* <p>
* The {@link MultiSet#entrySet()} method returns a view of the multiset whose elements
- * implements this interface.
+ * implement this interface.
*
* @param <E> the element type
*/
diff --git a/src/main/java/org/apache/commons/collections4/MultiValuedMap.java b/src/main/java/org/apache/commons/collections4/MultiValuedMap.java
index 61b5dec16..e26a6d5ae 100644
--- a/src/main/java/org/apache/commons/collections4/MultiValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/MultiValuedMap.java
@@ -117,14 +117,14 @@ public interface MultiValuedMap<K, V> {
// Modification operations
/**
- * Adds a key-value mapping to this multi-valued map.
+ * Adds a key-value mapping to this multivalued map.
* <p>
* Unlike a normal {@code Map} the previous value is not replaced.
* Instead the new value is added to the collection stored against the key.
* Depending on the collection type used, duplicate key-value mappings may
* be allowed.
* <p>
- * The method will return {@code true} if the size of the multi-valued map
+ * The method will return {@code true} if the size of the multivalued map
* has been increased because of this operation.
*
* @param key the key to store against
@@ -133,10 +133,10 @@ public interface MultiValuedMap<K, V> {
* if the map already contained the key-value mapping and the collection
* type does not allow duplicate values, e.g. when using a Set
* @throws UnsupportedOperationException if the put operation is not supported by
- * this multi-valued map, e.g. if it is unmodifiable
+ * this multivalued map, e.g. if it is unmodifiable
* @throws NullPointerException if the key or value is null and null is invalid (optional)
* @throws IllegalArgumentException if some aspect of the specified key or value prevents
- * it from being stored in this multi-valued map
+ * it from being stored in this multivalued map
*/
boolean put(K key, V value);
@@ -153,7 +153,7 @@ public interface MultiValuedMap<K, V> {
boolean putAll(K key, Iterable<? extends V> values);
/**
- * Copies all mappings from the specified map to this multi-valued map
+ * Copies all mappings from the specified map to this multivalued map
* (optional operation).
* <p>
* The effect of this call is equivalent to that of calling
@@ -176,7 +176,7 @@ public interface MultiValuedMap<K, V> {
boolean putAll(Map<? extends K, ? extends V> map);
/**
- * Copies all mappings from the specified map to this multi-valued map
+ * Copies all mappings from the specified map to this multivalued map
* (optional operation).
* <p>
* The effect of this call is equivalent to that of calling
@@ -202,7 +202,7 @@ public interface MultiValuedMap<K, V> {
* Removes all values associated with the specified key.
* <p>
* The returned collection <i>may</i> be modifiable, but updates will not be propagated
- * to this multi-valued map. In case no mapping was stored for the specified
+ * to this multivalued map. In case no mapping was stored for the specified
* key, an empty, unmodifiable collection will be returned.
*
* @param key the key to remove values from
@@ -241,7 +241,7 @@ public interface MultiValuedMap<K, V> {
// Views
/**
- * Returns a {@link Collection} view of the mappings contained in this multi-valued map.
+ * Returns a {@link Collection} view of the mappings contained in this multivalued map.
* <p>
* The collection is backed by the map, so changes to the map are reflected
* in the collection, and vice-versa.
@@ -251,7 +251,7 @@ public interface MultiValuedMap<K, V> {
Collection<Entry<K, V>> entries();
/**
- * Returns a {@link MultiSet} view of the keys contained in this multi-valued map.
+ * Returns a {@link MultiSet} view of the keys contained in this multivalued map.
* <p>
* The {@link MultiSet#getCount(Object)} method of the returned multiset will give
* the same result a calling {@code get(Object).size()} for the same key.
@@ -264,7 +264,7 @@ public interface MultiValuedMap<K, V> {
MultiSet<K> keys();
/**
- * Returns a {@link Set} view of the keys contained in this multi-valued map.
+ * Returns a {@link Set} view of the keys contained in this multivalued map.
* <p>
* The set is backed by the map, so changes to the map are reflected
* in the set, and vice-versa.
@@ -282,36 +282,36 @@ public interface MultiValuedMap<K, V> {
Set<K> keySet();
/**
- * Gets a {@link Collection} view of all values contained in this multi-valued map.
+ * Gets a {@link Collection} view of all values contained in this multivalued map.
* <p>
* Implementations typically return a collection containing the combination
* of values from all keys.
*
- * @return a collection view of the values contained in this multi-valued map
+ * @return a collection view of the values contained in this multivalued map
*/
Collection<V> values();
/**
- * Returns a view of this multi-valued map as a {@code Map} from each distinct
+ * Returns a view of this multivalued map as a {@code Map} from each distinct
* key to the non-empty collection of that key's associated values.
* <p>
* Note that {@code this.asMap().get(k)} is equivalent to {@code this.get(k)}
- * only when {@code k} is a key contained in the multi-valued map; otherwise it
+ * only when {@code k} is a key contained in the multivalued map; otherwise it
* returns {@code null} as opposed to an empty collection.
* <p>
* Changes to the returned map or the collections that serve as its values
- * will update the underlying multi-valued map, and vice versa. The map does
+ * will update the underlying multivalued map, and vice versa. The map does
* not support {@code put} or {@code putAll}, nor do its entries support
* {@link java.util.Map.Entry#setValue(Object) setValue}.
*
- * @return a map view of the mappings in this multi-valued map
+ * @return a map view of the mappings in this multivalued map
*/
Map<K, Collection<V>> asMap();
// Iterators
/**
- * Obtains a {@code MapIterator} over this multi-valued map.
+ * Obtains a {@code MapIterator} over this multivalued map.
* <p>
* A map iterator is an efficient way of iterating over maps. There is no
* need to access the entries collection or use {@code Map.Entry} objects.
diff --git a/src/main/java/org/apache/commons/collections4/OrderedMap.java b/src/main/java/org/apache/commons/collections4/OrderedMap.java
index 324710f06..94688b539 100644
--- a/src/main/java/org/apache/commons/collections4/OrderedMap.java
+++ b/src/main/java/org/apache/commons/collections4/OrderedMap.java
@@ -30,7 +30,7 @@ public interface OrderedMap<K, V> extends IterableMap<K, V> {
/**
* Obtains an {@code OrderedMapIterator} over the map.
* <p>
- * A ordered map iterator is an efficient way of iterating over maps
+ * An ordered map iterator is an efficient way of iterating over maps
* in both directions.
*
* @return a map iterator
diff --git a/src/main/java/org/apache/commons/collections4/SetUtils.java b/src/main/java/org/apache/commons/collections4/SetUtils.java
index 58fd6d78e..42d09adcf 100644
--- a/src/main/java/org/apache/commons/collections4/SetUtils.java
+++ b/src/main/java/org/apache/commons/collections4/SetUtils.java
@@ -108,7 +108,7 @@ public class SetUtils {
UnmodifiableSortedSet.unmodifiableSortedSet(new TreeSet<>());
/**
- * Returns a unmodifiable <b>view</b> containing the difference of the given
+ * Returns an unmodifiable <b>view</b> containing the difference of the given
* {@link Set}s, denoted by {@code a \ b} (or {@code a - b}).
* <p>
* The returned view contains all elements of {@code a} that are not a member
@@ -118,7 +118,7 @@ public class SetUtils {
* in both input sets.
* @param setA the set to subtract from, must not be null
* @param setB the set to subtract, must not be null
- * @return a view of the relative complement of of the two sets
+ * @return a view of the relative complement of the two sets
* @since 4.1
*/
public static <E> SetView<E> difference(final Set<? extends E> setA, final Set<? extends E> setB) {
@@ -141,7 +141,7 @@ public class SetUtils {
}
/**
- * Returns a unmodifiable <b>view</b> of the symmetric difference of the given
+ * Returns an unmodifiable <b>view</b> of the symmetric difference of the given
* {@link Set}s.
* <p>
* The returned view contains all elements of {@code a} and {@code b} that are
@@ -261,7 +261,7 @@ public class SetUtils {
}
/**
- * Returns a unmodifiable <b>view</b> of the intersection of the given {@link Set}s.
+ * Returns an unmodifiable <b>view</b> of the intersection of the given {@link Set}s.
* <p>
* The returned view contains all elements that are members of both input sets
* ({@code a} and {@code b}).
@@ -550,7 +550,7 @@ public class SetUtils {
// Set operations
/**
- * Returns a unmodifiable <b>view</b> of the union of the given {@link Set}s.
+ * Returns an unmodifiable <b>view</b> of the union of the given {@link Set}s.
* <p>
* The returned view contains all elements of {@code a} and {@code b}.
*
diff --git a/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java b/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
index ed6e66a4a..ba469ccaa 100644
--- a/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections4.collection.SynchronizedCollection;
/**
* Decorates another {@link Bag} to synchronize its behavior
- * for a multi-threaded environment.
+ * for a multithreaded environment.
* <p>
* Methods are synchronized, then forwarded to the decorated bag.
* Iterators must be separately synchronized around the loop.
diff --git a/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
index 3c8ec1050..3c226ebfd 100644
--- a/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections4.SortedBag;
/**
* Decorates another {@link SortedBag} to synchronize its behavior
- * for a multi-threaded environment.
+ * for a multithreaded environment.
* <p>
* Methods are synchronized, then forwarded to the decorated bag.
* Iterators must be separately synchronized around the loop.
diff --git a/src/main/java/org/apache/commons/collections4/bag/package-info.java b/src/main/java/org/apache/commons/collections4/bag/package-info.java
index 169ed3d60..971dd026f 100644
--- a/src/main/java/org/apache/commons/collections4/bag/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/bag/package-info.java
@@ -27,7 +27,7 @@
* <p>
* The following decorators are provided in the package:
* <ul>
- * <li>Synchronized - synchronizes method access for multi-threaded environments
+ * <li>Synchronized - synchronizes method access for multithreaded environments
* <li>Unmodifiable - ensures the bag cannot be altered
* <li>Predicated - ensures that only elements that are valid according to a predicate can be added
* <li>Transformed - transforms each element added to the bag
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
index e0d400b46..55cc57b07 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
@@ -673,7 +673,7 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
if (!canRemove) {
throw new IllegalStateException("Iterator remove() can only be called once after next()");
}
- // store value as remove may change the entry in the decorator (eg.TreeMap)
+ // store value as remove may change the entry in the decorator (e.g. TreeMap)
final Object value = last.getValue();
super.remove();
parent.reverseMap.remove(value);
@@ -756,7 +756,7 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
if (!canRemove) {
throw new IllegalStateException("Iterator remove() can only be called once after next()");
}
- // store value as remove may change the entry in the decorator (eg.TreeMap)
+ // store value as remove may change the entry in the decorator (e.g. TreeMap)
final V value = last.getValue();
iterator.remove();
parent.reverseMap.remove(value);
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
index 7b5aa39fc..3c91ee8e0 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
@@ -158,7 +158,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
}
/**
- * Checks whether this map contains the a mapping for the specified key.
+ * Checks whether this map contains a mapping for the specified key.
* <p>
* The key must implement {@code Comparable}.
*
@@ -174,7 +174,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
}
/**
- * Checks whether this map contains the a mapping for the specified value.
+ * Checks whether this map contains a mapping for the specified value.
* <p>
* The value must implement {@code Comparable}.
*
@@ -572,7 +572,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* Does the actual lookup of a piece of data.
*
* @param data the key or value to be looked up
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
* @return the desired Node, or null if there is no mapping of the
* specified data
@@ -606,7 +606,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* Gets the next larger node from the specified node.
*
* @param node the node to be searched from
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
* @return the specified node
*/
@@ -641,7 +641,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* Gets the next smaller node from the specified node.
*
* @param node the node to be searched from
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
* @return the specified node
*/
@@ -690,7 +690,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* Finds the least node from a given node.
*
* @param node the node from which we will start searching
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
* @return the smallest node, from the specified node, in the
* specified mapping
@@ -709,7 +709,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* Finds the greatest node from a given node.
*
* @param node the node from which we will start searching
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
* @return the greatest node, from the specified node
*/
@@ -729,7 +729,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
*
* @param from the node whose color we're copying; may be null
* @param to the node whose color we're changing; may be null
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private void copyColor(final Node<K, V> from, final Node<K, V> to, final DataElement dataElement) {
@@ -748,7 +748,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* black, thank you.
*
* @param node the node (may be null) in question
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private static boolean isRed(final Node<?, ?> node, final DataElement dataElement) {
@@ -760,7 +760,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* it's black, thank you.
*
* @param node the node (may be null) in question
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private static boolean isBlack(final Node<?, ?> node, final DataElement dataElement) {
@@ -771,7 +771,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* Forces a node (if it exists) red.
*
* @param node the node (may be null) in question
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private static void makeRed(final Node<?, ?> node, final DataElement dataElement) {
@@ -784,7 +784,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* Forces a node (if it exists) black.
*
* @param node the node (may be null) in question
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private static void makeBlack(final Node<?, ?> node, final DataElement dataElement) {
@@ -798,7 +798,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* its grandparent may not exist. No problem.
*
* @param node the node (may be null) in question
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private Node<K, V> getGrandParent(final Node<K, V> node, final DataElement dataElement) {
@@ -810,7 +810,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* exist. no problem.
*
* @param node the node (may be null) in question
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private Node<K, V> getParent(final Node<K, V> node, final DataElement dataElement) {
@@ -822,7 +822,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* problem.
*
* @param node the node (may be null) in question
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private Node<K, V> getRightChild(final Node<K, V> node, final DataElement dataElement) {
@@ -834,7 +834,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* problem.
*
* @param node the node (may be null) in question
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private Node<K, V> getLeftChild(final Node<K, V> node, final DataElement dataElement) {
@@ -845,7 +845,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* Does a rotate left. standard fare in the world of balanced trees.
*
* @param node the node to be rotated
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private void rotateLeft(final Node<K, V> node, final DataElement dataElement) {
@@ -874,7 +874,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* Does a rotate right. standard fare in the world of balanced trees.
*
* @param node the node to be rotated
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private void rotateRight(final Node<K, V> node, final DataElement dataElement) {
@@ -900,7 +900,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
/**
* Complicated red-black insert stuff. Based on Sun's TreeMap
- * implementation, though it's barely recognizable any more.
+ * implementation, though it's barely recognizable anymore.
*
* @param insertedNode the node to be inserted
* @param dataElement the KEY or VALUE int
@@ -970,7 +970,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
/**
* Complicated red-black delete stuff. Based on Sun's TreeMap
- * implementation, though it's barely recognizable any more.
+ * implementation, though it's barely recognizable anymore.
*
* @param deletedNode the node to be deleted
*/
@@ -1034,7 +1034,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
/**
* Complicated red-black delete stuff. Based on Sun's TreeMap
- * implementation, though it's barely recognizable any more. This
+ * implementation, though it's barely recognizable anymore. This
* rebalances the tree (somewhat, as red-black trees are not
* perfectly balanced -- perfect balancing takes longer)
*
@@ -1220,7 +1220,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* Comparable and non-null.
*
* @param obj the object being checked
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*
* @throws NullPointerException if o is null
@@ -1341,7 +1341,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* Compares for equals as per the API.
*
* @param obj the object to compare to
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
* @return true if equal
*/
@@ -1376,7 +1376,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
/**
* Gets the hash code value for this map as per the API.
*
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
* @return the hash code value for this map
*/
@@ -1395,7 +1395,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
/**
* Gets the string form of this map as per AbstractMap.
*
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
* @return the string form of this map
*/
@@ -1920,7 +1920,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* Sets this node's parent node.
*
* @param node the new parent node
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private void setParent(final Node<K, V> node, final DataElement dataElement) {
@@ -1930,7 +1930,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
/**
* Gets the parent node.
*
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
* @return the parent node, may be null
*/
@@ -1942,7 +1942,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* Exchanges colors with another node.
*
* @param node the node to swap with
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private void swapColors(final Node<K, V> node, final DataElement dataElement) {
@@ -1955,7 +1955,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
/**
* Is this node black?
*
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
* @return true if black (which is represented as a true boolean)
*/
@@ -1966,7 +1966,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
/**
* Is this node red?
*
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
* @return true if non-black
*/
@@ -1977,7 +1977,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
/**
* Makes this node black.
*
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private void setBlack(final DataElement dataElement) {
@@ -1987,7 +1987,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
/**
* Makes this node red.
*
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private void setRed(final DataElement dataElement) {
@@ -1998,7 +1998,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
* Makes this node the same color as another.
*
* @param node the node whose color we're adopting
- * @param dataElement either {@link DataElement#KEY} key}
+ * @param dataElement either the {@link DataElement#KEY key}
* or the {@link DataElement#VALUE value}.
*/
private void copyColor(final Node<K, V> node, final DataElement dataElement) {
diff --git a/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java b/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
index a877005e4..369e3c44c 100644
--- a/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
@@ -160,7 +160,7 @@ public class PredicatedCollection<E> extends AbstractCollectionDecorator<E> {
/**
* Override to validate the objects being added to ensure they match
- * the predicate. If any one fails, no update is made to the underlying
+ * the predicate. If anyone fails, no update is made to the underlying
* collection.
*
* @param coll the collection being added
diff --git a/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java b/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
index 190766fc1..399221690 100644
--- a/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
@@ -24,7 +24,7 @@ import java.util.function.Predicate;
/**
* Decorates another {@link Collection} to synchronize its behavior
- * for a multi-threaded environment.
+ * for a multithreaded environment.
* <p>
* Iterators must be manually synchronized:
* </p>
diff --git a/src/main/java/org/apache/commons/collections4/collection/package-info.java b/src/main/java/org/apache/commons/collections4/collection/package-info.java
index fa5e59b54..f2ca8fd1f 100644
--- a/src/main/java/org/apache/commons/collections4/collection/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/collection/package-info.java
@@ -24,7 +24,7 @@
* </ul>
* The following decorators are provided in the package:
* <ul>
- * <li>Synchronized - synchronizes method access for multi-threaded environments
+ * <li>Synchronized - synchronizes method access for multithreaded environments
* <li>Unmodifiable - ensures the collection cannot be altered
* <li>Predicated - ensures that only elements that are valid according to a predicate can be added
* <li>Transformed - transforms elements as they are added
diff --git a/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java b/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
index 544d978b0..b391f0886 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
@@ -155,7 +155,7 @@ public final class BooleanComparator implements Comparator<Boolean>, Serializabl
/**
* Returns {@code true} iff <i>that</i> Object is
- * is a {@link Comparator} whose ordering is known to be
+ * a {@link Comparator} whose ordering is known to be
* equivalent to mine.
* <p>
* This implementation returns {@code true}
diff --git a/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java b/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
index 063ffd59e..45c20a5e8 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
@@ -105,7 +105,7 @@ public class ComparableComparator<E extends Comparable<? super E>> implements Co
}
/**
- * Returns {@code true} iff <i>that</i> Object is is a {@link Comparator Comparator}
+ * Returns {@code true} iff <i>that</i> Object is a {@link Comparator Comparator}
* whose ordering is known to be equivalent to mine.
* <p>
* This implementation returns {@code true} iff
diff --git a/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
index 465309217..549b406a7 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
@@ -315,7 +315,7 @@ public class ComparatorChain<E> implements Comparator<E>, Serializable {
/**
* Returns {@code true} iff <i>that</i> Object is
- * is a {@link Comparator} whose ordering is known to be
+ * a {@link Comparator} whose ordering is known to be
* equivalent to mine.
* <p>
* This implementation returns {@code true}
diff --git a/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java b/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
index 4067c8e2f..f6f58313a 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
@@ -253,7 +253,7 @@ public class FixedOrderComparator<T> implements Comparator<T>, Serializable {
/**
* Returns {@code true} iff <i>that</i> Object is
- * is a {@link Comparator} whose ordering is known to be
+ * a {@link Comparator} whose ordering is known to be
* equivalent to mine.
* <p>
* This implementation returns {@code true}
diff --git a/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java b/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
index 4c2e01058..627277bfb 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
@@ -88,7 +88,7 @@ public class ReverseComparator<E> implements Comparator<E>, Serializable {
/**
* Returns {@code true} iff <i>that</i> Object is
- * is a {@link Comparator} whose ordering is known to be
+ * a {@link Comparator} whose ordering is known to be
* equivalent to mine.
* <p>
* This implementation returns {@code true}
diff --git a/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java b/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
index a582a6f21..28f044eef 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
@@ -101,7 +101,7 @@ public class TransformingComparator<I, O> implements Comparator<I>, Serializable
/**
* Returns {@code true} iff <i>that</i> Object is
- * is a {@link Comparator} whose ordering is known to be
+ * a {@link Comparator} whose ordering is known to be
* equivalent to mine.
* <p>
* This implementation returns {@code true}
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
index eedb4fd6e..d60593481 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
@@ -45,7 +45,7 @@ public class ArrayListIterator<E> extends ArrayIterator<E>
/**
* Holds the index of the last item returned by a call to {@code next()}
* or {@code previous()}. This is set to {@code -1} if neither method
- * has yet been invoked. {@code lastItemIndex} is used to to implement
+ * has yet been invoked. {@code lastItemIndex} is used to implement
* the {@link #set} method.
*/
private int lastItemIndex = -1;
diff --git a/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
index 5dda40980..7bf975a27 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
@@ -71,7 +71,7 @@ public class CollatingIterator<E> implements Iterator<E> {
}
/**
- * Constructs a new {@code CollatingIterator} that will used the
+ * Constructs a new {@code CollatingIterator} that will use the
* specified comparator for ordering. Child iterators will have to be
* manually added using the {@link #addIterator(Iterator)} method.
*
@@ -83,7 +83,7 @@ public class CollatingIterator<E> implements Iterator<E> {
}
/**
- * Constructs a new {@code CollatingIterator} that will used the
+ * Constructs a new {@code CollatingIterator} that will use the
* specified comparator for ordering and have the specified initial
* capacity. Child iterators will have to be manually added using the
* {@link #addIterator(Iterator)} method.
diff --git a/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java b/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java
index a7aed100f..7f86848c2 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java
@@ -161,7 +161,7 @@ public class FilterIterator<E> implements Iterator<E> {
/**
* Set nextObject to the next object. If there are no more
- * objects then return false. Otherwise, return true.
+ * objects, then return false. Otherwise, return true.
*/
private boolean setNextObject() {
while (iterator.hasNext()) {
diff --git a/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java b/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java
index dc9dd2818..de658845e 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java
@@ -27,7 +27,7 @@ import java.util.Iterator;
* in sequence until all Iterators are exhausted.
* <p>
* The Iterators are provided by {@link #nextIterator(int)} which has to be overridden by
- * sub-classes and allows to lazily create the Iterators as they are accessed:
+ * subclasses and allows to lazily create the Iterators as they are accessed:
* <pre>
* return new LazyIteratorChain<String>() {
* protected Iterator<String> nextIterator(int count) {
diff --git a/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java
index 0719a4459..5d29e24a4 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java
@@ -53,7 +53,7 @@ public class LoopingListIterator<E> implements ResettableListIterator<E> {
* passed in and a reference to it held.
*
* @param list the list to wrap
- * @throws NullPointerException if the list it null
+ * @throws NullPointerException if the list is null
*/
public LoopingListIterator(final List<E> list) {
this.list = Objects.requireNonNull(list, "collection");
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
index 772dc20d3..816d56363 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
@@ -42,7 +42,7 @@ public class ObjectArrayListIterator<E> extends ObjectArrayIterator<E>
/**
* Holds the index of the last item returned by a call to {@code next()}
* or {@code previous()}. This is set to {@code -1} if neither method
- * has yet been invoked. {@code lastItemIndex} is used to to implement the
+ * has yet been invoked. {@code lastItemIndex} is used to implement the
* {@link #set} method.
*/
private int lastItemIndex = -1;
diff --git a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
index 4382e2bc0..cebb6a4e2 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
@@ -44,7 +44,7 @@ import java.util.Objects;
public class PermutationIterator<E> implements Iterator<List<E>> {
/**
- * Permutation is done on theses keys to handle equal objects.
+ * Permutation is done on these keys to handle equal objects.
*/
private final int[] keys;
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
index 0286ea264..b25cd8923 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
@@ -47,7 +47,7 @@ import java.util.Objects;
* @since 3.0
*/
public class MultiKey<K> implements Serializable {
- // This class could implement List, but that would confuse it's purpose
+ // This class could implement List, but that would confuse its purpose
/** Serialisation version */
private static final long serialVersionUID = 4465448607415788805L;
@@ -290,7 +290,7 @@ public class MultiKey<K> implements Serializable {
* This value is computed once and then cached, so elements should not
* change their hash codes once created (note that this is the same
* constraint that would be used if the individual keys elements were
- * themselves {@link java.util.Map Map} keys.
+ * themselves {@link java.util.Map Map} keys).
*
* @return the hash code
*/
diff --git a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
index 75039993e..f27650335 100644
--- a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
@@ -59,7 +59,7 @@ public abstract class AbstractLinkedList<E> implements List<E> {
/**
* A {@link Node} which indicates the start and end of the list and does not
* hold a value. The value of {@code next} is the first item in the
- * list. The value of of {@code previous} is the last item in the list.
+ * list. The value of {@code previous} is the last item in the list.
*/
transient Node<E> header;
@@ -70,7 +70,7 @@ public abstract class AbstractLinkedList<E> implements List<E> {
transient int modCount;
/**
- * Constructor that does nothing intended for deserialization.
+ * Constructor that does nothing (intended for deserialization).
* <p>
* If this constructor is used by a serializable subclass then the init()
* method must be called.
diff --git a/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
index 25b9ff6f1..32bc30afa 100644
--- a/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
@@ -430,7 +430,7 @@ public class CursorableLinkedList<E> extends AbstractLinkedList<E> implements Se
if (current == null && currentRemovedByAnother) { // NOPMD
// quietly ignore, as the last returned node was removed
// by the list or some other iterator
- // by ignoring it, we keep this iterator independent from
+ // by ignoring it, we keep this iterator independent of
// other changes as much as possible
} else {
checkModCount();
diff --git a/src/main/java/org/apache/commons/collections4/list/LazyList.java b/src/main/java/org/apache/commons/collections4/list/LazyList.java
index 7321b322d..928fc68c3 100644
--- a/src/main/java/org/apache/commons/collections4/list/LazyList.java
+++ b/src/main/java/org/apache/commons/collections4/list/LazyList.java
@@ -148,7 +148,7 @@ public class LazyList<E> extends AbstractSerializableListDecorator<E> {
// within bounds, get the object
E object = decorated().get(index);
if (object == null) {
- // item is a place holder, create new one, set and return
+ // item is a placeholder, create new one, set and return
object = element(index);
decorated().set(index, object);
}
diff --git a/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java b/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java
index e7d7742de..9a62f497c 100644
--- a/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java
@@ -154,7 +154,7 @@ public class NodeCachingLinkedList<E> extends AbstractLinkedList<E> implements S
/**
* Adds a node to the cache, if the cache isn't full.
- * The node's contents are cleared to so they can be garbage collected.
+ * The node's contents are cleared so they can be garbage collected.
*
* @param node the node to add to the cache
*/
diff --git a/src/main/java/org/apache/commons/collections4/list/TreeList.java b/src/main/java/org/apache/commons/collections4/list/TreeList.java
index 5544aa017..65ec38995 100644
--- a/src/main/java/org/apache/commons/collections4/list/TreeList.java
+++ b/src/main/java/org/apache/commons/collections4/list/TreeList.java
@@ -528,14 +528,14 @@ public class TreeList<E> extends AbstractList<E> {
}
/**
- * Gets the left node, returning null if its a faedelung.
+ * Gets the left node, returning null if it's a faedelung.
*/
private AVLNode<E> getLeftSubTree() {
return leftIsPrevious ? null : left;
}
/**
- * Gets the right node, returning null if its a faedelung.
+ * Gets the right node, returning null if it's a faedelung.
*/
private AVLNode<E> getRightSubTree() {
return rightIsNext ? null : right;
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
index 41bc14287..e56853554 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
@@ -140,7 +140,7 @@ abstract class AbstractInputCheckedMapDecorator<K, V>
public <T> T[] toArray(final T[] array) {
Object[] result = array;
if (array.length > 0) {
- // we must create a new array to handle multi-threaded situations
+ // we must create a new array to handle multithreaded situations
// where another thread could access data before we decorate it
result = (Object[]) Array.newInstance(array.getClass().getComponentType(), 0);
}
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
index 81e9ce534..ac59468f7 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
@@ -487,7 +487,7 @@ public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V>
}
/**
- * Creates an key set iterator.
+ * Creates a key set iterator.
*
* @return the keySet iterator
*/
@@ -497,7 +497,7 @@ public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V>
}
/**
- * Creates an values iterator.
+ * Creates a values iterator.
*
* @return the values iterator
*/
@@ -948,7 +948,7 @@ public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V>
}
// These two classes store the hashCode of the key of
- // of the mapping, so that after they're dequeued a quick
+ // the mapping, so that after they're dequeued a quick
// lookup of the bucket in the table can occur.
/**
diff --git a/src/main/java/org/apache/commons/collections4/map/CompositeMap.java b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
index 118c3e384..bf44c25a2 100644
--- a/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
@@ -199,7 +199,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser
* @throws ClassCastException if the key is of an inappropriate type for
* this map (optional).
* @throws NullPointerException if the key is {@code null} and this map
- * does not not permit {@code null} keys (optional).
+ * does not permit {@code null} keys (optional).
*/
@Override
public boolean containsKey(final Object key) {
@@ -225,7 +225,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser
* @throws ClassCastException if the value is of an inappropriate type for
* this map (optional).
* @throws NullPointerException if the value is {@code null} and this map
- * does not not permit {@code null} values (optional).
+ * does not permit {@code null} values (optional).
*/
@Override
public boolean containsValue(final Object value) {
@@ -282,7 +282,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser
*
* @throws ClassCastException if the key is of an inappropriate type for
* this map (optional).
- * @throws NullPointerException key is {@code null} and this map does not
+ * @throws NullPointerException key is {@code null} and this map does
* not permit {@code null} keys (optional).
*
* @see #containsKey(Object)
@@ -420,7 +420,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser
* @throws ClassCastException if the key is of an inappropriate type for
* the composited map (optional).
* @throws NullPointerException if the key is {@code null} and the composited map
- * does not not permit {@code null} keys (optional).
+ * does not permit {@code null} keys (optional).
* @throws UnsupportedOperationException if the {@code remove} method is
* not supported by the composited map containing the key
*/
diff --git a/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
index 4b3e65720..b922e5185 100644
--- a/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
@@ -66,7 +66,7 @@ public class PassiveExpiringMap<K, V>
/**
* A {@link org.apache.commons.collections4.map.PassiveExpiringMap.ExpirationPolicy ExpirationPolicy}
- * that returns a expiration time that is a
+ * that returns an expiration time that is a
* constant about of time in the future from the current time.
*
* @param <K> the type of the keys in the map
diff --git a/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
index d8ccb31a7..1662dc634 100644
--- a/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections4.KeyValue;
/**
* A StaticBucketMap is an efficient, thread-safe implementation of
- * {@code java.util.Map} that performs well in in a highly
+ * {@code java.util.Map} that performs well in a highly
* thread-contentious environment. The map supports very efficient
* {@link #get(Object) get}, {@link #put(Object,Object) put},
* {@link #remove(Object) remove} and {@link #containsKey(Object) containsKey}
diff --git a/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
index f919597c6..89a52dd67 100644
--- a/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
+++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
@@ -130,7 +130,7 @@ public final class UnmodifiableEntrySet<K, V>
public <T> T[] toArray(final T[] array) {
Object[] result = array;
if (array.length > 0) {
- // we must create a new array to handle multi-threaded situations
+ // we must create a new array to handle multithreaded situations
// where another thread could access data before we decorate it
result = (Object[]) Array.newInstance(array.getClass().getComponentType(), 0);
}
diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
index 84fe5d5c7..c02fb2f80 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
@@ -166,7 +166,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
}
/**
- * Removes a specific key/value mapping from the multi-valued map.
+ * Removes a specific key/value mapping from the multivalued map.
* <p>
* The value is removed from the collection mapped to the specified key.
* Other values attached to that key are unaffected.
@@ -205,7 +205,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
* {@inheritDoc}
* <p>
* This implementation does <b>not</b> cache the total size
- * of the multi-valued map, but rather calculates it by iterating
+ * of the multivalued map, but rather calculates it by iterating
* over the entries of the underlying map.
*/
@Override
diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java
index 11ac195c3..a86a06d93 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java
@@ -60,7 +60,7 @@ public abstract class AbstractMultiValuedMapDecorator<K, V>
}
/**
- * The decorated multi-valued map.
+ * The decorated multivalued map.
*
* @return the map to decorate
*/
diff --git a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java
index d0a5af862..c06098544 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java
@@ -22,7 +22,7 @@ import org.apache.commons.collections4.MultiSet;
import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
/**
- * Decorates another {@code MultSet} to provide additional behavior.
+ * Decorates another {@code MultiSet} to provide additional behavior.
* <p>
* Methods are forwarded directly to the decorated multiset.
* </p>
diff --git a/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java
index 8002a2a6b..f522897ca 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections4.collection.SynchronizedCollection;
/**
* Decorates another {@link MultiSet} to synchronize its behavior
- * for a multi-threaded environment.
+ * for a multithreaded environment.
* <p>
* Methods are synchronized, then forwarded to the decorated multiset.
* Iterators must be separately synchronized around the loop.
diff --git a/src/main/java/org/apache/commons/collections4/multiset/package-info.java b/src/main/java/org/apache/commons/collections4/multiset/package-info.java
index 014a00330..f40948996 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/package-info.java
@@ -27,7 +27,7 @@
* The following decorators are provided in the package:
* <ul>
* <li>Predicated - ensures that only elements that are valid according to a predicate can be added
- * <li>Synchronized - synchronizes method access for multi-threaded environments
+ * <li>Synchronized - synchronizes method access for multithreaded environments
* <li>Unmodifiable - ensures the multiset cannot be altered
* </ul>
*
diff --git a/src/main/java/org/apache/commons/collections4/properties/AbstractPropertiesFactory.java b/src/main/java/org/apache/commons/collections4/properties/AbstractPropertiesFactory.java
index d278f3017..178828067 100644
--- a/src/main/java/org/apache/commons/collections4/properties/AbstractPropertiesFactory.java
+++ b/src/main/java/org/apache/commons/collections4/properties/AbstractPropertiesFactory.java
@@ -41,7 +41,7 @@ import java.util.Properties;
public abstract class AbstractPropertiesFactory<T extends Properties> {
/**
- * Enumerat5es property formats.
+ * Enumerates property formats.
*
* @since 4.5
*/
diff --git a/src/main/java/org/apache/commons/collections4/queue/SynchronizedQueue.java b/src/main/java/org/apache/commons/collections4/queue/SynchronizedQueue.java
index 0517dbf16..d77b7cc05 100644
--- a/src/main/java/org/apache/commons/collections4/queue/SynchronizedQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/SynchronizedQueue.java
@@ -21,7 +21,7 @@ import java.util.Queue;
import org.apache.commons.collections4.collection.SynchronizedCollection;
/**
- * Decorates another {@link Queue} to synchronize its behavior for a multi-threaded environment.
+ * Decorates another {@link Queue} to synchronize its behavior for a multithreaded environment.
* <p>
* Methods are synchronized, then forwarded to the decorated queue. Iterators must be separately synchronized around the
* loop.
diff --git a/src/main/java/org/apache/commons/collections4/sequence/EditCommand.java b/src/main/java/org/apache/commons/collections4/sequence/EditCommand.java
index 22f63c837..2ee1f5cc5 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/EditCommand.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/EditCommand.java
@@ -73,7 +73,7 @@ public abstract class EditCommand<T> {
/**
* Accept a visitor.
* <p>
- * This method is invoked for each commands belonging to
+ * This method is invoked for each command belonging to
* an {@link EditScript EditScript}, in order to implement the visitor design pattern
*
* @param visitor the visitor to be accepted
diff --git a/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java b/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
index 0e279edc7..813c1d132 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
@@ -156,7 +156,7 @@ public class SequencesComparator<T> {
* Get the middle snake corresponding to two subsequences of the
* main sequences.
* <p>
- * The snake is found using the MYERS Algorithm (this algorithms has
+ * The snake is found using the MYERS Algorithm (this algorithm has
* also been implemented in the GNU diff program). This algorithm is
* explained in Eugene Myers article:
* <a href="https://web.archive.org/web/20040719035900/http%3A//www.cs.arizona.edu/people/gene/PAPERS/diff.ps">
diff --git a/src/main/java/org/apache/commons/collections4/sequence/package-info.java b/src/main/java/org/apache/commons/collections4/sequence/package-info.java
index 43e91cd14..552944130 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/package-info.java
@@ -56,7 +56,7 @@
* to perform the transformation, of course, or to retrieve the longest
* common subsequence for example.
* <p>
- * If the user needs a very fine grained access to the comparison result,
+ * If the user needs a very fine-grained access to the comparison result,
* he needs to go through this script by providing a visitor implementing
* the {@link org.apache.commons.collections4.sequence.CommandVisitor} interface.
* <p>
diff --git a/src/main/java/org/apache/commons/collections4/splitmap/package-info.java b/src/main/java/org/apache/commons/collections4/splitmap/package-info.java
index f407f6f08..edd56e0f9 100644
--- a/src/main/java/org/apache/commons/collections4/splitmap/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/splitmap/package-info.java
@@ -20,7 +20,7 @@
* {@link org.apache.commons.collections4.Get Get} interfaces,
* with <i>differing</i> generic types. This is like a pre-generics
* {@link java.util.Map Map} whose input key/value constraints are
- * different than its output key/value constraints. While it would
+ * different from its output key/value constraints. While it would
* be possible to declare a "split map" with matching input/output
* key/value constraints, this would be a {@link java.util.Map Map}
* and would therefore make little sense (any Commons Collections
diff --git a/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java b/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java
index 714b395c0..999cfa507 100644
--- a/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java
@@ -120,7 +120,7 @@ public abstract class AbstractBitwiseTrie<K, V> extends AbstractMap<K, V>
}
/**
- * An utility method for calling {@link KeyAnalyzer#compare(Object, Object)}
+ * A utility method for calling {@link KeyAnalyzer#compare(Object, Object)}
*/
final boolean compareKeys(final K key, final K other) {
if (key == null) {
diff --git a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
index 9479d7406..eebb6a427 100644
--- a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
@@ -537,8 +537,8 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
final TrieEntry<K, V> child = p.left == h ? p.right : p.left;
// if it was looping to itself previously,
- // it will now be pointed from it's parent
- // (if we aren't removing it's parent --
+ // it will now be pointed from its parent
+ // (if we aren't removing its parent --
// in that case, it remains looping to itself).
// otherwise, it will continue to have the same
// predecessor.
@@ -1381,7 +1381,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
/**
- * This is a entry set view of the {@link org.apache.commons.collections4.Trie} as returned by {@link Map#entrySet()}.
+ * This is an entry set view of the {@link org.apache.commons.collections4.Trie} as returned by {@link Map#entrySet()}.
*/
private class EntrySet extends AbstractSet<Map.Entry<K, V>> {
diff --git a/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java b/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java
index be5774e2e..6ea3af0f6 100644
--- a/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java
@@ -45,7 +45,7 @@ public class UnmodifiableTrie<K, V> implements Trie<K, V>, Serializable, Unmodif
private final Trie<K, V> delegate;
/**
- * Factory method to create a unmodifiable trie.
+ * Factory method to create an unmodifiable trie.
*
* @param <K> the key type
* @param <V> the value type
diff --git a/src/site/xdoc/compatibility.xml b/src/site/xdoc/compatibility.xml
index 5a9fc6205..3be269041 100644
--- a/src/site/xdoc/compatibility.xml
+++ b/src/site/xdoc/compatibility.xml
@@ -68,7 +68,7 @@ changes were deliberate and have not caused any known issues.)
<p>
It is not possible to make v2.1 and v3.0 compatible without further binary incompatibility.
-The chosen solution is to provide a work around by releasing v2.1.1 and v3.1.
+The chosen solution is to provide a workaround by releasing v2.1.1 and v3.1.
The following deprecations must be resolved in v2.1.1 to allow compatibility with v3.1.
</p>
<ul>
diff --git a/src/site/xdoc/history.xml b/src/site/xdoc/history.xml
index fb19a53f3..a9335a90c 100644
--- a/src/site/xdoc/history.xml
+++ b/src/site/xdoc/history.xml
@@ -60,7 +60,7 @@ Thus there were now three packages, main, comparator and iterator.
</p>
<p>
-<b>Collections 3.0</b> represented a re-birth of collections after an 18 month absence.
+<b>Collections 3.0</b> represented a re-birth of collections after an 18-month absence.
Many, many classes were added to CVS but not released including primitive and
event-generating classes. In order to control the size of the collections distribution,
these became two new projects - primitives and events.
@@ -90,7 +90,7 @@ This patch was created as a work around, enabling 2.1.1 to be compatible with 3.
<p>
<b>Collections 3.1</b> fixed some bugs in 3.0 and adds a few new enhancements.
-The most notable change is a new list implementation, TreeList, that is well balanced for insertions and removals at any index.
+The most notable change is a new list implementation, TreeList, that is well-balanced for insertions and removals at any index.
Other changes included more classes implementing Serializable and a ReferenceIdentityMap.
</p>
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index 45704c998..2385faad8 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -152,7 +152,7 @@ limitations under the License.
<td>
<strong>Commons Commits List</strong>
<br /><br />
- Only for e-mails automatically generated by the <a href="scm.html">source control</a> sytem.
+ Only for e-mails automatically generated by the <a href="scm.html">source control</a> system.
<br /><br />
</td>
<td><a href="mailto:commits-subscribe@commons.apache.org">Subscribe</a></td>
diff --git a/src/site/xdoc/pick.xml b/src/site/xdoc/pick.xml
index 736af561e..e53e656f2 100644
--- a/src/site/xdoc/pick.xml
+++ b/src/site/xdoc/pick.xml
@@ -168,7 +168,7 @@ The <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html">Map</
</tr>
<tr>
<td><a href="https://commons.apache.org/proper/commons-collections/javadocs/api-4.4/org/apache/commons/collections4/map/StaticBucketMap.html">StaticBucketMap</a></td>
-<td>This map is optimised to work well in a heavily loaded multi-threaded environment. It provides synchronization internally, locking on a per 'bucket' basis, where the buckets are fixed at construction time. You should use this class if you can predict the size of the map and you are working in a very intensive multi-threaded environment.</td>
+<td>This map is optimised to work well in a heavily loaded multithreaded environment. It provides synchronization internally, locking on a per 'bucket' basis, where the buckets are fixed at construction time. You should use this class if you can predict the size of the map and you are working in a very intensive multithreaded environment.</td>
</tr>
</table>
</p>
diff --git a/src/site/xdoc/release_3_2.xml b/src/site/xdoc/release_3_2.xml
index 3ba50548e..3c1d10673 100644
--- a/src/site/xdoc/release_3_2.xml
+++ b/src/site/xdoc/release_3_2.xml
@@ -48,7 +48,7 @@ Please check the bug fixes to ensure you weren't relying on the behavior of a bu
There are two new <i>deprecations</i>:<br />
BeanMap is now deprecated and will be removed in 4.0.
The class is now available in commons-beanutils (full jar version).
-This change was made to ensure that all bean related collections were in one place (ie. beanutils).
+This change was made to ensure that all bean related collections were in one place (i.e. beanutils).
If this causes major headaches to anyone please contact commons-dev at jakarta.apache.org.
</p>
<p>
@@ -73,13 +73,13 @@ If this causes major headaches to anyone please contact commons-dev at jakarta.a
<ul>
<li>CollectionUtils.addIgnoreNull - Adds to the collection if the value being added is not null [30020]</li>
<li>MapUtils.putAll - Puts an array of key/value pairs into a map [30882]</li>
-<li>CollectionUtils/MapUtils.isEmpty/isNotEmpty - Null-safe checks of collection emptyness [35890]</li>
+<li>CollectionUtils/MapUtils.isEmpty/isNotEmpty - Null-safe checks of collection emptiness [35890]</li>
<li>CollectionUtils.sizeIsEmpty - Checks if a collection, array, map, iterator or enumeration is empty</li>
-<li>CollectionUtils/ListUtils - retainAll/removeAll that don't change original colllection</li>
+<li>CollectionUtils/ListUtils - retainAll/removeAll that don't change original collection</li>
<li>ExtendedProperties - Accepts List elements (does not enforce Vector) as values [36812]</li>
<li>ExtendedProperties - new Methods getList(String key) and getList(String key, List defaults) [36812]</li>
<li>ExtendedProperties - No longer uses an exception in normal processing [30497]</li>
-<li>BlockingBuffer - now includes stack trace if InterupttedException occurs [33700]</li>
+<li>BlockingBuffer - now includes stack trace if InterruptedException occurs [33700]</li>
<li>BlockingBuffer - new methods that allow get and remove with a timeout, updated BufferUtils to match [27691]</li>
<li>BlockingBuffer - now allows you to specify a default timeout value for get/remove operations [37607]</li>
<li>TransformedMap/TransformedSortedMap - new factory decorateTransform() that transforms any existing entries in the map [30959]</li>
@@ -88,7 +88,7 @@ If this causes major headaches to anyone please contact commons-dev at jakarta.a
<li>ListOrderedMap - additional method, put(int,Object,Object)</li>
<li>PriorityBuffer - now Serializable [36163]</li>
<li>ListIteratorWrapper - now implements ResettableListIterator [39449]</li>
-<li>IfClosure - add single argument constructor, updated CllosureUtils to match [38495]</li>
+<li>IfClosure - add single argument constructor, updated ClosureUtils to match [38495]</li>
<li>All/Any/One/None Predicate - allow construction with zero or one predicates [37979]</li>
</ul>
@@ -102,8 +102,8 @@ If this causes major headaches to anyone please contact commons-dev at jakarta.a
<li>SetUniqueList.set(int,Object) - Destroyed set status in certain circumstances [33294]</li>
<li>AbstractLinkedMap.init() - Now calls createEntry() to create the map entry object [33706]</li>
<li>AbstractHashedMap deserialization - Fix to prevent doubling of internal data array [34265]</li>
-<li>AbstractHashedMap initialization - Fix to setup threshold correctly, improving performance [35012]</li>
-<li>BeanMap.initialize() - Internal variable now correctly initialised with only write methods that actually exist [15895]</li>
+<li>AbstractHashedMap initialization - Fix to set up threshold correctly, improving performance [35012]</li>
+<li>BeanMap.initialize() - Internal variable now correctly initialized with only write methods that actually exist [15895]</li>
<li>MultiHashMap.remove(key, item) - Was returning the item even when nothing was removed [32366]</li>
<li>MultiHashMap.putAll(multimap) - Was adding the collection as a single item rather than individually [35631]</li>
<li>MultiHashMap - Enable compilation using J#</li>
@@ -114,7 +114,7 @@ If this causes major headaches to anyone please contact commons-dev at jakarta.a
<li>BoundedFifoBuffer/CircularFifoBuffer - Fix serialization to work in case where buffer serialized when full [31433]</li>
<li>BoundedFifoBuffer - Fix iterator remove bug causing ArrayIndexOutOfBounds error [33071]</li>
<li>UnboundedFifoBuffer - Fix iterator remove bug causing ArrayIndexOutOfBounds error [35733]</li>
-<li>UnboundedFifoBuffer - Fix deserialization to work with subsequant object manipulation [35763]</li>
+<li>UnboundedFifoBuffer - Fix deserialization to work with subsequent object manipulation [35763]</li>
<li>BlockingBuffer - Fix internal locking code (internal fix, no effect on users of BlockingBuffer) [37028]</li>
<li>IteratorChain.remove() - Fix to avoid IllegalStateException when one of the underlying iterators is a FilterIterator [34267]</li>
<li>FilterIterator - Correctly handle setting of iterator and predicate after object creation [38074]</li>
diff --git a/src/site/xdoc/release_3_2_1.xml b/src/site/xdoc/release_3_2_1.xml
index 394bf7e6c..3cc2b2dca 100644
--- a/src/site/xdoc/release_3_2_1.xml
+++ b/src/site/xdoc/release_3_2_1.xml
@@ -34,7 +34,7 @@ This project is Java 1.2 compatible, and does not use Java 5 generics.
</p>
<p>
This 3.2.1 release is simply a re-packaging of the 3.2 release, with appropriate
-OSGi meta data added to the jar's manifest file.
+OSGi metadata added to the jar's manifest file.
</p>
<hr />
diff --git a/src/site/xdoc/release_3_2_2.xml b/src/site/xdoc/release_3_2_2.xml
index f6e754800..374eb9f70 100644
--- a/src/site/xdoc/release_3_2_2.xml
+++ b/src/site/xdoc/release_3_2_2.xml
@@ -38,7 +38,7 @@ disabled and will result in an exception when either trying to serialize or de-s
an instance of these classes. For more details, please refer to COLLECTIONS-580.
</p>
<p>
-All users are strongly encouraged to updated to this release.
+All users are strongly encouraged to update to this release.
</p>
<h3>Compatibility</h3>
diff --git a/src/site/xdoc/release_4_0.xml b/src/site/xdoc/release_4_0.xml
index ba57040e9..f5b0fc1c4 100644
--- a/src/site/xdoc/release_4_0.xml
+++ b/src/site/xdoc/release_4_0.xml
@@ -106,7 +106,7 @@ have changed.
<li>PermutationIterator - generates unordered permutations of a collection. Thanks to Benoit Corne.</li>
<li>SequencesComparator - an implementation of Eugene Myers difference algorithm in package o.a.c.c.sequence. Thanks to Jordane Sarda.</li>
<li>LazyIteratorChain - a variant of IteratorChain which supports lazy initialization. Thanks to Jeff Rodriguez.</li>
-<li>NodeListIterator - supports iteration over a org.w3c.dom.NodeList. Thanks to Thomas Vahrst.</li>
+<li>NodeListIterator - supports iteration over an org.w3c.dom.NodeList. Thanks to Thomas Vahrst.</li>
<li>CatchAndRethrowClosure - re-throws any checked exception as unchecked "FunctorException". Thanks to David J. M. Karlsen.</li>
<li>IndexedCollection - collection decorator which provides a map-like view on an existing collection. Thanks to Stephen Kestle.</li>
<li>DualLinkedHashBidiMap - bidi map implementation using LinkedHashMap instances. Thanks to Nathan Blomquist.</li>
@@ -211,7 +211,7 @@ have changed.
<li>Improved performance of "AbstractMapBag#containsAll(Collection)" by returning immediately after a difference has been found. Thanks to Adrian Nistor.</li>
<li>Added additional clarification to javadoc of interface "Put" wrt return type of "put(Object, Object)" method. Thanks to Matt Benson, sebb.</li>
<li>Tree traversal with a TreeListIterator will not be affected anymore by the removal of an element directly after a call to previous(). Thanks to Jeffrey Barnes.</li>
-<li>Adapt and/or ignore several unit tests when run on a IBM J9 VM (specification version 1.6.0) due to a faulty "java.util.TreeMap" implementation.</li>
+<li>Adapt and/or ignore several unit tests when run on an IBM J9 VM (specification version 1.6.0) due to a faulty "java.util.TreeMap" implementation.</li>
<li>SetUniqueList.set(int, E) now works correctly if the object to be inserted is already placed at the given position. Thanks to Thomas Vahrst, John Vasileff.</li>
<li>MultiKeyMap.clone() now correctly calls super.clone(). Thanks to Thomas Vahrst.</li>
<li>Improve performance of "TreeList#addAll" and "TreeList(Collection)" by converting the input collection into an AVL tree and efficiently merge it into the existing tree. Thanks to Jeffrey Barnes.</li>
@@ -262,7 +262,7 @@ have changed.
<li>Use of final keyword where applicable, minor performance improvements by properly initializing the capacity of newly created collections when known in advance. Thanks to Peter Lawrey, Gary Gregory.</li>
<li>"SetUniqueList#subList()#contains(Object)" will now correctly check the subList rather than the parent list. Thanks to Christian Semrau.</li>
<li>"SetUniqueList#set(int, Object)" will now correctly enforce the uniqueness constraint. Thanks to Rafał Figas,Bjorn Townsend.</li>
-<li>Improved javadoc for "Unmodifiable*" classes wrt behavior when the users tries to modify the collection. Thanks to Emmanuel Bourg.</li>
+<li>Improved javadoc for "Unmodifiable*" classes wrt behavior when the user tries to modify the collection. Thanks to Emmanuel Bourg.</li>
<li>"CaseInsensitiveMap" will now convert input strings to lower-case in a locale-independent manner. Thanks to Benjamin Bentmann.</li>
<li>Fixed javadoc for "ListUtils#transformedList(List)" to clarify that existing objects in the list are not transformed. Thanks to Paul Benedict.</li>
<li>"MultiKey" will now be correctly serialized/de-serialized. Thanks to Joerg Schaible.</li>
diff --git a/src/site/xdoc/release_4_1.xml b/src/site/xdoc/release_4_1.xml
index 8a16f2026..4d5e886e5 100644
--- a/src/site/xdoc/release_4_1.xml
+++ b/src/site/xdoc/release_4_1.xml
@@ -37,7 +37,7 @@ completely removed (classes do not implement the Serializable interface anymore)
For more details, please refer to COLLECTIONS-580.
</p>
<p>
-All users are strongly encouraged to updated to this release.
+All users are strongly encouraged to update to this release.
</p>
<h3>Compatibility</h3>
diff --git a/src/site/xdoc/release_4_2.xml b/src/site/xdoc/release_4_2.xml
index 6b04cd932..2990411e5 100644
--- a/src/site/xdoc/release_4_2.xml
+++ b/src/site/xdoc/release_4_2.xml
@@ -33,7 +33,7 @@ This 4.2 release is a minor and updates the platform requirement from Java 6 to
This release fixes several bugs present in previous releases of the 4.X branch.
</p>
<p>
-All users are strongly encouraged to updated to this release.
+All users are strongly encouraged to update to this release.
</p>
<h3>Compatibility</h3>
diff --git a/src/site/xdoc/release_4_3.xml b/src/site/xdoc/release_4_3.xml
index a147dba4e..3bfd09470 100644
--- a/src/site/xdoc/release_4_3.xml
+++ b/src/site/xdoc/release_4_3.xml
@@ -33,7 +33,7 @@ This 4.3 release is a minor and updates the platform requirement from Java 7 to
This release fixes several bugs present in previous releases of the 4.X branch.
</p>
<p>
-All users are strongly encouraged to updated to this release.
+All users are strongly encouraged to update to this release.
</p>
<h3>Compatibility</h3>
diff --git a/src/site/xdoc/release_4_4.xml b/src/site/xdoc/release_4_4.xml
index a5e8d09fe..0e418c04f 100644
--- a/src/site/xdoc/release_4_4.xml
+++ b/src/site/xdoc/release_4_4.xml
@@ -33,7 +33,7 @@ This 4.4 release is a minor and requires Java 8.
This release fixes several bugs present in previous releases of the 4.x branch.
</p>
<p>
-All users are strongly encouraged to updated to this release.
+All users are strongly encouraged to update to this release.
</p>
<h3>Compatibility</h3>
diff --git a/src/site/xdoc/security-reports.xml b/src/site/xdoc/security-reports.xml
index 2e2e8322b..ab3a746b5 100644
--- a/src/site/xdoc/security-reports.xml
+++ b/src/site/xdoc/security-reports.xml
@@ -106,7 +106,7 @@
</subsection>
</section>
- <section name="Errors and Ommissions">
+ <section name="Errors and Omissions">
<p>Please report any errors or omissions to <a
href="mail-lists.html">the dev mailing list</a>.</p>
</section>
diff --git a/src/site/xdoc/userguide.xml b/src/site/xdoc/userguide.xml
index 77d216143..1deff1ce4 100644
--- a/src/site/xdoc/userguide.xml
+++ b/src/site/xdoc/userguide.xml
@@ -53,7 +53,7 @@ multithreaded application.
<p>
The class level javadocs should indicate whether a particular
implementation is safe for multithreaded access without additional
-synchronization. Where there is no expicit indication that the implementation
+synchronization. Where there is no explicit indication that the implementation
is thread safe then it should be assumed that synchronization is required.
Please report the missing documentation to the commons development team.
</p>
@@ -122,7 +122,7 @@ map.nextKey("SIX"); // returns "SEVEN"
<p>
A new interface hierarchy has been added to support bidirectional maps - <code>BidiMap.</code>
-These represent maps where the key can lookup the value and the value can lookup the key with equal ease.
+These represent maps where the key can lookup the value and the value can look up the key with equal ease.
</p>
<source>
BidiMap bidi = new TreeBidiMap();
diff --git a/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
index 9c63cd9e7..eebd01345 100644
--- a/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
+++ b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
@@ -170,8 +170,8 @@ public abstract class AbstractObjectTest extends BulkTest {
public void testSimpleSerialization() throws Exception {
final Object o = makeObject();
if (o instanceof Serializable && isTestSerialization()) {
- final byte[] objekt = writeExternalFormToBytes((Serializable) o);
- readExternalFormFromBytes(objekt);
+ final byte[] object = writeExternalFormToBytes((Serializable) o);
+ readExternalFormFromBytes(object);
}
}
diff --git a/src/test/java/org/apache/commons/collections4/BulkTest.java b/src/test/java/org/apache/commons/collections4/BulkTest.java
index 34a747aa5..bc3ddb44e 100644
--- a/src/test/java/org/apache/commons/collections4/BulkTest.java
+++ b/src/test/java/org/apache/commons/collections4/BulkTest.java
@@ -31,8 +31,8 @@ import junit.framework.TestSuite;
* A {@link TestCase} that can define both simple and bulk test methods.
* <p>
* A <I>simple test method</I> is the type of test traditionally
- * supplied by by {@link TestCase}. To define a simple test, create a public
- * no-argument method whose name starts with "test". You can specify the
+ * supplied by {@link TestCase}. To define a simple test, create a public
+ * no-argument method whose name starts with "test". You can specify
* the name of simple test in the constructor of {@code BulkTest};
* a subsequent call to {@link TestCase#run} will run that simple test.
* <p>
diff --git a/src/test/java/org/apache/commons/collections4/ListUtilsTest.java b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
index 12d552584..04b9a190e 100644
--- a/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
@@ -123,7 +123,7 @@ public class ListUtilsTest {
}
/**
- * Tests the {@code indexOf} method in {@code ListUtils} class..
+ * Tests the {@code indexOf} method in {@code ListUtils} class.
*/
@Test
public void testIndexOf() {
@@ -165,7 +165,7 @@ public class ListUtilsTest {
}
/**
- * Tests intersecting a non-empty list with an subset of itself.
+ * Tests intersecting a non-empty list with a subset of itself.
*/
@Test
public void testIntersectListWithNoOverlapAndDifferentTypes() {
@@ -183,7 +183,7 @@ public class ListUtilsTest {
}
/**
- * Tests intersecting a non-empty list with an subset of itself.
+ * Tests intersecting a non-empty list with a subset of itself.
*/
@Test
public void testIntersectNonEmptySubset() {
diff --git a/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java b/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java
index d5d6e080b..0085ae5c2 100644
--- a/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java
@@ -135,7 +135,7 @@ public class SplitMapUtilsTest {
map.put("new", "66");
assertEquals(++sz, backingMap.size());
- // putall
+ // putAll
final Map<String, String> more = new HashMap<>();
more.put("foo", "77");
more.put("bar", "88");
diff --git a/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
index f1fa526f6..fc2040ed4 100644
--- a/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
@@ -43,18 +43,18 @@ public abstract class AbstractSortedBagTest<T> extends AbstractBagTest<T> {
// Check that iterator returns elements in order and first() and last()
// are consistent
- final Iterator<T> colliter = getCollection().iterator();
- final Iterator<T> confiter = getConfirmed().iterator();
+ final Iterator<T> collIter = getCollection().iterator();
+ final Iterator<T> confIter = getConfirmed().iterator();
T first = null;
T last = null;
- while (colliter.hasNext()) {
+ while (collIter.hasNext()) {
if (first == null) {
- first = colliter.next();
+ first = collIter.next();
last = first;
} else {
- last = colliter.next();
+ last = collIter.next();
}
- assertEquals("Element appears to be out of order.", last, confiter.next());
+ assertEquals("Element appears to be out of order.", last, confIter.next());
}
if (!getCollection().isEmpty()) {
assertEquals("Incorrect element returned by first().", first,
diff --git a/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
index 82a165720..908bb42de 100644
--- a/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
@@ -68,7 +68,7 @@ public class PredicatedBagTest<T> extends AbstractBagTest<T> {
@Test
@SuppressWarnings("unchecked")
- public void testlegalAddRemove() {
+ public void testLegalAddRemove() {
final Bag<T> bag = makeTestBag();
assertEquals(0, bag.size());
final T[] els = (T[]) new Object[] { "1", "3", "5", "7", "2", "4", "1" };
diff --git a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
index 7add04653..9cb9172c9 100644
--- a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
@@ -395,7 +395,7 @@ public abstract class AbstractCollectionTest<E> extends AbstractObjectTest {
* Returns an array of objects that are contained in a collection
* produced by {@link #makeFullCollection()}. Every element in the
* returned array <I>must</I> be an element in a full collection.<P>
- * The default implementation returns a heterogenous array of
+ * The default implementation returns a heterogeneous array of
* objects with some duplicates. null is added if allowed.
* Override if you require specific testing elements. Note that if you
* override {@link #makeFullCollection()}, you <I>must</I> override
@@ -415,7 +415,7 @@ public abstract class AbstractCollectionTest<E> extends AbstractObjectTest {
* Returns an array of elements that are <I>not</I> contained in a
* full collection. Every element in the returned array must
* not exist in a collection returned by {@link #makeFullCollection()}.
- * The default implementation returns a heterogenous array of elements
+ * The default implementation returns a heterogeneous array of elements
* without null. Note that some of the tests add these elements
* to an empty or full collection, so if your collection restricts
* certain kinds of elements, you should override this method.
@@ -480,7 +480,7 @@ public abstract class AbstractCollectionTest<E> extends AbstractObjectTest {
* Returns a list of string elements suitable for return by
* {@link #getFullElements()}. Override getFullElements to return
* the results of this method if your collection does not support
- * heterogenous elements or the null element.
+ * heterogeneous elements or the null element.
*/
public Object[] getFullNonNullStringElements() {
return new Object[] {
@@ -493,7 +493,7 @@ public abstract class AbstractCollectionTest<E> extends AbstractObjectTest {
* Returns a list of string elements suitable for return by
* {@link #getOtherElements()}. Override getOtherElements to return
* the results of this method if your collection does not support
- * heterogenous elements or the null element.
+ * heterogeneous elements or the null element.
*/
public Object[] getOtherNonNullStringElements() {
return new Object[] {
diff --git a/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java b/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java
index 75988486d..0b87e516b 100644
--- a/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java
@@ -95,7 +95,7 @@ public class ComparatorChainTest extends AbstractComparatorTest<ComparatorChainT
}
@Test
- public void testComparatorChainOnMinvaluedCompatator() {
+ public void testComparatorChainOnMinValuedComparator() {
// -1 * Integer.MIN_VALUE is less than 0,
// test that ComparatorChain handles this edge case correctly
final ComparatorChain<Integer> chain = new ComparatorChain<>();
diff --git a/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java
index 8be79d227..7c6a99bf9 100644
--- a/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java
@@ -43,7 +43,7 @@ public class ReverseComparatorTest extends AbstractComparatorTest<Integer> {
* Comparator. The resulting comparator should
* sort according to natural Order. (Note: we wrap
* a Comparator taken from the JDK so that we can
- * save a "canonical" form in SCM.
+ * save a "canonical" form in SCM).
*
* @return Comparator that returns "natural" order
*/
diff --git a/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
index b2c03ffa7..b0172f218 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
@@ -63,7 +63,7 @@ public class FilterIteratorTest<E> extends AbstractIteratorTest<E> {
}
/**
- * Returns an full iterator wrapped in a
+ * Returns a full iterator wrapped in a
* FilterIterator that blocks all the elements
*
* @return "empty" FilterIterator
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java
index 610ae52d2..191d34b56 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertThrows;
/**
- * Tests the ListIteratorWrapper to insure that it behaves as expected when wrapping a ListIterator.
+ * Tests the ListIteratorWrapper to ensure that it behaves as expected when wrapping a ListIterator.
*/
public class ListIteratorWrapper2Test<E> extends AbstractIteratorTest<E> {
@@ -190,7 +190,7 @@ public class ListIteratorWrapper2Test<E> extends AbstractIteratorTest<E> {
assertEquals("First element should be the same", first, iter.next());
assertEquals("Second element should be the same", second, iter.next());
- // after passing the point, where we resetted, continuation should work as expected
+ // after passing the point, where we reset, continuation should work as expected
for (int i = 2; i < testArray.length; i++) {
final Object testValue = testArray[i];
final E iterValue = iter.next();
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java
index b986d22f0..20cbebe0a 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
- * Tests the ListIteratorWrapper to insure that it simulates
+ * Tests the ListIteratorWrapper to ensure that it simulates
* a ListIterator correctly.
*/
public class ListIteratorWrapperTest<E> extends AbstractIteratorTest<E> {
@@ -212,7 +212,7 @@ public class ListIteratorWrapperTest<E> extends AbstractIteratorTest<E> {
assertEquals("First element should be the same", first, iter.next());
assertEquals("Second element should be the same", second, iter.next());
- // after passing the point, where we resetted, continuation should work as expected
+ // after passing the point, where we reset, continuation should work as expected
for (int i = 2; i < testArray.length; i++) {
final Object testValue = testArray[i];
final E iterValue = iter.next();
diff --git a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
index 607dc1060..cfc85fe3e 100644
--- a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
@@ -285,7 +285,7 @@ public abstract class AbstractListTest<E> extends AbstractCollectionTest<E> {
list2 = Arrays.asList(getFullElements());
if (list2.size() < 2 && isAddSupported()) {
- // main list is only size 1, so lets add other elements to get a better list
+ // main list is only size 1, so let's add other elements to get a better list
list.addAll(Arrays.asList(getOtherElements()));
getConfirmed().addAll(Arrays.asList(getOtherElements()));
list2 = new ArrayList<>(list2);
diff --git a/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
index bf94a1a1f..3e906bab0 100644
--- a/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
@@ -1432,8 +1432,8 @@ public class CursorableLinkedListTest<E> extends AbstractLinkedListTest<E> {
out.flush();
out.close();
- final java.io.ByteArrayInputStream bufin = new java.io.ByteArrayInputStream(buf.toByteArray());
- final java.io.ObjectInputStream in = new java.io.ObjectInputStream(bufin);
+ final java.io.ByteArrayInputStream bufIn = new java.io.ByteArrayInputStream(buf.toByteArray());
+ final java.io.ObjectInputStream in = new java.io.ObjectInputStream(bufIn);
final Object list2 = in.readObject();
assertNotSame(list, list2);
diff --git a/src/test/java/org/apache/commons/collections4/list/TreeListTest.java b/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
index 88f59a616..a18ebcbc4 100644
--- a/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
@@ -228,7 +228,7 @@ public class TreeListTest<E> extends AbstractListTest<E> {
treelist.add(Integer.valueOf(3));
treelist.add(Integer.valueOf(4));
- // this cause inconsistence of ListIterator()
+ // this cause inconsistency in ListIterator()
treelist.remove(objectToRemove);
final ListIterator<Integer> li = treelist.listIterator();
diff --git a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
index ea28f3d40..0fbf5a573 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
@@ -342,7 +342,7 @@ public abstract class AbstractMapTest<K, V> extends AbstractObjectTest {
* {@link #getOtherKeys()} or {@link #getOtherValues}.
*
* <p>Override getOtherElements to return the results of this method if your
- * collection does not support heterogenous elements or the null element.
+ * collection does not support heterogeneous elements or the null element.
* </p>
*/
public Object[] getOtherNonNullStringElements() {
@@ -374,7 +374,7 @@ public abstract class AbstractMapTest<K, V> extends AbstractObjectTest {
}
/**
- * Returns a the set of values that can be used to replace the values
+ * Returns a set of values that can be used to replace the values
* returned from {@link #getSampleValues()}. This method must return an
* array with the same length as {@link #getSampleValues()}. The values
* returned from this method should not be the same as those returned from
@@ -604,7 +604,7 @@ public abstract class AbstractMapTest<K, V> extends AbstractObjectTest {
}
/**
- * Tests {@link Map#clear()}. If the map {@link #isRemoveSupported()}
+ * Tests {@link Map#clear()}. If the map {@link #isRemoveSupported()
* can add and remove elements}, then {@link Map#size()} and
* {@link Map#isEmpty()} are used to ensure that map has no elements after
* a call to clear. If the map does not support adding and removing
diff --git a/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java b/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
index 6c3812880..2d23384a6 100644
--- a/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
@@ -487,7 +487,7 @@ public class MultiValueMapTest<K, V> extends AbstractObjectTest {
final Map<?, ?> map2 = (Map<?, ?>) readExternalFormFromDisk(getCanonicalFullCollectionName(map));
assertEquals("Map is the right size", map.size(), map2.size());
for (final Object key : map.keySet()) {
- assertEquals( "Map had inequal elements", map.get(key), map2.get(key) );
+ assertEquals( "Map had unequal elements", map.get(key), map2.get(key) );
map2.remove(key);
}
assertEquals("Map had extra values", 0, map2.size());
diff --git a/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java b/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
index acb508324..2420255ed 100644
--- a/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
@@ -44,7 +44,7 @@ public class SingletonMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
@Override
public OrderedMap<K, V> makeObject() {
- // need an empty singleton map, but thats not possible
+ // need an empty singleton map, but that's not possible
// use a ridiculous fake instead to make the tests pass
return UnmodifiableOrderedMap.unmodifiableOrderedMap(ListOrderedMap.listOrderedMap(new HashMap<K, V>()));
}
@@ -52,7 +52,7 @@ public class SingletonMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
@Override
public String[] ignoredTests() {
// the ridiculous map above still doesn't pass these tests
- // but its not relevant, so we ignore them
+ // but it's not relevant, so we ignore them
return new String[] {
"SingletonMapTest.bulkTestMapIterator.testEmptyMapIterator",
"SingletonMapTest.bulkTestOrderedMapIterator.testEmptyMapIterator",
diff --git a/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java b/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
index 765d5c72b..1cfb5c1e8 100644
--- a/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
@@ -78,12 +78,12 @@ public abstract class AbstractNavigableSetTest<E> extends AbstractSortedSetTest<
// Check that descending iterator returns elements in order and higher(), lower(),
// floor() and ceiling() are consistent
- final Iterator<E> colliter = getCollection().descendingIterator();
- final Iterator<E> confiter = getConfirmed().descendingIterator();
- while (colliter.hasNext()) {
- final E element = colliter.next();
- final E confelement = confiter.next();
- assertEquals("Element appears to be out of order.", confelement, element);
+ final Iterator<E> collIter = getCollection().descendingIterator();
+ final Iterator<E> confIter = getConfirmed().descendingIterator();
+ while (collIter.hasNext()) {
+ final E element = collIter.next();
+ final E confElement = confIter.next();
+ assertEquals("Element appears to be out of order.", confElement, element);
assertEquals("Incorrect element returned by higher().", getConfirmed().higher(element),
getCollection().higher(element));
@@ -137,9 +137,9 @@ public abstract class AbstractNavigableSetTest<E> extends AbstractSortedSetTest<
public BulkTest bulkTestNavigableSetSubSet() {
final int length = getFullElements().length;
- final int lobound = length / 3;
- final int hibound = lobound * 2;
- return new TestNavigableSetSubSet(lobound, hibound, false);
+ final int loBound = length / 3;
+ final int hiBound = loBound * 2;
+ return new TestNavigableSetSubSet(loBound, hiBound, false);
}
/**
@@ -153,9 +153,9 @@ public abstract class AbstractNavigableSetTest<E> extends AbstractSortedSetTest<
public BulkTest bulkTestNavigableSetHeadSet() {
final int length = getFullElements().length;
- final int lobound = length / 3;
- final int hibound = lobound * 2;
- return new TestNavigableSetSubSet(hibound, true, true);
+ final int loBound = length / 3;
+ final int hiBound = loBound * 2;
+ return new TestNavigableSetSubSet(hiBound, true, true);
}
/**
@@ -168,8 +168,8 @@ public abstract class AbstractNavigableSetTest<E> extends AbstractSortedSetTest<
*/
public BulkTest bulkTestNavigableSetTailSet() {
final int length = getFullElements().length;
- final int lobound = length / 3;
- return new TestNavigableSetSubSet(lobound, false, false);
+ final int loBound = length / 3;
+ return new TestNavigableSetSubSet(loBound, false, false);
}
public class TestNavigableSetSubSet extends AbstractNavigableSetTest<E> {
@@ -199,33 +199,33 @@ public abstract class AbstractNavigableSetTest<E> extends AbstractSortedSetTest<
type = TYPE_TAILSET;
m_Inclusive = inclusive;
lowBound = bound;
- final Object[] allelements = AbstractNavigableSetTest.this.getFullElements();
+ final Object[] allElements = AbstractNavigableSetTest.this.getFullElements();
final int realBound = inclusive ? bound : bound + 1;
- fullElements = (E[]) new Object[allelements.length - realBound];
- System.arraycopy(allelements, realBound, fullElements, 0, allelements.length - realBound);
- otherElements = (E[]) new Object[allelements.length - bound - 1];
+ fullElements = (E[]) new Object[allElements.length - realBound];
+ System.arraycopy(allElements, realBound, fullElements, 0, allElements.length - realBound);
+ otherElements = (E[]) new Object[allElements.length - bound - 1];
System.arraycopy(//src src_pos dst dst_pos length
- AbstractNavigableSetTest.this.getOtherElements(), bound, otherElements, 0, allelements.length - bound - 1);
+ AbstractNavigableSetTest.this.getOtherElements(), bound, otherElements, 0, allElements.length - bound - 1);
}
} //type
@SuppressWarnings("unchecked")
- public TestNavigableSetSubSet(final int lobound, final int hibound, final boolean inclusive) {
+ public TestNavigableSetSubSet(final int loBound, final int hiBound, final boolean inclusive) {
super("TestNavigableSetSubSet");
type = TYPE_SUBSET;
- lowBound = lobound;
- highBound = hibound;
+ lowBound = loBound;
+ highBound = hiBound;
m_Inclusive = inclusive;
- final int fullLoBound = inclusive ? lobound : lobound + 1;
- final int length = hibound - lobound + 1 - (inclusive ? 0 : 2);
+ final int fullLoBound = inclusive ? loBound : loBound + 1;
+ final int length = hiBound - loBound + 1 - (inclusive ? 0 : 2);
fullElements = (E[]) new Object[length];
System.arraycopy(AbstractNavigableSetTest.this.getFullElements(), fullLoBound, fullElements, 0, length);
- final int otherLength = hibound - lobound;
+ final int otherLength = hiBound - loBound;
otherElements = (E[]) new Object[otherLength - 1];
System.arraycopy(//src src_pos dst dst_pos length
- AbstractNavigableSetTest.this.getOtherElements(), lobound, otherElements, 0, otherLength - 1);
+ AbstractNavigableSetTest.this.getOtherElements(), loBound, otherElements, 0, otherLength - 1);
}
@Override
diff --git a/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
index 1f8fd4cfb..b8ed7af14 100644
--- a/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
@@ -53,18 +53,18 @@ public abstract class AbstractSortedSetTest<E> extends AbstractSetTest<E> {
// Check that iterator returns elements in order and first() and last()
// are consistent
- final Iterator<E> colliter = getCollection().iterator();
- final Iterator<E> confiter = getConfirmed().iterator();
+ final Iterator<E> collIter = getCollection().iterator();
+ final Iterator<E> confIter = getConfirmed().iterator();
E first = null;
E last = null;
- while (colliter.hasNext()) {
+ while (collIter.hasNext()) {
if (first == null) {
- first = colliter.next();
+ first = collIter.next();
last = first;
} else {
- last = colliter.next();
+ last = collIter.next();
}
- assertEquals("Element appears to be out of order.", last, confiter.next());
+ assertEquals("Element appears to be out of order.", last, confIter.next());
}
if (!getCollection().isEmpty()) {
assertEquals("Incorrect element returned by first().", first,
@@ -145,9 +145,9 @@ public abstract class AbstractSortedSetTest<E> extends AbstractSetTest<E> {
public BulkTest bulkTestSortedSetSubSet() {
final int length = getFullElements().length;
- final int lobound = length / 3;
- final int hibound = lobound * 2;
- return new TestSortedSetSubSet(lobound, hibound);
+ final int loBound = length / 3;
+ final int hiBound = loBound * 2;
+ return new TestSortedSetSubSet(loBound, hiBound);
}
@@ -162,9 +162,9 @@ public abstract class AbstractSortedSetTest<E> extends AbstractSetTest<E> {
public BulkTest bulkTestSortedSetHeadSet() {
final int length = getFullElements().length;
- final int lobound = length / 3;
- final int hibound = lobound * 2;
- return new TestSortedSetSubSet(hibound, true);
+ final int loBound = length / 3;
+ final int hiBound = loBound * 2;
+ return new TestSortedSetSubSet(hiBound, true);
}
/**
@@ -177,8 +177,8 @@ public abstract class AbstractSortedSetTest<E> extends AbstractSetTest<E> {
*/
public BulkTest bulkTestSortedSetTailSet() {
final int length = getFullElements().length;
- final int lobound = length / 3;
- return new TestSortedSetSubSet(lobound, false);
+ final int loBound = length / 3;
+ return new TestSortedSetSubSet(loBound, false);
}
public class TestSortedSetSubSet extends AbstractSortedSetTest<E> {
@@ -207,13 +207,13 @@ public abstract class AbstractSortedSetTest<E> extends AbstractSetTest<E> {
//System.out.println("TAILSET");
m_Type = TYPE_TAILSET;
m_LowBound = bound;
- final Object[] allelements = AbstractSortedSetTest.this.getFullElements();
- //System.out.println("bound = "+bound +"::length="+allelements.length);
- m_FullElements = (E[]) new Object[allelements.length - bound];
- System.arraycopy(allelements, bound, m_FullElements, 0, allelements.length - bound);
- m_OtherElements = (E[]) new Object[allelements.length - bound - 1];
+ final Object[] allElements = AbstractSortedSetTest.this.getFullElements();
+ //System.out.println("bound = "+bound +"::length="+allElements.length);
+ m_FullElements = (E[]) new Object[allElements.length - bound];
+ System.arraycopy(allElements, bound, m_FullElements, 0, allElements.length - bound);
+ m_OtherElements = (E[]) new Object[allElements.length - bound - 1];
System.arraycopy(//src src_pos dst dst_pos length
- AbstractSortedSetTest.this.getOtherElements(), bound, m_OtherElements, 0, allelements.length - bound - 1);
+ AbstractSortedSetTest.this.getOtherElements(), bound, m_OtherElements, 0, allElements.length - bound - 1);
//System.out.println(new TreeSet(Arrays.asList(m_FullElements)));
//System.out.println(new TreeSet(Arrays.asList(m_OtherElements)));
//resetFull();
@@ -225,19 +225,19 @@ public abstract class AbstractSortedSetTest<E> extends AbstractSetTest<E> {
} //type
@SuppressWarnings("unchecked")
- public TestSortedSetSubSet(final int lobound, final int hibound) {
+ public TestSortedSetSubSet(final int loBound, final int hiBound) {
super("TestSortedSetSubSet");
//System.out.println("SUBSET");
m_Type = TYPE_SUBSET;
- m_LowBound = lobound;
- m_HighBound = hibound;
- final int length = hibound - lobound;
- //System.out.println("Low=" + lobound + "::High=" + hibound + "::Length=" + length);
+ m_LowBound = loBound;
+ m_HighBound = hiBound;
+ final int length = hiBound - loBound;
+ //System.out.println("Low=" + loBound + "::High=" + hiBound + "::Length=" + length);
m_FullElements = (E[]) new Object[length];
- System.arraycopy(AbstractSortedSetTest.this.getFullElements(), lobound, m_FullElements, 0, length);
+ System.arraycopy(AbstractSortedSetTest.this.getFullElements(), loBound, m_FullElements, 0, length);
m_OtherElements = (E[]) new Object[length - 1];
System.arraycopy(//src src_pos dst dst_pos length
- AbstractSortedSetTest.this.getOtherElements(), lobound, m_OtherElements, 0, length - 1);
+ AbstractSortedSetTest.this.getOtherElements(), loBound, m_OtherElements, 0, length - 1);
//System.out.println(new TreeSet(Arrays.asList(m_FullElements)));
//System.out.println(new TreeSet(Arrays.asList(m_OtherElements)));