You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/04/30 00:58:51 UTC
svn commit: r1477400 - in
/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4:
bag/ bidimap/ collection/ comparators/ iterators/ keyvalue/ list/ map/ set/
Author: sebb
Date: Mon Apr 29 22:58:50 2013
New Revision: 1477400
URL: http://svn.apache.org/r1477400
Log:
Make fields private (and final) if possible
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/PredicatedList.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/TransformedList.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java Mon Apr 29 22:58:50 2013
@@ -78,7 +78,7 @@ public class SynchronizedBag<E> extends
* @return the decorated bag
*/
protected Bag<E> getBag() {
- return (Bag<E>) collection;
+ return (Bag<E>) decorated();
}
//-----------------------------------------------------------------------
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java Mon Apr 29 22:58:50 2013
@@ -78,7 +78,7 @@ public class SynchronizedSortedBag<E> ex
* @return the decorated bag
*/
protected SortedBag<E> getSortedBag() {
- return (SortedBag<E>) collection;
+ return (SortedBag<E>) decorated();
}
//-----------------------------------------------------------------------
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java Mon Apr 29 22:58:50 2013
@@ -59,10 +59,10 @@ public class DualTreeBidiMap<K, V> exten
private static final long serialVersionUID = 721969328361809L;
/** The key comparator to use */
- protected final Comparator<? super K> comparator;
+ private final Comparator<? super K> comparator;
/** The value comparator to use */
- protected final Comparator<? super V> valueComparator;
+ private final Comparator<? super V> valueComparator;
/**
* Creates an empty <code>DualTreeBidiMap</code>
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java Mon Apr 29 22:58:50 2013
@@ -1610,13 +1610,13 @@ public class TreeBidiMap<K extends Compa
abstract class ViewIterator {
/** Whether to return KEY or VALUE order. */
- protected final DataElement orderType;
+ private final DataElement orderType;
/** The last node returned by the iterator. */
- protected Node<K, V> lastReturnedNode;
+ Node<K, V> lastReturnedNode;
/** The next node to be returned by the iterator. */
- protected Node<K, V> nextNode;
+ private Node<K, V> nextNode;
/** The previous node in the sequence returned by the iterator. */
- protected Node<K, V> previousNode;
+ private Node<K, V> previousNode;
/** The modification count. */
private int expectedModifications;
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java Mon Apr 29 22:58:50 2013
@@ -45,10 +45,10 @@ public class CompositeCollection<E> impl
private static final long serialVersionUID = 8417515734108306801L;
/** CollectionMutator to handle changes to the collection */
- protected CollectionMutator<E> mutator;
+ private CollectionMutator<E> mutator;
/** Collections in the composite */
- protected List<Collection<E>> all = new ArrayList<Collection<E>>();
+ private final List<Collection<E>> all = new ArrayList<Collection<E>>();
/**
* Create an empty CompositeCollection.
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java Mon Apr 29 22:58:50 2013
@@ -44,7 +44,7 @@ public class SynchronizedCollection<E> i
private static final long serialVersionUID = 2412805092710877986L;
/** The collection to decorate */
- protected final Collection<E> collection;
+ private final Collection<E> collection;
/** The object to lock on, needed for List/SortedSet views */
protected final Object lock;
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java Mon Apr 29 22:58:50 2013
@@ -82,7 +82,7 @@ public final class UnmodifiableBoundedCo
if (coll instanceof AbstractCollectionDecorator) {
coll = ((AbstractCollectionDecorator<E>) coll).collection;
} else if (coll instanceof SynchronizedCollection) {
- coll = ((SynchronizedCollection<E>) coll).collection;
+ coll = ((SynchronizedCollection<E>) coll).decorated();
}
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java Mon Apr 29 22:58:50 2013
@@ -53,11 +53,11 @@ public class ComparatorChain<E> implemen
private static final long serialVersionUID = -721644942746081630L;
/** The list of comparators in the chain. */
- protected List<Comparator<E>> comparatorChain = null;
+ private final List<Comparator<E>> comparatorChain;
/** Order - false (clear) = ascend; true (set) = descend. */
- protected BitSet orderingBits = null;
+ private BitSet orderingBits = null;
/** Whether the chain has been "locked". */
- protected boolean isLocked = false;
+ private boolean isLocked = false;
//-----------------------------------------------------------------------
/**
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java Mon Apr 29 22:58:50 2013
@@ -41,9 +41,9 @@ public class TransformingComparator<I, O
private static final long serialVersionUID = 3456940356043606220L;
/** The decorated comparator. */
- protected final Comparator<O> decorated;
+ private final Comparator<O> decorated;
/** The transformer being used. */
- protected final Transformer<? super I, ? extends O> transformer;
+ private final Transformer<? super I, ? extends O> transformer;
//-----------------------------------------------------------------------
/**
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java Mon Apr 29 22:58:50 2013
@@ -29,7 +29,7 @@ import java.util.ListIterator;
public class AbstractListIteratorDecorator<E> implements ListIterator<E> {
/** The iterator being decorated */
- protected final ListIterator<E> iterator;
+ private final ListIterator<E> iterator;
//-----------------------------------------------------------------------
/**
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java Mon Apr 29 22:58:50 2013
@@ -29,7 +29,7 @@ import org.apache.commons.collections4.M
public class AbstractMapIteratorDecorator<K, V> implements MapIterator<K, V> {
/** The iterator being decorated */
- protected final MapIterator<K, V> iterator;
+ private final MapIterator<K, V> iterator;
//-----------------------------------------------------------------------
/**
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java Mon Apr 29 22:58:50 2013
@@ -29,7 +29,7 @@ import org.apache.commons.collections4.O
public class AbstractOrderedMapIteratorDecorator<K, V> implements OrderedMapIterator<K, V> {
/** The iterator being decorated */
- protected final OrderedMapIterator<K, V> iterator;
+ private final OrderedMapIterator<K, V> iterator;
//-----------------------------------------------------------------------
/**
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java Mon Apr 29 22:58:50 2013
@@ -30,7 +30,7 @@ import java.util.Iterator;
public abstract class AbstractUntypedIteratorDecorator<I, O> implements Iterator<O> {
/** The iterator being decorated */
- protected final Iterator<I> iterator;
+ private final Iterator<I> iterator;
/**
* Create a new AbstractUntypedIteratorDecorator.
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java Mon Apr 29 22:58:50 2013
@@ -48,25 +48,25 @@ import org.apache.commons.collections4.l
public class IteratorChain<E> implements Iterator<E> {
/** The chain of iterators */
- protected final List<Iterator<? extends E>> iteratorChain = new ArrayList<Iterator<? extends E>>();
+ private final List<Iterator<? extends E>> iteratorChain = new ArrayList<Iterator<? extends E>>();
/** The index of the current iterator */
- protected int currentIteratorIndex = 0;
+ private int currentIteratorIndex = 0;
/** The current iterator */
- protected Iterator<? extends E> currentIterator = null;
+ private Iterator<? extends E> currentIterator = null;
/**
* The "last used" Iterator is the Iterator upon which next() or hasNext()
* was most recently called used for the remove() operation only
*/
- protected Iterator<? extends E> lastUsedIterator = null;
+ private Iterator<? extends E> lastUsedIterator = null;
/**
* ComparatorChain is "locked" after the first time compare(Object,Object)
* is called
*/
- protected boolean isLocked = false;
+ private boolean isLocked = false;
//-----------------------------------------------------------------------
/**
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java Mon Apr 29 22:58:50 2013
@@ -35,7 +35,7 @@ public class NodeListIterator implements
/** the original NodeList instance */
private final NodeList nodeList;
/** The current iterator index */
- protected int index = 0;
+ private int index = 0;
/**
* Convenience constructor, which creates a new NodeListIterator from
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java Mon Apr 29 22:58:50 2013
@@ -46,7 +46,7 @@ public class ObjectArrayListIterator<E>
* has yet been invoked. <code>lastItemIndex</code> is used to to implement the
* {@link #set} method.
*/
- protected int lastItemIndex = -1;
+ private int lastItemIndex = -1;
/**
* Constructor for use with <code>setArray</code>.
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java Mon Apr 29 22:58:50 2013
@@ -30,7 +30,7 @@ import org.apache.commons.collections4.K
public abstract class AbstractMapEntryDecorator<K, V> implements Map.Entry<K, V>, KeyValue<K, V> {
/** The <code>Map.Entry</code> to decorate */
- protected final Map.Entry<K, V> entry;
+ private final Map.Entry<K, V> entry;
/**
* Constructor that wraps (not copies).
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/PredicatedList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/PredicatedList.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/PredicatedList.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/PredicatedList.java Mon Apr 29 22:58:50 2013
@@ -155,13 +155,13 @@ public class PredicatedList<E> extends P
@Override
public void add(final E object) {
validate(object);
- iterator.add(object);
+ getListIterator().add(object);
}
@Override
public void set(final E object) {
validate(object);
- iterator.set(object);
+ getListIterator().set(object);
}
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/TransformedList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/TransformedList.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/TransformedList.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/TransformedList.java Mon Apr 29 22:58:50 2013
@@ -178,13 +178,13 @@ public class TransformedList<E> extends
@Override
public void add(E object) {
object = transform(object);
- iterator.add(object);
+ getListIterator().add(object);
}
@Override
public void set(E object) {
object = transform(object);
- iterator.set(object);
+ getListIterator().set(object);
}
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java Mon Apr 29 22:58:50 2013
@@ -178,7 +178,7 @@ abstract class AbstractInputCheckedMapDe
@Override
public Map.Entry<K, V> next() {
- final Map.Entry<K, V> entry = iterator.next();
+ final Map.Entry<K, V> entry = getIterator().next();
return new MapEntry(entry, parent);
}
}
@@ -199,7 +199,7 @@ abstract class AbstractInputCheckedMapDe
@Override
public V setValue(V value) {
value = parent.checkSetValue(value);
- return entry.setValue(value);
+ return getMapEntry().setValue(value);
}
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java Mon Apr 29 22:58:50 2013
@@ -154,7 +154,7 @@ public final class UnmodifiableEntrySet<
@Override
public Map.Entry<K, V> next() {
- return new UnmodifiableEntry(iterator.next());
+ return new UnmodifiableEntry(getIterator().next());
}
@Override
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java?rev=1477400&r1=1477399&r2=1477400&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java Mon Apr 29 22:58:50 2013
@@ -380,23 +380,23 @@ public class ListOrderedSet<E>
@Override
public E next() {
- last = iterator.next();
+ last = getIterator().next();
return last;
}
@Override
public void remove() {
set.remove(last);
- iterator.remove();
+ getIterator().remove();
last = null;
}
public boolean hasPrevious() {
- return ((ListIterator<E>) iterator).hasPrevious();
+ return ((ListIterator<E>) getIterator()).hasPrevious();
}
public E previous() {
- last = ((ListIterator<E>) iterator).previous();
+ last = ((ListIterator<E>) getIterator()).previous();
return last;
}
}