From 040870eced4dc3e273313b9ec2ce7bb88d9cc6a0 Mon Sep 17 00:00:00 2001 From: bjculkin Date: Mon, 12 Feb 2018 22:57:29 -0500 Subject: Commenting --- .../utils/ioutils/blocks/SerialBlockReader.java | 7 +++--- .../utils/ioutils/blocks/ToggledBlockReader.java | 28 +++++++++++++++++----- 2 files changed, 26 insertions(+), 9 deletions(-) (limited to 'base/src/main/java/bjc/utils/ioutils/blocks') diff --git a/base/src/main/java/bjc/utils/ioutils/blocks/SerialBlockReader.java b/base/src/main/java/bjc/utils/ioutils/blocks/SerialBlockReader.java index 62db3a8..02483c1 100644 --- a/base/src/main/java/bjc/utils/ioutils/blocks/SerialBlockReader.java +++ b/base/src/main/java/bjc/utils/ioutils/blocks/SerialBlockReader.java @@ -55,10 +55,11 @@ public class SerialBlockReader implements BlockReader { @Override public Block getBlock() { - if(readerQueue.isEmpty()) + if(readerQueue.isEmpty()) { return null; - else - return readerQueue.peek().getBlock(); + } + + return readerQueue.peek().getBlock(); } @Override 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 cac0416..0b756c5 100644 --- a/base/src/main/java/bjc/utils/ioutils/blocks/ToggledBlockReader.java +++ b/base/src/main/java/bjc/utils/ioutils/blocks/ToggledBlockReader.java @@ -4,6 +4,12 @@ import java.io.IOException; import bjc.utils.data.BooleanToggle; +/** + * A block reader that toggles between two sources. + * + * @author EVE + * + */ public class ToggledBlockReader implements BlockReader { private BlockReader leftSource; private BlockReader rightSource; @@ -15,6 +21,14 @@ public class ToggledBlockReader implements BlockReader { private int blockNo; + /** + * Create a new toggling block reader. + * + * @param left + * The first block reader to use. + * @param right + * The second block reader to use. + */ public ToggledBlockReader(BlockReader left, BlockReader right) { leftSource = left; rightSource = right; @@ -26,18 +40,20 @@ public class ToggledBlockReader implements BlockReader { @Override public boolean hasNextBlock() { - if(leftToggle.peek()) + if(leftToggle.peek()) { return leftSource.hasNextBlock(); - else - return rightSource.hasNextBlock(); + } + + return rightSource.hasNextBlock(); } @Override public Block getBlock() { - if(leftToggle.peek()) + if(leftToggle.peek()) { return leftSource.getBlock(); - else - return rightSource.getBlock(); + } + + return rightSource.getBlock(); } @Override -- cgit v1.2.3