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
commit d3271b9b3fdf2c144e1cbc02f4f3b8b3ed1cf8eb Author: Gary Gregory <[email protected]> AuthorDate: Sun Aug 25 18:24:09 2024 -0400 Can't rename protected instance variable - Javadoc: Better @link --- .../commons/collections4/iterators/LoopingIterator.java | 2 +- .../collections4/iterators/LoopingListIterator.java | 2 +- .../commons/collections4/multiset/AbstractMapMultiSet.java | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java index 7f0752005..ac62a1ce8 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java @@ -94,7 +94,7 @@ public class LoopingIterator<E> implements ResettableIterator<E> { * Removes the previously retrieved item from the underlying collection. * <p> * This feature is only supported if the underlying collection's - * {@link Collection#iterator iterator} method returns an implementation + * {@link Collection#iterator()} method returns an implementation * that supports it. * <p> * This method can only be called after at least one {@link #next} method call. 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 279728e9b..0282fb2ac 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java @@ -206,7 +206,7 @@ public class LoopingListIterator<E> implements ResettableListIterator<E> { * Removes the previously retrieved item from the underlying list. * <p> * This feature is only supported if the underlying list's - * {@link List#iterator iterator} method returns an implementation + * {@link List#iterator()} method returns an implementation * that supports it. * <p> * This method can only be called after at least one {@link #next} diff --git a/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java index 98f81dddf..dfdfaedbd 100644 --- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java +++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java @@ -54,7 +54,7 @@ public abstract class AbstractMapMultiSet<E> extends AbstractMultiSet<E> { /** * The source Iterator. */ - protected final Iterator<Map.Entry<E, MutableInteger>> iterator; + protected final Iterator<Map.Entry<E, MutableInteger>> decorated; /** The last returned entry */ protected Entry<E> last; @@ -64,23 +64,23 @@ public abstract class AbstractMapMultiSet<E> extends AbstractMultiSet<E> { /** * Constructs a new instance. - * @param iterator the iterator to decorate + * @param decorated the iterator to decorate * @param parent the parent multiset */ - protected EntrySetIterator(final Iterator<Map.Entry<E, MutableInteger>> iterator, + protected EntrySetIterator(final Iterator<Map.Entry<E, MutableInteger>> decorated, final AbstractMapMultiSet<E> parent) { - this.iterator = iterator; + this.decorated = decorated; this.parent = parent; } @Override public boolean hasNext() { - return iterator.hasNext(); + return decorated.hasNext(); } @Override public Entry<E> next() { - last = new MultiSetEntry<>(iterator.next()); + last = new MultiSetEntry<>(decorated.next()); canRemove = true; return last; } @@ -90,7 +90,7 @@ public abstract class AbstractMapMultiSet<E> extends AbstractMultiSet<E> { if (!canRemove) { throw new IllegalStateException("Iterator remove() can only be called once after next()"); } - iterator.remove(); + decorated.remove(); last = null; canRemove = false; }
