Author: scolebourne
Date: Sat Nov 4 05:47:51 2006
New Revision: 471186
URL: http://svn.apache.org/viewvc?view=rev&rev=471186
Log:
Remove getSet() and getSortedSet() - use decorated()
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.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/TestListOrderedSet.java
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java?view=diff&rev=471186&r1=471185&r2=471186
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java
Sat Nov 4 05:47:51 2006
@@ -57,16 +57,6 @@
* Gets the set being decorated.
*
* @return the decorated set
- * @deprecated use decorated()
- */
- protected Set<E> getSet() {
- return decorated();
- }
-
- /**
- * Gets the set being decorated.
- *
- * @return the decorated set
*/
protected Set<E> decorated() {
return (Set<E>) super.decorated();
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java?view=diff&rev=471186&r1=471185&r2=471186
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
Sat Nov 4 05:47:51 2006
@@ -54,16 +54,6 @@
}
/**
- * Gets the sorted set being decorated.
- *
- * @return the decorated set
- * @deprecated use decorated()
- */
- protected SortedSet<E> getSortedSet() {
- return decorated();
- }
-
- /**
* Gets the set being decorated.
*
* @return the decorated set
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=471186&r1=471185&r2=471186
==============================================================================
---
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 05:47:51 2006
@@ -123,17 +123,17 @@
//-----------------------------------------------------------------------
public SortedSet subSet(Object fromElement, Object toElement) {
- SortedSet sub = getSortedSet().subSet(fromElement, toElement);
+ SortedSet sub = decorated().subSet(fromElement, toElement);
return new UnmodifiableSortedSet(sub);
}
public SortedSet headSet(Object toElement) {
- SortedSet sub = getSortedSet().headSet(toElement);
+ SortedSet sub = decorated().headSet(toElement);
return new UnmodifiableSortedSet(sub);
}
public SortedSet tailSet(Object fromElement) {
- SortedSet sub = getSortedSet().tailSet(fromElement);
+ SortedSet sub = decorated().tailSet(fromElement);
return new UnmodifiableSortedSet(sub);
}
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestListOrderedSet.java?view=diff&rev=471186&r1=471185&r2=471186
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
Sat Nov 4 05:47:51 2006
@@ -174,7 +174,7 @@
assertEquals(1, set.size());
set.add(b); // will match but not replace A as equal
assertEquals(1, set.size());
- assertSame(a, set.getSet().iterator().next());
+ assertSame(a, set.decorated().iterator().next());
assertSame(a, set.iterator().next());
assertSame(a, set.get(0));
assertSame(a, set.asList().get(0));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
