diff --git a/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java b/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java index a278e50d9..920fcebfe 100644 --- a/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java +++ b/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java @@ -53,16 +53,6 @@ public abstract class AbstractSetDecorator super(set); } - /** - * Gets the set being decorated. - * - * @return the decorated set - * @deprecated use decorated() - */ - protected Set getSet() { - return decorated(); - } - /** * Gets the set being decorated. * diff --git a/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java b/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java index 4f886a218..6d9dcb267 100644 --- a/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java +++ b/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java @@ -53,16 +53,6 @@ public abstract class AbstractSortedSetDecorator super(set); } - /** - * Gets the sorted set being decorated. - * - * @return the decorated set - * @deprecated use decorated() - */ - protected SortedSet getSortedSet() { - return decorated(); - } - /** * Gets the set being decorated. * diff --git a/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java b/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java index 991cedddd..c074c70c9 100644 --- a/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java +++ b/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java @@ -123,17 +123,17 @@ public final class UnmodifiableSortedSet //----------------------------------------------------------------------- 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); } diff --git a/src/test/org/apache/commons/collections/set/TestListOrderedSet.java b/src/test/org/apache/commons/collections/set/TestListOrderedSet.java index 32a604345..1f89bd193 100644 --- a/src/test/org/apache/commons/collections/set/TestListOrderedSet.java +++ b/src/test/org/apache/commons/collections/set/TestListOrderedSet.java @@ -174,7 +174,7 @@ public class TestListOrderedSet extends AbstractTestSet { 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));