Revert the meat of r2908.

Maybe mdb is using a newer compiler that is behaving correctly,
but my 1.6 freaks out without these.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2910 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
ray.j.greenwell
2010-10-01 23:15:03 +00:00
parent f49e205f68
commit 0f7fd4a914
@@ -223,6 +223,7 @@ public class Randoms
/**
* Shared code for pick and pluck.
*/
@SuppressWarnings("unchecked")
protected <T> T pickPluck (Iterable<? extends T> iterable, T ifEmpty, boolean remove)
{
if (iterable instanceof Collection) {
@@ -236,7 +237,7 @@ public class Randoms
// extra-special optimized path for Lists
List<? extends T> list = (List<? extends T>)coll;
int idx = _r.nextInt(size);
return remove ? list.remove(idx) : list.get(idx);
return (T) (remove ? list.remove(idx) : list.get(idx));
}
// for other Collections, we must iterate
Iterator<? extends T> it = coll.iterator();