From 889fac2bdf993dc86f64a8893c0260fdcf848acb Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Mon, 10 Apr 2017 16:40:33 -0400
Subject: Cleanup

---
 .../src/main/java/bjc/utils/data/CircularIterator.java  | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'BJC-Utils2/src/main/java/bjc/utils/data/CircularIterator.java')

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();
-- 
cgit v1.2.3