diff options
Diffstat (limited to 'src/main/java/bjc/data/QueuedIterator.java')
| -rw-r--r-- | src/main/java/bjc/data/QueuedIterator.java | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/src/main/java/bjc/data/QueuedIterator.java b/src/main/java/bjc/data/QueuedIterator.java index f10014e..805fc5e 100644 --- a/src/main/java/bjc/data/QueuedIterator.java +++ b/src/main/java/bjc/data/QueuedIterator.java @@ -9,8 +9,7 @@ import java.util.Iterator; * * @author bjculkin * - * @param <E> - * The type of element this iterator iterates over + * @param <E> The type of element this iterator iterates over */ public class QueuedIterator<E> implements Iterator<E> { private Iterator<E> cur; @@ -19,7 +18,9 @@ public class QueuedIterator<E> implements Iterator<E> { /** * Static method for constructing iterators. - * + * + * @param <E> The type of element this iterator iterates over + * * @return A queued iterator. */ public static <E> QueuedIterator<E> queued() { @@ -29,8 +30,9 @@ public class QueuedIterator<E> implements Iterator<E> { /** * Static method for constructing iterators. * - * @param vals - * The values to iterate over. + * @param <E> The type of element this iterator iterates over + * + * @param vals The values to iterate over. * * @return A queued iterator. */ @@ -42,8 +44,9 @@ public class QueuedIterator<E> implements Iterator<E> { /** * Static method for constructing iterators. * - * @param itrs - * The iterators to use. + * @param <E> The type of element this iterator iterates over + * + * @param itrs The iterators to use. * * @return A queued iterator over the provided iterators. */ @@ -55,8 +58,9 @@ public class QueuedIterator<E> implements Iterator<E> { /** * Static method for constructing iterators. * - * @param itrs - * The iterables to use. + * @param <E> The type of element this iterator iterates over + * + * @param itrs The iterables to use. * * @return A queued iterator over the provided iterables. */ @@ -82,9 +86,7 @@ public class QueuedIterator<E> implements Iterator<E> { public QueuedIterator(Iterator<E>... inits) { this(); - for (Iterator<E> init : inits) { - pending.add(init); - } + for (Iterator<E> init : inits) pending.add(init); } /** @@ -97,9 +99,7 @@ public class QueuedIterator<E> implements Iterator<E> { public QueuedIterator(Iterable<E>... inits) { this(); - for (Iterable<E> init : inits) { - pending.add(init.iterator()); - } + for (Iterable<E> init : inits) pending.add(init.iterator()); } /** @@ -208,8 +208,7 @@ public class QueuedIterator<E> implements Iterator<E> { @Override public boolean hasNext() { while (cur == null || !cur.hasNext()) { - if (pending.isEmpty()) - return false; + if (pending.isEmpty()) return false; cur = pending.pop(); } @@ -220,13 +219,11 @@ public class QueuedIterator<E> implements Iterator<E> { @Override public E next() { while (cur == null || !cur.hasNext()) { - if (pending.isEmpty()) - return null; + if (pending.isEmpty()) return null; cur = pending.pop(); } return cur.next(); } - } |
