diff --git a/PROPOSAL.html b/PROPOSAL.html index 822f57318..2f10130ad 100644 --- a/PROPOSAL.html +++ b/PROPOSAL.html @@ -34,7 +34,7 @@

Many Jakarta projects have needs or design criteria that extend beyond the core Collections API, such as introducing new abstract - data types (e.g., Avalon's BinaryHeap) or changing the behaviour of + data types (e.g., Avalon's BinaryHeap) or changing the behavior of existing abstract data types (e.g., Struts' FastHashMap).

diff --git a/src/main/java/org/apache/commons/collections4/ArrayUtils.java b/src/main/java/org/apache/commons/collections4/ArrayUtils.java index 696fd89b6..6ce8be5ec 100644 --- a/src/main/java/org/apache/commons/collections4/ArrayUtils.java +++ b/src/main/java/org/apache/commons/collections4/ArrayUtils.java @@ -24,7 +24,7 @@ package org.apache.commons.collections4; *

* This class tries to handle {@code null} input gracefully. An exception will not be thrown for a {@code null} array * input. However, an Object array that contains a {@code null} element may throw an exception. Each method documents - * its behaviour. + * its behavior. *

*

* Package private, might move to an internal package if this needs to be public. diff --git a/src/main/java/org/apache/commons/collections4/BagUtils.java b/src/main/java/org/apache/commons/collections4/BagUtils.java index b5da468f7..9b941520d 100644 --- a/src/main/java/org/apache/commons/collections4/BagUtils.java +++ b/src/main/java/org/apache/commons/collections4/BagUtils.java @@ -127,7 +127,7 @@ public class BagUtils { *

*

* Existing entries in the specified bag will not be transformed. - * If you want that behaviour, see {@link TransformedBag#transformedBag(Bag, Transformer)}. + * If you want that behavior, see {@link TransformedBag#transformedBag(Bag, Transformer)}. *

* * @param the element type @@ -230,7 +230,7 @@ public class BagUtils { *

*

* Existing entries in the specified bag will not be transformed. - * If you want that behaviour, see + * If you want that behavior, see * {@link TransformedSortedBag#transformedSortedBag(SortedBag, Transformer)}. *

* diff --git a/src/main/java/org/apache/commons/collections4/CollectionUtils.java b/src/main/java/org/apache/commons/collections4/CollectionUtils.java index 9395dc816..b3ae7cfeb 100644 --- a/src/main/java/org/apache/commons/collections4/CollectionUtils.java +++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java @@ -1994,7 +1994,7 @@ public class CollectionUtils { *

*

* Existing entries in the specified collection will not be transformed. - * If you want that behaviour, see {@link TransformedCollection#transformedCollection}. + * If you want that behavior, see {@link TransformedCollection#transformedCollection}. *

* * @param the type of object the {@link Collection} contains diff --git a/src/main/java/org/apache/commons/collections4/ListUtils.java b/src/main/java/org/apache/commons/collections4/ListUtils.java index 30ce1ce77..624beba23 100644 --- a/src/main/java/org/apache/commons/collections4/ListUtils.java +++ b/src/main/java/org/apache/commons/collections4/ListUtils.java @@ -227,7 +227,7 @@ public class ListUtils { * different implementations of the {@code List} interface. * * - * Note: The behaviour of this method is undefined if the lists are + * Note: The behavior of this method is undefined if the lists are * modified during the equals comparison. * * @see java.util.List @@ -425,7 +425,7 @@ public class ListUtils { * method, as it is a backdoor for adding untransformed objects. *

* Existing entries in the specified list will not be transformed. - * If you want that behaviour, see {@link TransformedList#transformedList}. + * If you want that behavior, see {@link TransformedList#transformedList}. * * @param the element type * @param list the list to predicate, must not be null diff --git a/src/main/java/org/apache/commons/collections4/MapUtils.java b/src/main/java/org/apache/commons/collections4/MapUtils.java index b89c404d3..e73474e3e 100644 --- a/src/main/java/org/apache/commons/collections4/MapUtils.java +++ b/src/main/java/org/apache/commons/collections4/MapUtils.java @@ -153,7 +153,7 @@ public class MapUtils { * Prints the given map with nice line breaks. *

* This method prints a nicely formatted String describing the Map. Each map entry will be printed with key, value - * and value classname. When the value is a Map, recursive behaviour occurs. + * and value classname. When the value is a Map, recursive behavior occurs. *

*

* This method is NOT thread-safe in any special way. You must manually synchronize on either this class or the @@ -1857,7 +1857,7 @@ public class MapUtils { * Returns a transformed map backed by the given map. *

* This method returns a new map (decorating the specified map) that will transform any new entries added to it. - * Existing entries in the specified map will not be transformed. If you want that behaviour, see + * Existing entries in the specified map will not be transformed. If you want that behavior, see * {@link TransformedMap#transformedMap}. *

*

@@ -1886,7 +1886,7 @@ public class MapUtils { * Returns a transformed sorted map backed by the given map. *

* This method returns a new sorted map (decorating the specified map) that will transform any new entries added to - * it. Existing entries in the specified map will not be transformed. If you want that behaviour, see + * it. Existing entries in the specified map will not be transformed. If you want that behavior, see * {@link TransformedSortedMap#transformedSortedMap}. *

*

@@ -1949,7 +1949,7 @@ public class MapUtils { * Prints the given map with nice line breaks. *

* This method prints a nicely formatted String describing the Map. Each map entry will be printed with key and - * value. When the value is a Map, recursive behaviour occurs. + * value. When the value is a Map, recursive behavior occurs. *

*

* This method is NOT thread-safe in any special way. You must manually synchronize on either this class or the diff --git a/src/main/java/org/apache/commons/collections4/MultiMapUtils.java b/src/main/java/org/apache/commons/collections4/MultiMapUtils.java index 9c695354a..17db98f9d 100644 --- a/src/main/java/org/apache/commons/collections4/MultiMapUtils.java +++ b/src/main/java/org/apache/commons/collections4/MultiMapUtils.java @@ -228,7 +228,7 @@ public class MultiMapUtils { * This method returns a new {@code MultiValuedMap} (decorating the * specified map) that will transform any new entries added to it. Existing * entries in the specified map will not be transformed. If you want that - * behaviour, see {@link TransformedMultiValuedMap#transformedMap}. + * behavior, see {@link TransformedMultiValuedMap#transformedMap}. *

* Each object is passed through the transformers as it is added to the Map. * It is important not to use the original map after invoking this method, diff --git a/src/main/java/org/apache/commons/collections4/PredicateUtils.java b/src/main/java/org/apache/commons/collections4/PredicateUtils.java index 8dd5d0ffc..c381de354 100644 --- a/src/main/java/org/apache/commons/collections4/PredicateUtils.java +++ b/src/main/java/org/apache/commons/collections4/PredicateUtils.java @@ -475,7 +475,7 @@ public class PredicateUtils { /** * Gets a Predicate that throws an exception if the input object is null, * otherwise it calls the specified Predicate. This allows null handling - * behaviour to be added to Predicates that don't support nulls. + * behavior to be added to Predicates that don't support nulls. * * @param the type that the predicate queries * @param predicate the predicate to wrap, may not be null @@ -489,7 +489,7 @@ public class PredicateUtils { /** * Gets a Predicate that returns false if the input object is null, otherwise - * it calls the specified Predicate. This allows null handling behaviour to + * it calls the specified Predicate. This allows null handling behavior to * be added to Predicates that don't support nulls. * * @param the type that the predicate queries @@ -504,7 +504,7 @@ public class PredicateUtils { /** * Gets a Predicate that returns true if the input object is null, otherwise - * it calls the specified Predicate. This allows null handling behaviour to + * it calls the specified Predicate. This allows null handling behavior to * be added to Predicates that don't support nulls. * * @param the type that the predicate queries diff --git a/src/main/java/org/apache/commons/collections4/QueueUtils.java b/src/main/java/org/apache/commons/collections4/QueueUtils.java index 27d8c3de7..ffcfbd409 100644 --- a/src/main/java/org/apache/commons/collections4/QueueUtils.java +++ b/src/main/java/org/apache/commons/collections4/QueueUtils.java @@ -113,7 +113,7 @@ public class QueueUtils { * method, as it is a backdoor for adding untransformed objects. *

* Existing entries in the specified queue will not be transformed. - * If you want that behaviour, see {@link TransformedQueue#transformedQueue}. + * If you want that behavior, see {@link TransformedQueue#transformedQueue}. * * @param the type of the elements in the queue * @param queue the queue to predicate, must not be null diff --git a/src/main/java/org/apache/commons/collections4/SetUtils.java b/src/main/java/org/apache/commons/collections4/SetUtils.java index 3b833af94..49d57b39d 100644 --- a/src/main/java/org/apache/commons/collections4/SetUtils.java +++ b/src/main/java/org/apache/commons/collections4/SetUtils.java @@ -494,7 +494,7 @@ public class SetUtils { * method, as it is a backdoor for adding untransformed objects. *

* Existing entries in the specified set will not be transformed. - * If you want that behaviour, see {@link TransformedNavigableSet#transformedNavigableSet}. + * If you want that behavior, see {@link TransformedNavigableSet#transformedNavigableSet}. * * @param the element type * @param set the navigable set to transform, must not be null @@ -516,7 +516,7 @@ public class SetUtils { * method, as it is a backdoor for adding untransformed objects. *

* Existing entries in the specified set will not be transformed. - * If you want that behaviour, see {@link TransformedSet#transformedSet}. + * If you want that behavior, see {@link TransformedSet#transformedSet}. * * @param the element type * @param set the set to transform, must not be null @@ -537,7 +537,7 @@ public class SetUtils { * method, as it is a backdoor for adding untransformed objects. *

* Existing entries in the specified set will not be transformed. - * If you want that behaviour, see {@link TransformedSortedSet#transformedSortedSet}. + * If you want that behavior, see {@link TransformedSortedSet#transformedSortedSet}. * * @param the element type * @param set the set to transform, must not be null diff --git a/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java b/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java index 3d4bf60a9..0e1d7c645 100644 --- a/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java +++ b/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java @@ -22,7 +22,7 @@ import org.apache.commons.collections4.Bag; import org.apache.commons.collections4.collection.AbstractCollectionDecorator; /** - * Decorates another {@code Bag} to provide additional behaviour. + * Decorates another {@code Bag} to provide additional behavior. *

* Methods are forwarded directly to the decorated bag. *

diff --git a/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java b/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java index 1682b563e..b2f24554c 100644 --- a/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java +++ b/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java @@ -21,7 +21,7 @@ import java.util.Comparator; import org.apache.commons.collections4.SortedBag; /** - * Decorates another {@code SortedBag} to provide additional behaviour. + * Decorates another {@code SortedBag} to provide additional behavior. *

* Methods are forwarded directly to the decorated bag. *

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 c1ca58226..031d31d6a 100644 --- a/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java @@ -22,7 +22,7 @@ import org.apache.commons.collections4.Bag; import org.apache.commons.collections4.collection.SynchronizedCollection; /** - * Decorates another {@link Bag} to synchronize its behaviour + * Decorates another {@link Bag} to synchronize its behavior * for a multi-threaded environment. *

* Methods are synchronized, then forwarded to the decorated bag. 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 5e4e45f9a..893b0948c 100644 --- a/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java @@ -22,7 +22,7 @@ import org.apache.commons.collections4.Bag; import org.apache.commons.collections4.SortedBag; /** - * Decorates another {@link SortedBag} to synchronize its behaviour + * Decorates another {@link SortedBag} to synchronize its behavior * for a multi-threaded environment. *

* Methods are synchronized, then forwarded to the decorated bag. diff --git a/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java index 78c258435..e0bd5cf6e 100644 --- a/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java @@ -190,7 +190,7 @@ public class DualTreeBidiMap extends AbstractDualBidiMap * Obtains an ordered map iterator. *

* This implementation copies the elements to an ArrayList in order to - * provide the forward/backward behaviour. + * provide the forward/backward behavior. * * @return a new ordered map iterator */ diff --git a/src/main/java/org/apache/commons/collections4/bloomfilter/BloomFilterIndexer.java b/src/main/java/org/apache/commons/collections4/bloomfilter/BloomFilterIndexer.java index 7066a6588..87037e7df 100644 --- a/src/main/java/org/apache/commons/collections4/bloomfilter/BloomFilterIndexer.java +++ b/src/main/java/org/apache/commons/collections4/bloomfilter/BloomFilterIndexer.java @@ -45,7 +45,7 @@ final class BloomFilterIndexer { *

The index is assumed to be positive. For a positive index the result will match * {@code bitIndex / 64}. * - *

The divide is performed using bit shifts. If the input is negative the behaviour + *

The divide is performed using bit shifts. If the input is negative the behavior * is not defined. * * @param bitIndex the bit index (assumed to be positive) @@ -68,7 +68,7 @@ final class BloomFilterIndexer { *

The index is assumed to be positive. For a positive index the result will match * {@code 1L << (bitIndex % 64)}. * - *

If the input is negative the behaviour is not defined. + *

If the input is negative the behavior is not defined. * * @param bitIndex the bit index (assumed to be positive) * @return the filter bit diff --git a/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java b/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java index 7b58c8e6e..c34ed43ba 100644 --- a/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java +++ b/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java @@ -23,11 +23,11 @@ import java.util.Objects; import java.util.function.Predicate; /** - * Decorates another {@code Collection} to provide additional behaviour. + * Decorates another {@code Collection} to provide additional behavior. *

* Each method call made on this {@code Collection} is forwarded to the * decorated {@code Collection}. This class is used as a framework on which - * to build to extensions such as synchronized and unmodifiable behaviour. The + * to build to extensions such as synchronized and unmodifiable behavior. The * main advantage of decoration is that one decorator can wrap any implementation * of {@code Collection}, whereas sub-classing requires a new class to be * written for each implementation. 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 635543d3d..530489548 100644 --- a/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java +++ b/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java @@ -23,7 +23,7 @@ import java.util.Objects; import java.util.function.Predicate; /** - * Decorates another {@link Collection} to synchronize its behaviour + * Decorates another {@link Collection} to synchronize its behavior * for a multi-threaded environment. *

* Iterators must be manually synchronized: 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 83ff884ed..2ebfe88fa 100644 --- a/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java +++ b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java @@ -29,7 +29,7 @@ import java.util.List; * 1) any single Comparator returns a non-zero result (and that result is then * returned), or 2) the ComparatorChain is exhausted (and zero is returned). * This type of sorting is very similar to multi-column sorting in SQL, and this - * class allows Java classes to emulate that kind of behaviour when sorting a + * class allows Java classes to emulate that kind of behavior when sorting a * List. *

* To further facilitate SQL-like sorting, the order of any single Comparator in 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 c03a80b09..261180345 100644 --- a/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java +++ b/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java @@ -72,7 +72,7 @@ public class FixedOrderComparator implements Comparator, Serializable { /** Is the comparator locked against further change */ private boolean isLocked = false; - /** The behaviour in the case of an unknown object */ + /** The behavior in the case of an unknown object */ private UnknownObjectBehavior unknownObjectBehavior = UnknownObjectBehavior.EXCEPTION; // Constructors @@ -152,7 +152,7 @@ public class FixedOrderComparator implements Comparator, Serializable { /** * Sets the behavior for comparing unknown objects. * - * @param unknownObjectBehavior the flag for unknown behaviour - + * @param unknownObjectBehavior the flag for unknown behavior - * UNKNOWN_AFTER, UNKNOWN_BEFORE or UNKNOWN_THROW_EXCEPTION * @throws UnsupportedOperationException if a comparison has been performed * @throws NullPointerException if unknownObjectBehavior is null diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java index e7208a892..7b495d6ef 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java @@ -19,7 +19,7 @@ package org.apache.commons.collections4.iterators; import java.util.Iterator; /** - * Provides basic behaviour for decorating an iterator with extra functionality. + * Provides basic behavior for decorating an iterator with extra functionality. *

* All methods are forwarded to the decorated iterator. * diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java index 94f84f63b..a2a163e1d 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java @@ -20,7 +20,7 @@ import java.util.ListIterator; import java.util.Objects; /** - * Provides basic behaviour for decorating a list iterator with extra functionality. + * Provides basic behavior for decorating a list iterator with extra functionality. *

* All methods are forwarded to the decorated list iterator. * diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java index ef414411c..a7a105c88 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java @@ -21,7 +21,7 @@ import java.util.Objects; import org.apache.commons.collections4.MapIterator; /** - * Provides basic behaviour for decorating a map iterator with extra functionality. + * Provides basic behavior for decorating a map iterator with extra functionality. *

* All methods are forwarded to the decorated map iterator. * diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java index 8f9811546..686335fb8 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java @@ -21,7 +21,7 @@ import java.util.Objects; import org.apache.commons.collections4.OrderedMapIterator; /** - * Provides basic behaviour for decorating an ordered map iterator with extra functionality. + * Provides basic behavior for decorating an ordered map iterator with extra functionality. *

* All methods are forwarded to the decorated map iterator. * diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java index b3b38e21a..ae0ca71bb 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java @@ -20,7 +20,7 @@ import java.util.Iterator; import java.util.Objects; /** - * Provides basic behaviour for decorating an iterator with extra functionality + * Provides basic behavior for decorating an iterator with extra functionality * without committing the generic type of the Iterator implementation. *

* All methods are forwarded to the decorated iterator. 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 6eebc376c..dae0eb654 100644 --- a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java +++ b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java @@ -784,7 +784,7 @@ public abstract class AbstractLinkedList implements List { * #previous()} haven't been called, or if the node has been removed * with {@link #remove()} or a new node added with {@link #add(Object)}. * Should be accessed through {@link #getLastNodeReturned()} to enforce - * this behaviour. + * this behavior. */ protected Node current; diff --git a/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java b/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java index de9fb292e..106b11b61 100644 --- a/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java +++ b/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java @@ -23,7 +23,7 @@ import java.util.ListIterator; import org.apache.commons.collections4.collection.AbstractCollectionDecorator; /** - * Decorates another {@link List} to provide additional behaviour. + * Decorates another {@link List} to provide additional behavior. *

* Methods are forwarded directly to the decorated list. *

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 e2d8cc0eb..5349c87fc 100644 --- a/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java +++ b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java @@ -42,7 +42,7 @@ import java.util.ListIterator; * methods provides access to a {@code Cursor} instance which extends * {@code ListIterator}. The cursor allows changes to the list concurrent * with changes to the iterator. Note that the {@link #iterator()} method and - * sublists do not provide this cursor behaviour. + * sublists do not provide this cursor behavior. *

*

* The {@code Cursor} class is provided partly for backwards compatibility @@ -100,7 +100,7 @@ public class CursorableLinkedList extends AbstractLinkedList implements Se *

* If the underlying list is modified while iterating using this iterator * a ConcurrentModificationException will occur. - * The cursor behaviour is available via {@link #listIterator()}. + * The cursor behavior is available via {@link #listIterator()}. * * @return a new iterator that does not support concurrent modification */ diff --git a/src/main/java/org/apache/commons/collections4/list/GrowthList.java b/src/main/java/org/apache/commons/collections4/list/GrowthList.java index 4ade5d1c2..7dce0d988 100644 --- a/src/main/java/org/apache/commons/collections4/list/GrowthList.java +++ b/src/main/java/org/apache/commons/collections4/list/GrowthList.java @@ -105,7 +105,7 @@ public class GrowthList extends AbstractSerializableListDecorator { //----------------------------------------------------------------------- /** - * Decorate the add method to perform the growth behaviour. + * Decorate the add method to perform the growth behavior. *

* If the requested index is greater than the current size, the list will * grow to the new size. Indices between the old size and the requested @@ -133,7 +133,7 @@ public class GrowthList extends AbstractSerializableListDecorator { //----------------------------------------------------------------------- /** - * Decorate the addAll method to perform the growth behaviour. + * Decorate the addAll method to perform the growth behavior. *

* If the requested index is greater than the current size, the list will * grow to the new size. Indices between the old size and the requested @@ -164,7 +164,7 @@ public class GrowthList extends AbstractSerializableListDecorator { //----------------------------------------------------------------------- /** - * Decorate the set method to perform the growth behaviour. + * Decorate the set method to perform the growth behavior. *

* If the requested index is greater than the current size, the list will * grow to the new size. Indices between the old size and the requested 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 d23672c87..3b4c98b38 100644 --- a/src/main/java/org/apache/commons/collections4/list/LazyList.java +++ b/src/main/java/org/apache/commons/collections4/list/LazyList.java @@ -132,7 +132,7 @@ public class LazyList extends AbstractSerializableListDecorator { //----------------------------------------------------------------------- /** - * Decorate the get method to perform the lazy behaviour. + * Decorate the get method to perform the lazy behavior. *

* If the requested index is greater than the current size, the list will * grow to the new size and a new object will be returned from the factory diff --git a/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java index 2af4ac34d..ce547ab53 100644 --- a/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java +++ b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java @@ -65,7 +65,7 @@ public class SetUniqueList extends AbstractSerializableListDecorator { * Factory method to create a SetList using the supplied list to retain order. *

* If the list contains duplicates, these are removed (first indexed one - * kept). A {@code HashSet} is used for the set behaviour. + * kept). A {@code HashSet} is used for the set behavior. * * @param the element type * @param list the list to decorate, must not be null @@ -116,7 +116,7 @@ public class SetUniqueList extends AbstractSerializableListDecorator { *

* (Violation) The {@code List} interface requires that this * method returns {@code true} always. However this class may return - * {@code false} because of the {@code Set} behaviour. + * {@code false} because of the {@code Set} behavior. * * @param object the object to add * @return true if object was added diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java index f0fa69ec6..e291015c2 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java @@ -44,7 +44,7 @@ import org.apache.commons.collections4.iterators.EmptyMapIterator; * which can be overridden and replaced. The iterators can similarly be replaced, * without the need to replace the KeySet, EntrySet and Values view classes. *

- * Overridable methods are provided to change the default hashing behaviour, and + * Overridable methods are provided to change the default hashing behavior, and * to change how entries are added to and removed from the map. Hopefully, all you * need for unusual subclasses is here. *

diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java index b173e8299..b9382d972 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java @@ -39,7 +39,7 @@ import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator; * EntrySet and Values view classes. *

*

- * Overridable methods are provided to change the default hashing behaviour, and + * Overridable methods are provided to change the default hashing behavior, and * to change how entries are added to and removed from the map. Hopefully, all you * need for unusual subclasses is here. *

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 bd5c03d56..139c366df 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java @@ -47,7 +47,7 @@ import org.apache.commons.collections4.keyvalue.DefaultMapEntry; * EntrySet and Values view classes. *

*

- * Overridable methods are provided to change the default hashing behaviour, and + * Overridable methods are provided to change the default hashing behavior, and * to change how entries are added to and removed from the map. Hopefully, all you * need for unusual subclasses is here. *

diff --git a/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java index a40dd8d8e..4dbce644c 100644 --- a/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java @@ -41,7 +41,7 @@ import org.apache.commons.collections4.functors.FactoryTransformer; *

*

* The defaulted value is not added to the map. - * Compare this behaviour with {@link LazyMap}, which does add the value + * Compare this behavior with {@link LazyMap}, which does add the value * to the map (via a Transformer). *

*

diff --git a/src/main/java/org/apache/commons/collections4/map/LRUMap.java b/src/main/java/org/apache/commons/collections4/map/LRUMap.java index a9fb500f3..145ea80bd 100644 --- a/src/main/java/org/apache/commons/collections4/map/LRUMap.java +++ b/src/main/java/org/apache/commons/collections4/map/LRUMap.java @@ -73,7 +73,7 @@ public class LRUMap /** Maximum size */ private transient int maxSize; - /** Scan behaviour */ + /** Scan behavior */ private boolean scanUntilRemovable; /** diff --git a/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java index f96c85f26..c2f8581f5 100644 --- a/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java +++ b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java @@ -46,7 +46,7 @@ import org.apache.commons.collections4.keyvalue.MultiKey; *

*

* This map is implemented as a decorator of a {@code AbstractHashedMap} which - * enables extra behaviour to be added easily. + * enables extra behavior to be added easily. *

*