Format/Cleanup pass

4 files changed, 33 insertions, 36 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java
index 5d044e1..67ca215 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java
@@ -187,8 +187,8 @@ public class RuleBasedConfigReader<E> {
 	}
 
 	private boolean startRule(E state, boolean ruleOpen, String line) {
-		FunctionalStringTokenizer tokenizer =
-				new FunctionalStringTokenizer(line, " ");
+		FunctionalStringTokenizer tokenizer = new FunctionalStringTokenizer(
+				line, " ");
 
 		String nextToken = tokenizer.nextToken();
 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedReaderPragmas.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedReaderPragmas.java
index 9d9d1b1..2c77c5d 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedReaderPragmas.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedReaderPragmas.java
@@ -15,66 +15,63 @@ import bjc.utils.funcutils.ListUtils;
 public class RuleBasedReaderPragmas {
 
 	/**
-	 * Creates a pragma that takes any number of arguments and collapses
-	 * them all into a single string
+	 * Creates a pragma that takes a single integer argument
 	 * 
 	 * @param <StateType>
 	 *            The type of state that goes along with this pragma
 	 * @param name
 	 *            The name of this pragma, for error message purpose
 	 * @param consumer
-	 *            The function to invoke with the parsed string
+	 *            The function to invoke with the parsed integer
 	 * @return A pragma that functions as described above.
 	 */
-	public static <StateType>
-			BiConsumer<FunctionalStringTokenizer, StateType>
-			buildStringCollapser(String name,
-					BiConsumer<String, StateType> consumer) {
+	public static <StateType> BiConsumer<FunctionalStringTokenizer, StateType> buildInteger(
+			String name, BiConsumer<Integer, StateType> consumer) {
 		return (tokenizer, state) -> {
 			if (!tokenizer.hasMoreTokens()) {
 				throw new PragmaFormatException("Pragma " + name
-						+ " requires one string argument");
+						+ " requires one integer argument");
 			}
 
-			consumer.accept(ListUtils.collapseTokens(
-					tokenizer.toList((strang) -> strang)), state);
+			String token = tokenizer.nextToken();
+
+			try {
+				consumer.accept(Integer.parseInt(token), state);
+			} catch (NumberFormatException nfex) {
+				PragmaFormatException pfex = new PragmaFormatException(
+						"Argument " + token
+								+ " to version pragma isn't a valid integer. "
+								+ "This pragma requires a integer argument");
+
+				pfex.initCause(nfex);
+
+				throw pfex;
+			}
 		};
 	}
 
 	/**
-	 * Creates a pragma that takes a single integer argument
+	 * Creates a pragma that takes any number of arguments and collapses
+	 * them all into a single string
 	 * 
 	 * @param <StateType>
 	 *            The type of state that goes along with this pragma
 	 * @param name
 	 *            The name of this pragma, for error message purpose
 	 * @param consumer
-	 *            The function to invoke with the parsed integer
+	 *            The function to invoke with the parsed string
 	 * @return A pragma that functions as described above.
 	 */
-	public static <StateType>
-			BiConsumer<FunctionalStringTokenizer, StateType> buildInteger(
-					String name, BiConsumer<Integer, StateType> consumer) {
+	public static <StateType> BiConsumer<FunctionalStringTokenizer, StateType> buildStringCollapser(
+			String name, BiConsumer<String, StateType> consumer) {
 		return (tokenizer, state) -> {
 			if (!tokenizer.hasMoreTokens()) {
 				throw new PragmaFormatException("Pragma " + name
-						+ " requires one integer argument");
+						+ " requires one string argument");
 			}
 
-			String token = tokenizer.nextToken();
-
-			try {
-				consumer.accept(Integer.parseInt(token), state);
-			} catch (NumberFormatException nfex) {
-				PragmaFormatException pfex =
-						new PragmaFormatException("Argument " + token
-								+ " to version pragma isn't a valid integer. "
-								+ "This pragma requires a integer argument");
-
-				pfex.initCause(nfex);
-
-				throw pfex;
-			}
+			consumer.accept(ListUtils.collapseTokens(
+					tokenizer.toList((strang) -> strang)), state);
 		};
 	}
 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenTransformer.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenTransformer.java
index 9fb64cf..1c1a6fb 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenTransformer.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenTransformer.java
@@ -29,8 +29,8 @@ final class TokenTransformer<TokenType> implements Consumer<TokenType> {
 			});
 		}
 
-		private IPair<Deque<ITree<TokenType>>, ITree<TokenType>>
-				handleOperator(Deque<ITree<TokenType>> queuedASTs) {
+		private IPair<Deque<ITree<TokenType>>, ITree<TokenType>> handleOperator(
+				Deque<ITree<TokenType>> queuedASTs) {
 			ITree<TokenType> newAST;
 
 			if (isSpecialOperator.test(element)) {
diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TreeConstructor.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TreeConstructor.java
index c703a72..67a74d9 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TreeConstructor.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TreeConstructor.java
@@ -79,8 +79,8 @@ public class TreeConstructor {
 					"Special operator determiner must not be null");
 		}
 
-		IHolder<IPair<Deque<ITree<TokenType>>, ITree<TokenType>>> initialState =
-				new Identity<>(new Pair<>(new LinkedList<>(), null));
+		IHolder<IPair<Deque<ITree<TokenType>>, ITree<TokenType>>> initialState = new Identity<>(
+				new Pair<>(new LinkedList<>(), null));
 
 		tokens.forEach(
 				new TokenTransformer<>(initialState, operatorPredicate,