Formatting tweaks

1 files changed, 14 insertions, 27 deletions

diff --git a/base/src/main/java/bjc/utils/ioutils/blocks/ToggledBlockReader.java b/base/src/main/java/bjc/utils/ioutils/blocks/ToggledBlockReader.java
index 12568c8..d1737f5 100644
--- a/base/src/main/java/bjc/utils/ioutils/blocks/ToggledBlockReader.java
+++ b/base/src/main/java/bjc/utils/ioutils/blocks/ToggledBlockReader.java
@@ -1,15 +1,12 @@
 package bjc.utils.ioutils.blocks;
 
-import java.io.IOException;
+import java.io.*;
 
-import bjc.data.BooleanToggle;
+import bjc.data.*;
 
-/**
- * A block reader that toggles between two sources.
+/** A block reader that toggles between two sources.
  *
- * @author EVE
- *
- */
+ * @author EVE */
 public class ToggledBlockReader implements BlockReader {
 	private BlockReader leftSource;
 	private BlockReader rightSource;
@@ -19,16 +16,12 @@ public class ToggledBlockReader implements BlockReader {
 
 	private int blockNo;
 
-	/**
-	 * Create a new toggling block reader.
+	/** Create a new toggling block reader.
 	 *
-	 * @param left
-	 *              The first block reader to use.
-	 * @param right
-	 *              The second block reader to use.
-	 */
+	 * @param left The first block reader to use.
+	 * @param right The second block reader to use. */
 	public ToggledBlockReader(BlockReader left, BlockReader right) {
-		leftSource = left;
+		leftSource  = left;
 		rightSource = right;
 
 		blockNo = 0;
@@ -38,20 +31,14 @@ public class ToggledBlockReader implements BlockReader {
 
 	@Override
 	public boolean hasNextBlock() {
-		if (leftToggle.peek()) {
-			return leftSource.hasNextBlock();
-		}
-
-		return rightSource.hasNextBlock();
+		if (leftToggle.peek()) return leftSource.hasNextBlock();
+		else                   return rightSource.hasNextBlock();
 	}
 
 	@Override
 	public Block getBlock() {
-		if (leftToggle.peek()) {
-			return leftSource.getBlock();
-		}
-
-		return rightSource.getBlock();
+		if (leftToggle.peek()) return leftSource.getBlock();
+		else                   return rightSource.getBlock();
 	}
 
 	@Override
@@ -64,8 +51,8 @@ public class ToggledBlockReader implements BlockReader {
 			succ = rightSource.nextBlock();
 		}
 
-		if (succ)
-			blockNo += 1;
+		if (succ) blockNo += 1;
+
 		return succ;
 	}