From 4f00c553897cc3342089c4b40f7bed5f36e924de Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Tue, 18 Jun 2013 20:54:29 +0000 Subject: [PATCH] [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 --- RELEASE-NOTES.txt | 2 +- .../bidimap/AbstractDualBidiMap.java | 12 ++++++------ .../collections4/list/AbstractLinkedList.java | 6 +++--- .../collections4/map/AbstractHashedMap.java | 16 ++++++++-------- .../collections4/map/AbstractLinkedMap.java | 2 +- .../collections4/map/AbstractMapDecorator.java | 2 +- .../map/EntrySetToMapIteratorAdapter.java | 6 +++--- .../AbstractIterableGetMapDecorator.java | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index fd8fed369..6a664df94 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -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 diff --git a/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java index 33377ba8e..193604e0e 100644 --- a/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java @@ -44,32 +44,32 @@ public abstract class AbstractDualBidiMap implements BidiMap { /** * Normal delegate map. */ - protected transient Map normalMap; + transient Map normalMap; /** * Reverse delegate map. */ - protected transient Map reverseMap; + transient Map reverseMap; /** * Inverse view of this map. */ - protected transient BidiMap inverseBidiMap = null; + transient BidiMap inverseBidiMap = null; /** * View of the keys. */ - protected transient Set keySet = null; + transient Set keySet = null; /** * View of the values. */ - protected transient Collection values = null; + transient Collection values = null; /** * View of the entries. */ - protected transient Set> entrySet = null; + transient Set> entrySet = null; /** * Creates an empty map, initialised by createMap. 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 9d1bf372b..9e80e073f 100644 --- a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java +++ b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java @@ -59,13 +59,13 @@ public abstract class AbstractLinkedList implements List { * hold a value. The value of next is the first item in the * list. The value of of previous is the last item in the list. */ - protected transient Node header; + transient Node 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. 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 884b6d20c..4026f735a 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java @@ -76,21 +76,21 @@ public class AbstractHashedMap extends AbstractMap implements Iterab 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[] data; + transient HashEntry[] 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 entrySet; + transient EntrySet entrySet; /** Key set */ - protected transient KeySet keySet; + transient KeySet keySet; /** Values */ - protected transient Values values; + transient Values values; /** * Constructor only used in deserialization, do not use otherwise. 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 ebfd0685b..4ad6c0f73 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java @@ -62,7 +62,7 @@ import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator; public abstract class AbstractLinkedMap extends AbstractHashedMap implements OrderedMap { /** Header in the linked list */ - protected transient LinkEntry header; + transient LinkEntry header; /** * Constructor only used in deserialization, do not use otherwise. diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java index f67c4c5fd..ddf945498 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java @@ -41,7 +41,7 @@ import java.util.Set; public abstract class AbstractMapDecorator extends AbstractIterableMap { /** The map to decorate */ - protected transient Map map; + transient Map map; /** * Constructor only used in deserialization, do not use otherwise. diff --git a/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java index 00c03f8d7..668d555a4 100644 --- a/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java +++ b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java @@ -32,13 +32,13 @@ import org.apache.commons.collections4.ResettableIterator; public class EntrySetToMapIteratorAdapter implements MapIterator, ResettableIterator { /** The adapted Map entry Set. */ - protected Set> entrySet; + Set> entrySet; /** The resettable iterator in use. */ - protected transient Iterator> iterator; + transient Iterator> iterator; /** The currently positioned Map entry. */ - protected transient Map.Entry entry; + transient Map.Entry entry; /** * Create a new EntrySetToMapIteratorAdapter. diff --git a/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java index c9f4f52a0..15a5f8866 100644 --- a/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java @@ -34,7 +34,7 @@ import org.apache.commons.collections4.map.EntrySetToMapIteratorAdapter; public class AbstractIterableGetMapDecorator implements IterableGet { /** The map to decorate */ - protected transient Map map; + transient Map map; /** * Create a new AbstractSplitMapDecorator.