You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2013/06/18 22:54:30 UTC
svn commit: r1494296 - in /commons/proper/collections/trunk: ./
src/main/java/org/apache/commons/collections4/bidimap/
src/main/java/org/apache/commons/collections4/list/
src/main/java/org/apache/commons/collections4/map/
src/main/java/org/apache/commo...
Author: tn
Date: Tue Jun 18 20:54:29 2013
New Revision: 1494296
URL: http://svn.apache.org/r1494296
Log:
[COLLECTIONS-455] Changed remaining fields in question to scope package private.
Modified:
commons/proper/collections/trunk/RELEASE-NOTES.txt
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
Modified: commons/proper/collections/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/RELEASE-NOTES.txt?rev=1494296&r1=1494295&r2=1494296&view=diff
==============================================================================
--- commons/proper/collections/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/collections/trunk/RELEASE-NOTES.txt Tue Jun 18 20:54:29 2013
@@ -141,7 +141,7 @@ Changed classes / methods
Additionally removed the methods "setIterator(Iterator)" and "getIterators()".
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.
- 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
not change anymore when the iterator progresses.
o [COLLECTIONS-453] Several closure and transformer implementations in the functor package will now copy
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java?rev=1494296&r1=1494295&r2=1494296&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java Tue Jun 18 20:54:29 2013
@@ -44,32 +44,32 @@ public abstract class AbstractDualBidiMa
/**
* Normal delegate map.
*/
- protected transient Map<K, V> normalMap;
+ transient Map<K, V> normalMap;
/**
* Reverse delegate map.
*/
- protected transient Map<V, K> reverseMap;
+ transient Map<V, K> reverseMap;
/**
* Inverse view of this map.
*/
- protected transient BidiMap<V, K> inverseBidiMap = null;
+ transient BidiMap<V, K> inverseBidiMap = null;
/**
* View of the keys.
*/
- protected transient Set<K> keySet = null;
+ transient Set<K> keySet = null;
/**
* View of the values.
*/
- protected transient Collection<V> values = null;
+ transient Collection<V> values = null;
/**
* 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>.
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java?rev=1494296&r1=1494295&r2=1494296&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java Tue Jun 18 20:54:29 2013
@@ -59,13 +59,13 @@ public abstract class AbstractLinkedList
* 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.
*/
- protected transient Node<E> header;
+ transient Node<E> header;
/** The size of the list */
- protected transient int size;
+ transient int size;
/** Modification count for iterators */
- protected transient int modCount;
+ transient int modCount;
/**
* Constructor that does nothing intended for deserialization.
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java?rev=1494296&r1=1494295&r2=1494296&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java Tue Jun 18 20:54:29 2013
@@ -76,21 +76,21 @@ public class AbstractHashedMap<K, V> ext
protected static final Object NULL = new Object();
/** Load factor, normally 0.75 */
- protected transient float loadFactor;
+ transient float loadFactor;
/** The size of the map */
- protected transient int size;
+ transient int size;
/** Map entries */
- protected transient HashEntry<K, V>[] data;
+ transient HashEntry<K, V>[] data;
/** Size at which to rehash */
- protected transient int threshold;
+ transient int threshold;
/** Modification count for iterators */
- protected transient int modCount;
+ transient int modCount;
/** Entry set */
- protected transient EntrySet<K, V> entrySet;
+ transient EntrySet<K, V> entrySet;
/** Key set */
- protected transient KeySet<K> keySet;
+ transient KeySet<K> keySet;
/** Values */
- protected transient Values<V> values;
+ transient Values<V> values;
/**
* Constructor only used in deserialization, do not use otherwise.
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java?rev=1494296&r1=1494295&r2=1494296&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java Tue Jun 18 20:54:29 2013
@@ -62,7 +62,7 @@ import org.apache.commons.collections4.i
public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> implements OrderedMap<K, V> {
/** 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.
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java?rev=1494296&r1=1494295&r2=1494296&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java Tue Jun 18 20:54:29 2013
@@ -41,7 +41,7 @@ import java.util.Set;
public abstract class AbstractMapDecorator<K, V> extends AbstractIterableMap<K, V> {
/** The map to decorate */
- protected transient Map<K, V> map;
+ transient Map<K, V> map;
/**
* Constructor only used in deserialization, do not use otherwise.
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java?rev=1494296&r1=1494295&r2=1494296&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java Tue Jun 18 20:54:29 2013
@@ -32,13 +32,13 @@ import org.apache.commons.collections4.R
public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, ResettableIterator<K> {
/** The adapted Map entry Set. */
- protected Set<Map.Entry<K, V>> entrySet;
+ Set<Map.Entry<K, V>> entrySet;
/** 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. */
- protected transient Map.Entry<K, V> entry;
+ transient Map.Entry<K, V> entry;
/**
* Create a new EntrySetToMapIteratorAdapter.
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java?rev=1494296&r1=1494295&r2=1494296&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java Tue Jun 18 20:54:29 2013
@@ -34,7 +34,7 @@ import org.apache.commons.collections4.m
public class AbstractIterableGetMapDecorator<K, V> implements IterableGet<K, V> {
/** The map to decorate */
- protected transient Map<K, V> map;
+ transient Map<K, V> map;
/**
* Create a new AbstractSplitMapDecorator.