From 5c411bf6e792b413af6b8740428ad354a9d52f57 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Thu, 16 Sep 2010 17:38:29 +0000 Subject: [PATCH] There's a method for that. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6159 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/nio/SelectorIterable.java | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/java/com/threerings/nio/SelectorIterable.java b/src/java/com/threerings/nio/SelectorIterable.java index a71aec812..5d076ec38 100644 --- a/src/java/com/threerings/nio/SelectorIterable.java +++ b/src/java/com/threerings/nio/SelectorIterable.java @@ -8,6 +8,8 @@ import java.io.IOException; import java.nio.channels.SelectionKey; import java.nio.channels.Selector; +import com.google.common.collect.Iterators; + import static com.threerings.presents.Log.log; /** @@ -38,23 +40,7 @@ public class SelectorIterable public Iterator iterator () { - final Iterator it = select().iterator(); - return new Iterator() { - public boolean hasNext () { - return it.hasNext(); - } - - public SelectionKey next () { - SelectionKey key = it.next(); - it.remove(); - return key; - } - - public void remove () { - throw new UnsupportedOperationException( - "Removing from the selected keys is done automatically on next()"); - } - }; + return Iterators.consumingIterator(select().iterator()); } protected Set select ()