Author: scolebourne
Date: Sat Nov 4 06:17:26 2006
New Revision: 471201
URL: http://svn.apache.org/viewvc?view=rev&rev=471201
Log:
Remove getBag() - use covariant decorated()
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/PredicatedBag.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java?view=diff&rev=471201&r1=471200&r2=471201
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
Sat Nov 4 06:17:26 2006
@@ -57,25 +57,25 @@
*
* @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();
}
}
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java?view=diff&rev=471201&r1=471200&r2=471201
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
Sat Nov 4 06:17:26 2006
@@ -56,21 +56,21 @@
*
* @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();
}
}
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/PredicatedBag.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/PredicatedBag.java?view=diff&rev=471201&r1=471200&r2=471201
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/PredicatedBag.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/PredicatedBag.java
Sat Nov 4 06:17:26 2006
@@ -84,26 +84,26 @@
*
* @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);
}
}
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java?view=diff&rev=471201&r1=471200&r2=471201
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
Sat Nov 4 06:17:26 2006
@@ -83,21 +83,21 @@
*
* @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();
}
}
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java?view=diff&rev=471201&r1=471200&r2=471201
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
Sat Nov 4 06:17:26 2006
@@ -98,7 +98,7 @@
//-----------------------------------------------------------------------
public Iterator iterator() {
- return UnmodifiableIterator.decorate(getCollection().iterator());
+ return UnmodifiableIterator.decorate(decorated().iterator());
}
public boolean add(Object object) {
@@ -135,7 +135,7 @@
}
public Set uniqueSet() {
- Set set = getBag().uniqueSet();
+ Set set = decorated().uniqueSet();
return UnmodifiableSet.decorate(set);
}
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java?view=diff&rev=471201&r1=471200&r2=471201
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
Sat Nov 4 06:17:26 2006
@@ -98,7 +98,7 @@
//-----------------------------------------------------------------------
public Iterator iterator() {
- return UnmodifiableIterator.decorate(getCollection().iterator());
+ return UnmodifiableIterator.decorate(decorated().iterator());
}
public boolean add(Object object) {
@@ -135,7 +135,7 @@
}
public Set uniqueSet() {
- Set set = getBag().uniqueSet();
+ Set set = decorated().uniqueSet();
return UnmodifiableSet.decorate(set);
}
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java?view=diff&rev=471201&r1=471200&r2=471201
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
Sat Nov 4 06:17:26 2006
@@ -80,7 +80,7 @@
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");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
