scolebourne 2003/12/03 03:37:44
Modified: collections/src/java/org/apache/commons/collections/decorators
OrderedSet.java CompositeCollection.java
SetList.java
collections/src/java/org/apache/commons/collections/list
SetUniqueList.java
collections/src/java/org/apache/commons/collections/iterators
IteratorChain.java CollatingIterator.java
collections/src/java/org/apache/commons/collections
SequencedHashMap.java SetUtils.java MapUtils.java
DefaultMapBag.java CollectionUtils.java
BeanMap.java
collections/src/java/org/apache/commons/collections/collection
CompositeCollection.java
collections/src/java/org/apache/commons/collections/set
ListOrderedSet.java
Log:
Use the Unmodifiable decorators everywhere
Revision Changes Path
1.6 +5 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/decorators/OrderedSet.java
Index: OrderedSet.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/decorators/OrderedSet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OrderedSet.java 16 Nov 2003 00:39:37 -0000 1.5
+++ OrderedSet.java 3 Dec 2003 11:37:44 -0000 1.6
@@ -59,12 +59,13 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.apache.commons.collections.list.UnmodifiableList;
+
/**
* Decorates a <code>Set</code> to ensure that the order of addition
* is retained and used by the iterator.
@@ -155,7 +156,7 @@
* @return an unmodifiable list view
*/
public List asList() {
- return Collections.unmodifiableList(setOrder);
+ return UnmodifiableList.decorate(setOrder);
}
//-----------------------------------------------------------------------
1.3 +4 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/decorators/CompositeCollection.java
Index: CompositeCollection.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/decorators/CompositeCollection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CompositeCollection.java 16 Nov 2003 00:39:37 -0000 1.2
+++ CompositeCollection.java 3 Dec 2003 11:37:44 -0000 1.3
@@ -61,11 +61,11 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import org.apache.commons.collections.IteratorUtils;
import org.apache.commons.collections.iterators.IteratorChain;
+import org.apache.commons.collections.list.UnmodifiableList;
/**
* A <code>Collection</code> implementation that decorates other collections
@@ -416,7 +416,7 @@
* @return Unmodifiable collection of all collections in this composite.
*/
public Collection getCollections() {
- return Collections.unmodifiableList(Arrays.asList(this.all));
+ return UnmodifiableList.decorate(Arrays.asList(this.all));
}
//-----------------------------------------------------------------------
1.5 +5 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/decorators/SetList.java
Index: SetList.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/decorators/SetList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SetList.java 16 Nov 2003 00:39:37 -0000 1.4
+++ SetList.java 3 Dec 2003 11:37:44 -0000 1.5
@@ -59,13 +59,14 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Set;
+import org.apache.commons.collections.set.UnmodifiableSet;
+
/**
* SetList combines the <code>List</code> and <code>Set</code> interfaces
* in one implementation.
@@ -142,7 +143,7 @@
* @return an unmodifiable set view
*/
public Set asSet() {
- return Collections.unmodifiableSet(set);
+ return UnmodifiableSet.decorate(set);
}
//-----------------------------------------------------------------------
1.2 +4 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/list/SetUniqueList.java
Index: SetUniqueList.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/list/SetUniqueList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetUniqueList.java 16 Nov 2003 00:05:47 -0000 1.1
+++ SetUniqueList.java 3 Dec 2003 11:37:44 -0000 1.2
@@ -59,7 +59,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -68,6 +67,7 @@
import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
import org.apache.commons.collections.iterators.AbstractListIteratorDecorator;
+import org.apache.commons.collections.set.UnmodifiableSet;
/**
* Decorates a <code>List</code> to ensure that no duplicates are present
@@ -144,7 +144,7 @@
* @return an unmodifiable set view
*/
public Set asSet() {
- return Collections.unmodifiableSet(set);
+ return UnmodifiableSet.decorate(set);
}
//-----------------------------------------------------------------------
1.7 +6 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/IteratorChain.java
Index: IteratorChain.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/IteratorChain.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IteratorChain.java 29 Sep 2003 22:02:33 -0000 1.6
+++ IteratorChain.java 3 Dec 2003 11:37:44 -0000 1.7
@@ -59,10 +59,12 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
+
+import org.apache.commons.collections.list.UnmodifiableList;
+
/**
* <p>An IteratorChain is an Iterator that wraps one or
* more Iterators. When any method from the
@@ -211,7 +213,7 @@
* @return the unmodifiable list of iterators added
*/
public List getIterators() {
- return Collections.unmodifiableList(iteratorChain);
+ return UnmodifiableList.decorate(iteratorChain);
}
/**
1.10 +5 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
Index: CollatingIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/CollatingIterator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CollatingIterator.java 29 Sep 2003 22:37:40 -0000 1.9
+++ CollatingIterator.java 3 Dec 2003 11:37:44 -0000 1.10
@@ -60,12 +60,13 @@
import java.util.ArrayList;
import java.util.BitSet;
import java.util.Collection;
-import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
+import org.apache.commons.collections.list.UnmodifiableList;
+
/**
* Provides an ordered iteration over the elements contained in
* a collection of ordered [EMAIL PROTECTED] Iterator}s.
@@ -225,7 +226,7 @@
* @return the unmodifiable list of iterators added
*/
public List getIterators() {
- return Collections.unmodifiableList(iterators);
+ return UnmodifiableList.decorate(iterators);
}
/**
1.22 +5 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/SequencedHashMap.java
Index: SequencedHashMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/SequencedHashMap.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SequencedHashMap.java 23 Nov 2003 14:40:41 -0000 1.21
+++ SequencedHashMap.java 3 Dec 2003 11:37:44 -0000 1.22
@@ -65,7 +65,6 @@
import java.util.AbstractSet;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.ConcurrentModificationException;
import java.util.HashMap;
import java.util.Iterator;
@@ -74,6 +73,8 @@
import java.util.NoSuchElementException;
import java.util.Set;
+import org.apache.commons.collections.list.UnmodifiableList;
+
/**
* A map of objects whose mapping entries are sequenced based on the order in
* which they were added. This data structure has fast <i>O(1)</i> search
@@ -1000,7 +1001,7 @@
l.add(iter.next());
}
- return Collections.unmodifiableList(l);
+ return UnmodifiableList.decorate(l);
}
/**
1.21 +3 -3
jakarta-commons/collections/src/java/org/apache/commons/collections/SetUtils.java
Index: SetUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/SetUtils.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SetUtils.java 27 Nov 2003 22:55:16 -0000 1.20
+++ SetUtils.java 3 Dec 2003 11:37:44 -0000 1.21
@@ -103,7 +103,7 @@
* An empty unmodifiable sorted set.
* This is not provided in the JDK.
*/
- public static final SortedSet EMPTY_SORTED_SET =
Collections.unmodifiableSortedSet(new TreeSet());
+ public static final SortedSet EMPTY_SORTED_SET =
UnmodifiableSortedSet.decorate(new TreeSet());
/**
* <code>SetUtils</code> should not normally be instantiated.
1.40 +4 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/MapUtils.java
Index: MapUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/MapUtils.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- MapUtils.java 16 Nov 2003 00:05:44 -0000 1.39
+++ MapUtils.java 3 Dec 2003 11:37:44 -0000 1.40
@@ -127,12 +127,12 @@
* An empty unmodifiable map.
* This was not provided in JDK1.2.
*/
- public static final Map EMPTY_MAP = Collections.unmodifiableMap(new HashMap(1));
+ public static final Map EMPTY_MAP = UnmodifiableMap.decorate(new HashMap(1));
/**
* An empty unmodifiable sorted map.
* This is not provided in the JDK.
*/
- public static final SortedMap EMPTY_SORTED_MAP =
Collections.unmodifiableSortedMap(new TreeMap());
+ public static final SortedMap EMPTY_SORTED_MAP =
UnmodifiableSortedMap.decorate(new TreeMap());
/**
* String used to indent the verbose and debug Map prints.
*/
1.12 +5 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/DefaultMapBag.java
Index: DefaultMapBag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/DefaultMapBag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultMapBag.java 2 Dec 2003 23:36:12 -0000 1.11
+++ DefaultMapBag.java 3 Dec 2003 11:37:44 -0000 1.12
@@ -59,13 +59,14 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.commons.collections.set.UnmodifiableSet;
+
/**
* A skeletal implementation of the [EMAIL PROTECTED] Bag}
* interface to minimize the effort required for target implementations.
@@ -391,7 +392,7 @@
* @return the set of unique elements in this bag
*/
public Set uniqueSet() {
- return Collections.unmodifiableSet(_map.keySet());
+ return UnmodifiableSet.decorate(_map.keySet());
}
/**
1.50 +3 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/CollectionUtils.java
Index: CollectionUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/CollectionUtils.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- CollectionUtils.java 29 Nov 2003 18:14:20 -0000 1.49
+++ CollectionUtils.java 3 Dec 2003 11:37:44 -0000 1.50
@@ -59,7 +59,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
@@ -107,7 +106,7 @@
* this purpose. However they could be cast to Set or List which might be
* undesirable. This implementation only implements Collection.
*/
- public static final Collection EMPTY_COLLECTION =
Collections.unmodifiableCollection(new ArrayList());
+ public static final Collection EMPTY_COLLECTION =
UnmodifiableCollection.decorate(new ArrayList());
/**
* <code>CollectionUtils</code> should not normally be instantiated.
1.23 +8 -7
jakarta-commons/collections/src/java/org/apache/commons/collections/BeanMap.java
Index: BeanMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/BeanMap.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- BeanMap.java 3 Oct 2003 23:19:32 -0000 1.22
+++ BeanMap.java 3 Dec 2003 11:37:44 -0000 1.23
@@ -68,12 +68,13 @@
import java.util.AbstractSet;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Set;
+import org.apache.commons.collections.list.UnmodifiableList;
import org.apache.commons.collections.pairs.AbstractMapEntry;
+import org.apache.commons.collections.set.UnmodifiableSet;
/**
* An implementation of Map for JavaBeans which uses introspection to
@@ -444,7 +445,7 @@
* modifiable.
*/
public Set keySet() {
- return Collections.unmodifiableSet(readMethods.keySet());
+ return UnmodifiableSet.decorate(readMethods.keySet());
}
/**
@@ -455,7 +456,7 @@
* @return the unmodifiable set of mappings
*/
public Set entrySet() {
- return Collections.unmodifiableSet(new AbstractSet() {
+ return new AbstractSet() {
public Iterator iterator() {
return new Iterator() {
@@ -481,7 +482,7 @@
public int size() {
return BeanMap.this.readMethods.size();
}
- });
+ };
}
/**
@@ -495,7 +496,7 @@
for ( Iterator iter = valueIterator(); iter.hasNext(); ) {
answer.add( iter.next() );
}
- return Collections.unmodifiableList(answer);
+ return UnmodifiableList.decorate(answer);
}
1.2 +4 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/collection/CompositeCollection.java
Index: CompositeCollection.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/collection/CompositeCollection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CompositeCollection.java 16 Nov 2003 00:05:47 -0000 1.1
+++ CompositeCollection.java 3 Dec 2003 11:37:44 -0000 1.2
@@ -61,11 +61,11 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import org.apache.commons.collections.IteratorUtils;
import org.apache.commons.collections.iterators.IteratorChain;
+import org.apache.commons.collections.list.UnmodifiableList;
/**
* Decorates a other collections to provide a single unified view.
@@ -420,7 +420,7 @@
* @return Unmodifiable collection of all collections in this composite.
*/
public Collection getCollections() {
- return Collections.unmodifiableList(Arrays.asList(this.all));
+ return UnmodifiableList.decorate(Arrays.asList(this.all));
}
//-----------------------------------------------------------------------
1.2 +4 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/set/ListOrderedSet.java
Index: ListOrderedSet.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/set/ListOrderedSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ListOrderedSet.java 16 Nov 2003 00:05:45 -0000 1.1
+++ ListOrderedSet.java 3 Dec 2003 11:37:44 -0000 1.2
@@ -59,13 +59,13 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
+import org.apache.commons.collections.list.UnmodifiableList;
/**
* Decorates another <code>Set</code> to ensure that the order of addition
@@ -157,7 +157,7 @@
* @return an unmodifiable list view
*/
public List asList() {
- return Collections.unmodifiableList(setOrder);
+ return UnmodifiableList.decorate(setOrder);
}
//-----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
