summaryrefslogtreecommitdiff
path: root/BJC-Utils2/src/main/java/bjc/utils/data/CircularIterator.java
diff options
context:
space:
mode:
Diffstat (limited to 'BJC-Utils2/src/main/java/bjc/utils/data/CircularIterator.java')
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/data/CircularIterator.java17
1 files changed, 8 insertions, 9 deletions
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/CircularIterator.java b/BJC-Utils2/src/main/java/bjc/utils/data/CircularIterator.java
index 4b84243..a708eba 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/CircularIterator.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/CircularIterator.java
@@ -4,7 +4,7 @@ import java.util.Iterator;
/**
* An iterator that repeats elements from a provided iterable.
- *
+ *
* @author EVE
*
* @param <E>
@@ -30,15 +30,15 @@ public class CircularIterator<E> implements Iterator<E> {
/**
* Create a new circular iterator.
- *
+ *
* @param src
* The iterable to iterate from.
- *
+ *
* @param circ
* Should we actually do circular iteration, or just
* repeat the terminal element?
*/
- public CircularIterator(Iterable<E> src, boolean circ) {
+ public CircularIterator(final Iterable<E> src, final boolean circ) {
source = src;
curr = source.iterator();
@@ -47,11 +47,11 @@ public class CircularIterator<E> implements Iterator<E> {
/**
* Create a new circular iterator that does actual circular iteration.
- *
+ *
* @param src
* The iterable to iterate from.
*/
- public CircularIterator(Iterable<E> src) {
+ public CircularIterator(final Iterable<E> src) {
this(src, true);
}
@@ -64,10 +64,9 @@ public class CircularIterator<E> implements Iterator<E> {
@Override
public E next() {
if (!curr.hasNext()) {
- if (doCircle)
+ if (doCircle) {
curr = source.iterator();
- else
- return curElm;
+ } else return curElm;
}
curElm = curr.next();