Author: scolebourne Date: Sat Nov 4 06:21:44 2006 New Revision: 471202 URL: http://svn.apache.org/viewvc?view=rev&rev=471202 Log: Remove getCollection() - use covariant decorated()
Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/PredicatedCollection.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/TransformedCollection.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/PredicatedList.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/UnmodifiableList.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/PredicatedSet.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/UnmodifiableSet.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestPredicatedSet.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java Sat Nov 4 06:21:44 2006 @@ -81,17 +81,17 @@ * * @return the decorated buffer */ - protected Buffer getBuffer() { - return (Buffer) getCollection(); + protected Buffer decorated() { + return (Buffer) super.decorated(); } //----------------------------------------------------------------------- public Object get() { - return getBuffer().get(); + return decorated().get(); } public Object remove() { - return getBuffer().remove(); + return decorated().remove(); } } Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java Sat Nov 4 06:21:44 2006 @@ -97,7 +97,7 @@ //----------------------------------------------------------------------- public Iterator iterator() { - return UnmodifiableIterator.decorate(getCollection().iterator()); + return UnmodifiableIterator.decorate(decorated().iterator()); } public boolean add(Object object) { Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java Sat Nov 4 06:21:44 2006 @@ -69,16 +69,6 @@ /** * Gets the collection being decorated. - * - * @return the decorated collection - * @deprecated use decorated() - */ - protected Collection<E> getCollection() { - return decorated(); - } - - /** - * Gets the collection being decorated. * All access to the decorated collection goes via this method. * * @return the decorated collection Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/PredicatedCollection.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/PredicatedCollection.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/PredicatedCollection.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/PredicatedCollection.java Sat Nov 4 06:21:44 2006 @@ -63,7 +63,7 @@ public static Collection decorate(Collection coll, Predicate predicate) { return new PredicatedCollection(coll, predicate); } - + //----------------------------------------------------------------------- /** * Constructor that wraps (not copies). @@ -113,7 +113,7 @@ */ public boolean add(Object object) { validate(object); - return getCollection().add(object); + return decorated().add(object); } /** @@ -129,7 +129,7 @@ for (Iterator it = coll.iterator(); it.hasNext(); ) { validate(it.next()); } - return getCollection().addAll(coll); + return decorated().addAll(coll); } } Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/TransformedCollection.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/TransformedCollection.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/TransformedCollection.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/TransformedCollection.java Sat Nov 4 06:21:44 2006 @@ -111,12 +111,12 @@ //----------------------------------------------------------------------- public boolean add(Object object) { object = transform(object); - return getCollection().add(object); + return decorated().add(object); } public boolean addAll(Collection coll) { coll = transform(coll); - return getCollection().addAll(coll); + return decorated().addAll(coll); } } Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java Sat Nov 4 06:21:44 2006 @@ -103,7 +103,7 @@ //----------------------------------------------------------------------- public Iterator iterator() { - return UnmodifiableIterator.decorate(getCollection().iterator()); + return UnmodifiableIterator.decorate(decorated().iterator()); } public boolean add(Object object) { Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java Sat Nov 4 06:21:44 2006 @@ -68,7 +68,7 @@ //----------------------------------------------------------------------- public Iterator iterator() { - return UnmodifiableIterator.decorate(getCollection().iterator()); + return UnmodifiableIterator.decorate(decorated().iterator()); } public boolean add(Object object) { Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/PredicatedList.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/PredicatedList.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/PredicatedList.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/PredicatedList.java Sat Nov 4 06:21:44 2006 @@ -85,38 +85,38 @@ * * @return the decorated list */ - protected List getList() { - return (List) getCollection(); + protected List decorated() { + return (List) super.decorated(); } //----------------------------------------------------------------------- public Object get(int index) { - return getList().get(index); + return decorated().get(index); } public int indexOf(Object object) { - return getList().indexOf(object); + return decorated().indexOf(object); } public int lastIndexOf(Object object) { - return getList().lastIndexOf(object); + return decorated().lastIndexOf(object); } public Object remove(int index) { - return getList().remove(index); + return decorated().remove(index); } //----------------------------------------------------------------------- public void add(int index, Object object) { validate(object); - getList().add(index, object); + decorated().add(index, object); } public boolean addAll(int index, Collection coll) { for (Iterator it = coll.iterator(); it.hasNext(); ) { validate(it.next()); } - return getList().addAll(index, coll); + return decorated().addAll(index, coll); } public ListIterator listIterator() { @@ -124,16 +124,16 @@ } public ListIterator listIterator(int i) { - return new PredicatedListIterator(getList().listIterator(i)); + return new PredicatedListIterator(decorated().listIterator(i)); } public Object set(int index, Object object) { validate(object); - return getList().set(index, object); + return decorated().set(index, object); } public List subList(int fromIndex, int toIndex) { - List sub = getList().subList(fromIndex, toIndex); + List sub = decorated().subList(fromIndex, toIndex); return new PredicatedList(sub, predicate); } Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/UnmodifiableList.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/UnmodifiableList.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/UnmodifiableList.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/UnmodifiableList.java Sat Nov 4 06:21:44 2006 @@ -68,7 +68,7 @@ //----------------------------------------------------------------------- public Iterator iterator() { - return UnmodifiableIterator.decorate(getCollection().iterator()); + return UnmodifiableIterator.decorate(decorated().iterator()); } public boolean add(Object object) { Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/PredicatedSet.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/PredicatedSet.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/PredicatedSet.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/PredicatedSet.java Sat Nov 4 06:21:44 2006 @@ -81,8 +81,8 @@ * * @return the decorated set */ - protected Set getSet() { - return (Set) getCollection(); + protected Set decorated() { + return (Set) super.decorated(); } } Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java Sat Nov 4 06:21:44 2006 @@ -81,36 +81,36 @@ * * @return the decorated sorted set */ - private SortedSet getSortedSet() { - return (SortedSet) getCollection(); + protected SortedSet decorated() { + return (SortedSet) super.decorated(); } //----------------------------------------------------------------------- - public SortedSet subSet(Object fromElement, Object toElement) { - SortedSet sub = getSortedSet().subSet(fromElement, toElement); - return new PredicatedSortedSet(sub, predicate); + public Comparator comparator() { + return decorated().comparator(); } - public SortedSet headSet(Object toElement) { - SortedSet sub = getSortedSet().headSet(toElement); - return new PredicatedSortedSet(sub, predicate); + public Object first() { + return decorated().first(); } - public SortedSet tailSet(Object fromElement) { - SortedSet sub = getSortedSet().tailSet(fromElement); - return new PredicatedSortedSet(sub, predicate); + public Object last() { + return decorated().last(); } - public Object first() { - return getSortedSet().first(); + public SortedSet subSet(Object fromElement, Object toElement) { + SortedSet sub = decorated().subSet(fromElement, toElement); + return new PredicatedSortedSet(sub, predicate); } - public Object last() { - return getSortedSet().last(); + public SortedSet headSet(Object toElement) { + SortedSet sub = decorated().headSet(toElement); + return new PredicatedSortedSet(sub, predicate); } - public Comparator comparator() { - return getSortedSet().comparator(); + public SortedSet tailSet(Object fromElement) { + SortedSet sub = decorated().tailSet(fromElement); + return new PredicatedSortedSet(sub, predicate); } } Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/UnmodifiableSet.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/UnmodifiableSet.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/UnmodifiableSet.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/UnmodifiableSet.java Sat Nov 4 06:21:44 2006 @@ -66,7 +66,7 @@ //----------------------------------------------------------------------- public Iterator iterator() { - return UnmodifiableIterator.decorate(getCollection().iterator()); + return UnmodifiableIterator.decorate(decorated().iterator()); } public boolean add(Object object) { Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java Sat Nov 4 06:21:44 2006 @@ -94,7 +94,7 @@ //----------------------------------------------------------------------- public Iterator iterator() { - return UnmodifiableIterator.decorate(getCollection().iterator()); + return UnmodifiableIterator.decorate(decorated().iterator()); } public boolean add(Object object) { Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestPredicatedSet.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestPredicatedSet.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestPredicatedSet.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestPredicatedSet.java Sat Nov 4 06:21:44 2006 @@ -81,7 +81,7 @@ public void testGetSet() { Set set = makeTestSet(); assertTrue("returned set should not be null", - ((PredicatedSet) set).getSet() != null); + ((PredicatedSet) set).decorated() != null); } public void testIllegalAdd() { Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java?view=diff&rev=471202&r1=471201&r2=471202 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java Sat Nov 4 06:21:44 2006 @@ -84,7 +84,7 @@ public void testGetSet() { SortedSet set = makeTestSet(); assertTrue("returned set should not be null", - ((PredicatedSortedSet) set).getSet() != null); + ((PredicatedSortedSet) set).decorated() != null); } public void testIllegalAdd() { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]