Commenting

4 files changed, 43 insertions, 26 deletions

diff --git a/base/src/main/java/bjc/utils/ioutils/RegexStringEditor.java b/base/src/main/java/bjc/utils/ioutils/RegexStringEditor.java
index e11d4b4..9f81001 100644
--- a/base/src/main/java/bjc/utils/ioutils/RegexStringEditor.java
+++ b/base/src/main/java/bjc/utils/ioutils/RegexStringEditor.java
@@ -198,9 +198,9 @@ public class RegexStringEditor {
 
 		if(matcher.matches()) {
 			return action.apply(input);
-		} else {
-			return input;
 		}
+
+		return input;
 	}
 
 	/**
@@ -223,8 +223,8 @@ public class RegexStringEditor {
 
 		if(matcher.matches()) {
 			return input;
-		} else {
-			return action.apply(input);
 		}
+
+		return action.apply(input);
 	}
 }
diff --git a/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java b/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java
index 9e4bbb6..9b46c06 100644
--- a/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java
+++ b/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java
@@ -101,27 +101,27 @@ public class RuleBasedConfigReader<E> {
 		/*
 		 * Ignore blank line without an open rule
 		 */
-		if(isRuleOpen == false)
+		if(isRuleOpen == false) {
 			/*
 			 * Do nothing
 			 */
 			return false;
-		else {
-			/*
-			 * Nothing happens on rule end
-			 */
-			if(end != null) {
-				/*
-				 * Process the rule ending
-				 */
-				end.accept(state);
-			}
+		}
 
+		/*
+		 * Nothing happens on rule end
+		 */
+		if(end != null) {
 			/*
-			 * Return a closed rule
+			 * Process the rule ending
 			 */
-			return false;
+			end.accept(state);
 		}
+
+		/*
+		 * Return a closed rule
+		 */
+		return false;
 	}
 
 	/**
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