[COLLECTIONS-455] Changed remaining fields in question to scope package private.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1494296 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Neidhart 2013-06-18 20:54:29 +00:00
parent 3361a74940
commit 4f00c55389
8 changed files with 24 additions and 24 deletions

View File

@ -141,7 +141,7 @@ Changed classes / methods
Additionally removed the methods "setIterator(Iterator)" and "getIterators()". Additionally removed the methods "setIterator(Iterator)" and "getIterators()".
o [COLLECTIONS-459] Removed method "setArray(Object)" in class ArrayIterator and method "setArray(Object[])" o [COLLECTIONS-459] Removed method "setArray(Object)" in class ArrayIterator and method "setArray(Object[])"
in class ObjectArrayIterator and made fields array, startIndex and endIndex final and package private. in class ObjectArrayIterator and made fields array, startIndex and endIndex final and package private.
o [COLLECTIONS-455] Changed scope of various fields to private where appropriate. o [COLLECTIONS-455] Changed scope of various fields to private / package private where appropriate.
o [COLLECTIONS-454] An iterator over a "Flat3Map#entrySet()" will now return independent Map.Entry objects that will o [COLLECTIONS-454] An iterator over a "Flat3Map#entrySet()" will now return independent Map.Entry objects that will
not change anymore when the iterator progresses. not change anymore when the iterator progresses.
o [COLLECTIONS-453] Several closure and transformer implementations in the functor package will now copy o [COLLECTIONS-453] Several closure and transformer implementations in the functor package will now copy

View File

@ -44,32 +44,32 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
/** /**
* Normal delegate map. * Normal delegate map.
*/ */
protected transient Map<K, V> normalMap; transient Map<K, V> normalMap;
/** /**
* Reverse delegate map. * Reverse delegate map.
*/ */
protected transient Map<V, K> reverseMap; transient Map<V, K> reverseMap;
/** /**
* Inverse view of this map. * Inverse view of this map.
*/ */
protected transient BidiMap<V, K> inverseBidiMap = null; transient BidiMap<V, K> inverseBidiMap = null;
/** /**
* View of the keys. * View of the keys.
*/ */
protected transient Set<K> keySet = null; transient Set<K> keySet = null;
/** /**
* View of the values. * View of the values.
*/ */
protected transient Collection<V> values = null; transient Collection<V> values = null;
/** /**
* View of the entries. * View of the entries.
*/ */
protected transient Set<Map.Entry<K, V>> entrySet = null; transient Set<Map.Entry<K, V>> entrySet = null;
/** /**
* Creates an empty map, initialised by <code>createMap</code>. * Creates an empty map, initialised by <code>createMap</code>.

View File

@ -59,13 +59,13 @@ public abstract class AbstractLinkedList<E> implements List<E> {
* hold a value. The value of <code>next</code> is the first item in the * hold a value. The value of <code>next</code> is the first item in the
* list. The value of of <code>previous</code> is the last item in the list. * list. The value of of <code>previous</code> is the last item in the list.
*/ */
protected transient Node<E> header; transient Node<E> header;
/** The size of the list */ /** The size of the list */
protected transient int size; transient int size;
/** Modification count for iterators */ /** Modification count for iterators */
protected transient int modCount; transient int modCount;
/** /**
* Constructor that does nothing intended for deserialization. * Constructor that does nothing intended for deserialization.

View File

@ -76,21 +76,21 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab
protected static final Object NULL = new Object(); protected static final Object NULL = new Object();
/** Load factor, normally 0.75 */ /** Load factor, normally 0.75 */
protected transient float loadFactor; transient float loadFactor;
/** The size of the map */ /** The size of the map */
protected transient int size; transient int size;
/** Map entries */ /** Map entries */
protected transient HashEntry<K, V>[] data; transient HashEntry<K, V>[] data;
/** Size at which to rehash */ /** Size at which to rehash */
protected transient int threshold; transient int threshold;
/** Modification count for iterators */ /** Modification count for iterators */
protected transient int modCount; transient int modCount;
/** Entry set */ /** Entry set */
protected transient EntrySet<K, V> entrySet; transient EntrySet<K, V> entrySet;
/** Key set */ /** Key set */
protected transient KeySet<K> keySet; transient KeySet<K> keySet;
/** Values */ /** Values */
protected transient Values<V> values; transient Values<V> values;
/** /**
* Constructor only used in deserialization, do not use otherwise. * Constructor only used in deserialization, do not use otherwise.

View File

@ -62,7 +62,7 @@ import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator;
public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> implements OrderedMap<K, V> { public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> implements OrderedMap<K, V> {
/** Header in the linked list */ /** Header in the linked list */
protected transient LinkEntry<K, V> header; transient LinkEntry<K, V> header;
/** /**
* Constructor only used in deserialization, do not use otherwise. * Constructor only used in deserialization, do not use otherwise.

View File

@ -41,7 +41,7 @@ import java.util.Set;
public abstract class AbstractMapDecorator<K, V> extends AbstractIterableMap<K, V> { public abstract class AbstractMapDecorator<K, V> extends AbstractIterableMap<K, V> {
/** The map to decorate */ /** The map to decorate */
protected transient Map<K, V> map; transient Map<K, V> map;
/** /**
* Constructor only used in deserialization, do not use otherwise. * Constructor only used in deserialization, do not use otherwise.

View File

@ -32,13 +32,13 @@ import org.apache.commons.collections4.ResettableIterator;
public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, ResettableIterator<K> { public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, ResettableIterator<K> {
/** The adapted Map entry Set. */ /** The adapted Map entry Set. */
protected Set<Map.Entry<K, V>> entrySet; Set<Map.Entry<K, V>> entrySet;
/** The resettable iterator in use. */ /** The resettable iterator in use. */
protected transient Iterator<Map.Entry<K, V>> iterator; transient Iterator<Map.Entry<K, V>> iterator;
/** The currently positioned Map entry. */ /** The currently positioned Map entry. */
protected transient Map.Entry<K, V> entry; transient Map.Entry<K, V> entry;
/** /**
* Create a new EntrySetToMapIteratorAdapter. * Create a new EntrySetToMapIteratorAdapter.

View File

@ -34,7 +34,7 @@ import org.apache.commons.collections4.map.EntrySetToMapIteratorAdapter;
public class AbstractIterableGetMapDecorator<K, V> implements IterableGet<K, V> { public class AbstractIterableGetMapDecorator<K, V> implements IterableGet<K, V> {
/** The map to decorate */ /** The map to decorate */
protected transient Map<K, V> map; transient Map<K, V> map;
/** /**
* Create a new AbstractSplitMapDecorator. * Create a new AbstractSplitMapDecorator.