From 6b1e3197b517a3afa488f7307e18659df5c4feec Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Sat, 4 Nov 2006 14:17:26 +0000 Subject: [PATCH] Remove getBag() - use covariant decorated() git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/branches/collections_jdk5_branch@471201 13f79535-47bb-0310-9956-ffa450edef68 --- .../collections/bag/AbstractBagDecorator.java | 12 ++++++------ .../collections/bag/AbstractSortedBagDecorator.java | 10 +++++----- .../commons/collections/bag/PredicatedBag.java | 12 ++++++------ .../commons/collections/bag/PredicatedSortedBag.java | 10 +++++----- .../commons/collections/bag/UnmodifiableBag.java | 4 ++-- .../collections/bag/UnmodifiableSortedBag.java | 4 ++-- .../collections/bag/TestPredicatedSortedBag.java | 2 +- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java b/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java index 09e6c4149..b65bc7435 100644 --- a/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java +++ b/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java @@ -57,25 +57,25 @@ public abstract class AbstractBagDecorator * * @return the decorated bag */ - protected Bag getBag() { - return (Bag) getCollection(); + protected Bag decorated() { + return (Bag) super.decorated(); } //----------------------------------------------------------------------- public int getCount(Object object) { - return getBag().getCount(object); + return decorated().getCount(object); } public boolean add(Object object, int count) { - return getBag().add(object, count); + return decorated().add(object, count); } public boolean remove(Object object, int count) { - return getBag().remove(object, count); + return decorated().remove(object, count); } public Set uniqueSet() { - return getBag().uniqueSet(); + return decorated().uniqueSet(); } } diff --git a/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java b/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java index 69f38bb27..ec17b69af 100644 --- a/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java +++ b/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java @@ -56,21 +56,21 @@ public abstract class AbstractSortedBagDecorator * * @return the decorated bag */ - protected SortedBag getSortedBag() { - return (SortedBag) getCollection(); + protected SortedBag decorated() { + return (SortedBag) super.decorated(); } //----------------------------------------------------------------------- public Object first() { - return getSortedBag().first(); + return decorated().first(); } public Object last() { - return getSortedBag().last(); + return decorated().last(); } public Comparator comparator() { - return getSortedBag().comparator(); + return decorated().comparator(); } } diff --git a/src/java/org/apache/commons/collections/bag/PredicatedBag.java b/src/java/org/apache/commons/collections/bag/PredicatedBag.java index 876ed4537..ef72001de 100644 --- a/src/java/org/apache/commons/collections/bag/PredicatedBag.java +++ b/src/java/org/apache/commons/collections/bag/PredicatedBag.java @@ -84,26 +84,26 @@ public class PredicatedBag * * @return the decorated bag */ - protected Bag getBag() { - return (Bag) getCollection(); + protected Bag decorated() { + return (Bag) super.decorated(); } //----------------------------------------------------------------------- public boolean add(Object object, int count) { validate(object); - return getBag().add(object, count); + return decorated().add(object, count); } public boolean remove(Object object, int count) { - return getBag().remove(object, count); + return decorated().remove(object, count); } public Set uniqueSet() { - return getBag().uniqueSet(); + return decorated().uniqueSet(); } public int getCount(Object object) { - return getBag().getCount(object); + return decorated().getCount(object); } } diff --git a/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java b/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java index 6cbb2098d..24294707d 100644 --- a/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java +++ b/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java @@ -83,21 +83,21 @@ public class PredicatedSortedBag * * @return the decorated bag */ - protected SortedBag getSortedBag() { - return (SortedBag) getCollection(); + protected SortedBag decorated() { + return (SortedBag) super.decorated(); } //----------------------------------------------------------------------- public Object first() { - return getSortedBag().first(); + return decorated().first(); } public Object last() { - return getSortedBag().last(); + return decorated().last(); } public Comparator comparator() { - return getSortedBag().comparator(); + return decorated().comparator(); } } diff --git a/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java b/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java index 658e57f76..ee85e827c 100644 --- a/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java +++ b/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java @@ -98,7 +98,7 @@ public final class UnmodifiableBag //----------------------------------------------------------------------- public Iterator iterator() { - return UnmodifiableIterator.decorate(getCollection().iterator()); + return UnmodifiableIterator.decorate(decorated().iterator()); } public boolean add(Object object) { @@ -135,7 +135,7 @@ public final class UnmodifiableBag } public Set uniqueSet() { - Set set = getBag().uniqueSet(); + Set set = decorated().uniqueSet(); return UnmodifiableSet.decorate(set); } diff --git a/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java b/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java index e70994f5f..4c7db8999 100644 --- a/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java +++ b/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java @@ -98,7 +98,7 @@ public final class UnmodifiableSortedBag //----------------------------------------------------------------------- public Iterator iterator() { - return UnmodifiableIterator.decorate(getCollection().iterator()); + return UnmodifiableIterator.decorate(decorated().iterator()); } public boolean add(Object object) { @@ -135,7 +135,7 @@ public final class UnmodifiableSortedBag } public Set uniqueSet() { - Set set = getBag().uniqueSet(); + Set set = decorated().uniqueSet(); return UnmodifiableSet.decorate(set); } diff --git a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java index b568f8fb0..98a2d269f 100644 --- a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java @@ -80,7 +80,7 @@ public class TestPredicatedSortedBag extends AbstractTestSortedBag { public void testDecorate() { SortedBag bag = decorateBag(new TreeBag(), stringPredicate()); - SortedBag bag2 = ((PredicatedSortedBag) bag).getSortedBag(); + SortedBag bag2 = ((PredicatedSortedBag) bag).decorated(); try { SortedBag bag3 = decorateBag(new TreeBag(), null); fail("Expecting IllegalArgumentException for null predicate");