Author: tn
Date: Wed Mar 25 16:02:45 2015
New Revision: 1669140
URL: http://svn.apache.org/r1669140
Log:
[COLLECTIONS-558] Change return type of ListOrderedSet#remove(int) to the
generic type parameter. Thanks to Felix Rabe
Modified:
commons/proper/collections/trunk/src/changes/changes.xml
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
Modified: commons/proper/collections/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/changes/changes.xml?rev=1669140&r1=1669139&r2=1669140&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/changes/changes.xml (original)
+++ commons/proper/collections/trunk/src/changes/changes.xml Wed Mar 25
16:02:45 2015
@@ -22,6 +22,9 @@
<body>
<release version="4.1" date="TBD" description="">
+ <action issue="COLLECTIONS-558" dev="tn" type="fix" due-to="Felix Rabe">
+ Changed return type of "ListOrderedSet#remove(int)" from Object to the
generic type parameter.
+ </action>
<action issue="COLLECTIONS-555" dev="tn" type="fix" due-to="M Kim">
Added clarification to javadoc of "TreeBag#add(Object)" wrt null
arguments.
</action>
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java?rev=1669140&r1=1669139&r2=1669140&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
Wed Mar 25 16:02:45 2015
@@ -345,8 +345,8 @@ public class ListOrderedSet<E>
* @return the element that has been remove from the ordered set
* @see List#remove(int)
*/
- public Object remove(final int index) {
- final Object obj = setOrder.remove(index);
+ public E remove(final int index) {
+ final E obj = setOrder.remove(index);
remove(obj);
return obj;
}
