mirror of
https://github.com/apache/commons-collections.git
synced 2025-02-25 20:18:31 +00:00
[COLLECTIONS-310] SetUniqueList#subList now returns an unmodifiable list.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1476557 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
4b9c68b55a
commit
803a9c6c17
@ -276,6 +276,10 @@
|
|||||||
Use of final keyword where applicable, minor performance improvements by properly
|
Use of final keyword where applicable, minor performance improvements by properly
|
||||||
initializing the capacity of newly created collections when known in advance.
|
initializing the capacity of newly created collections when known in advance.
|
||||||
</action>
|
</action>
|
||||||
|
<action issue="COLLECTIONS-307" dev="tn" type="update" due-to="Christian Semrau, Thomas Vahrst">
|
||||||
|
"SetUniqueList#subList()" will now return an unmodifiable list as changes to it
|
||||||
|
may invalidate the parent list.
|
||||||
|
</action>
|
||||||
<action issue="COLLECTIONS-307" dev="bayard" type="fix" due-to="Christian Semrau">
|
<action issue="COLLECTIONS-307" dev="bayard" type="fix" due-to="Christian Semrau">
|
||||||
"SetUniqueList#subList()#contains(Object)" will now correctly check the subList
|
"SetUniqueList#subList()#contains(Object)" will now correctly check the subList
|
||||||
rather than the parent list.
|
rather than the parent list.
|
||||||
|
@ -24,6 +24,7 @@ import java.util.List;
|
|||||||
import java.util.ListIterator;
|
import java.util.ListIterator;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import org.apache.commons.collections4.ListUtils;
|
||||||
import org.apache.commons.collections4.set.UnmodifiableSet;
|
import org.apache.commons.collections4.set.UnmodifiableSet;
|
||||||
import org.apache.commons.collections4.iterators.AbstractIteratorDecorator;
|
import org.apache.commons.collections4.iterators.AbstractIteratorDecorator;
|
||||||
import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator;
|
import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator;
|
||||||
@ -319,11 +320,17 @@ public class SetUniqueList<E> extends AbstractSerializableListDecorator<E> {
|
|||||||
return new SetListListIterator<E>(super.listIterator(index), set);
|
return new SetListListIterator<E>(super.listIterator(index), set);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritDoc}
|
||||||
|
* <p>
|
||||||
|
* NOTE: from 4.0, an unmodifiable list will be returned, as changes to the
|
||||||
|
* subList can invalidate the parent list.
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<E> subList(final int fromIndex, final int toIndex) {
|
public List<E> subList(final int fromIndex, final int toIndex) {
|
||||||
final List<E> superSubList = super.subList(fromIndex, toIndex);
|
final List<E> superSubList = super.subList(fromIndex, toIndex);
|
||||||
final Set<E> subSet = createSetBasedOnList(set, superSubList);
|
final Set<E> subSet = createSetBasedOnList(set, superSubList);
|
||||||
return new SetUniqueList<E>(superSubList, subSet);
|
return ListUtils.unmodifiableList(new SetUniqueList<E>(superSubList, subSet));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -43,6 +43,7 @@ public class SetUniqueListTest<E> extends AbstractListTest<E> {
|
|||||||
return new SetUniqueList<E>(new ArrayList<E>(), new HashSet<E>());
|
return new SetUniqueList<E>(new ArrayList<E>(), new HashSet<E>());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//-----------------------------------------------------------------------
|
||||||
@Override
|
@Override
|
||||||
public void testListIteratorSet() {
|
public void testListIteratorSet() {
|
||||||
// override to block
|
// override to block
|
||||||
@ -461,6 +462,16 @@ public class SetUniqueListTest<E> extends AbstractListTest<E> {
|
|||||||
assertEquals(4, decoratedList.size());
|
assertEquals(4, decoratedList.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void testSubListIsUnmodifiable() {
|
||||||
|
resetFull();
|
||||||
|
List<E> subList = getCollection().subList(1, 3);
|
||||||
|
try {
|
||||||
|
subList.remove(0);
|
||||||
|
fail("subList should be unmodifiable");
|
||||||
|
} catch (UnsupportedOperationException e) {
|
||||||
|
// expected
|
||||||
|
}
|
||||||
|
}
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public void testCollections307() {
|
public void testCollections307() {
|
||||||
List<E> list = new ArrayList<E>();
|
List<E> list = new ArrayList<E>();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user