Formatting pass

7 files changed, 32 insertions, 30 deletions

diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/ChainTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/ChainTokenSplitter.java
index 4736310..db851f0 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/ChainTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/ChainTokenSplitter.java
@@ -23,7 +23,7 @@ public class ChainTokenSplitter implements TokenSplitter {
 	 * Append a series of splitters to the chain.
 	 *
 	 * @param splitters
-	 *                The splitters to append to the chain.
+	 *        The splitters to append to the chain.
 	 */
 	public void appendSplitters(final TokenSplitter... splitters) {
 		spliters.addAll(splitters);
@@ -33,7 +33,7 @@ public class ChainTokenSplitter implements TokenSplitter {
 	 * Prepend a series of splitters to the chain.
 	 *
 	 * @param splitters
-	 *                The splitters to append to the chain.
+	 *        The splitters to append to the chain.
 	 */
 	public void prependSplitters(final TokenSplitter... splitters) {
 		spliters.prependAll(splitters);
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java
index 48ddcb4..556a2b1 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java
@@ -24,7 +24,7 @@ public class ConfigurableTokenSplitter extends SimpleTokenSplitter {
 	 * Create a new token splitter with blank configuration.
 	 *
 	 * @param keepDelims
-	 *                Whether or not to keep delimiters.
+	 *        Whether or not to keep delimiters.
 	 */
 	public ConfigurableTokenSplitter(final boolean keepDelims) {
 		super(null, keepDelims);
@@ -43,10 +43,10 @@ public class ConfigurableTokenSplitter extends SimpleTokenSplitter {
 	 * Simple delimiters match one occurrence of themselves as literals.
 	 *
 	 * @param simpleDelims
-	 *                The simple delimiters to add.
+	 *        The simple delimiters to add.
 	 */
 	public void addSimpleDelimiters(final String... simpleDelims) {
-		for (final String simpleDelim : simpleDelims) {
+		for(final String simpleDelim : simpleDelims) {
 			simpleDelimiters.add(simpleDelim);
 		}
 	}
@@ -58,10 +58,10 @@ public class ConfigurableTokenSplitter extends SimpleTokenSplitter {
 	 * literals.
 	 *
 	 * @param multiDelims
-	 *                The multiple delimiters to add.
+	 *        The multiple delimiters to add.
 	 */
 	public void addMultiDelimiters(final String... multiDelims) {
-		for (final String multiDelim : multiDelims) {
+		for(final String multiDelim : multiDelims) {
 			multipleDelimiters.add(multiDelim);
 		}
 	}
@@ -73,10 +73,10 @@ public class ConfigurableTokenSplitter extends SimpleTokenSplitter {
 	 * expressions.
 	 *
 	 * @param rRawDelims
-	 *                The raw delimiters to add.
+	 *        The raw delimiters to add.
 	 */
 	public void addRawDelimiters(final String... rRawDelims) {
-		for (final String rRawDelim : rRawDelims) {
+		for(final String rRawDelim : rRawDelims) {
 			rRawDelimiters.add(rRawDelim);
 		}
 	}
@@ -88,15 +88,15 @@ public class ConfigurableTokenSplitter extends SimpleTokenSplitter {
 	public void compile() {
 		final StringBuilder rPattern = new StringBuilder();
 
-		for (final String rRawDelimiter : rRawDelimiters) {
+		for(final String rRawDelimiter : rRawDelimiters) {
 			rPattern.append(applyFormat("rawDelim", rRawDelimiter));
 		}
 
-		for (final String multipleDelimiter : multipleDelimiters) {
+		for(final String multipleDelimiter : multipleDelimiters) {
 			rPattern.append(applyFormat("multipleDelim", multipleDelimiter));
 		}
 
-		for (final String simpleDelimiter : simpleDelimiters) {
+		for(final String simpleDelimiter : simpleDelimiters) {
 			rPattern.append(applyFormat("simpleDelim", simpleDelimiter));
 		}
 
@@ -107,7 +107,7 @@ public class ConfigurableTokenSplitter extends SimpleTokenSplitter {
 
 	@Override
 	public IList<String> split(final String input) {
-		if (spliter == null) throw new IllegalStateException("Must compile splitter before use");
+		if(spliter == null) throw new IllegalStateException("Must compile splitter before use");
 
 		return super.split(input);
 	}
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/ExcludingTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/ExcludingTokenSplitter.java
index 369e7ae..7edba52 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/ExcludingTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/ExcludingTokenSplitter.java
@@ -24,7 +24,7 @@ public class ExcludingTokenSplitter implements TokenSplitter {
 	 * Create a new excluding token splitter.
 	 *
 	 * @param splitter
-	 *                The splitter to apply to non-excluded strings.
+	 *        The splitter to apply to non-excluded strings.
 	 */
 	public ExcludingTokenSplitter(final TokenSplitter splitter) {
 		spliter = splitter;
@@ -38,10 +38,10 @@ public class ExcludingTokenSplitter implements TokenSplitter {
 	 * Exclude literal strings from splitting.
 	 *
 	 * @param exclusions
-	 *                The strings to exclude from splitting.
+	 *        The strings to exclude from splitting.
 	 */
 	public final void addLiteralExclusions(final String... exclusions) {
-		for (final String exclusion : exclusions) {
+		for(final String exclusion : exclusions) {
 			literalExclusions.add(exclusion);
 		}
 	}
@@ -51,21 +51,22 @@ public class ExcludingTokenSplitter implements TokenSplitter {
 	 * splitting.
 	 *
 	 * @param exclusions
-	 *                The predicates to use for exclusions.
+	 *        The predicates to use for exclusions.
 	 */
 	@SafeVarargs
 	public final void addPredicateExclusion(final Predicate<String>... exclusions) {
-		for (final Predicate<String> exclusion : exclusions) {
+		for(final Predicate<String> exclusion : exclusions) {
 			predExclusions.add(exclusion);
 		}
 	}
 
 	@Override
 	public IList<String> split(final String input) {
-		if (literalExclusions.contains(input))
+		if(literalExclusions.contains(input))
 			return new FunctionalList<>(input);
-		else if (predExclusions.anyMatch(pred -> pred.test(input)))
+		else if(predExclusions.anyMatch(pred -> pred.test(input)))
 			return new FunctionalList<>(input);
-		else return spliter.split(input);
+		else
+			return spliter.split(input);
 	}
 }
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/FilteredTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/FilteredTokenSplitter.java
index 5d954e0..87d950b 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/FilteredTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/FilteredTokenSplitter.java
@@ -20,10 +20,10 @@ public class FilteredTokenSplitter implements TokenSplitter {
 	 * Create a new filtered token splitter.
 	 * 
 	 * @param source
-	 *                The splitter to get tokens from.
+	 *        The splitter to get tokens from.
 	 * 
 	 * @param filter
-	 *                The filter to pass tokens through.
+	 *        The filter to pass tokens through.
 	 */
 	public FilteredTokenSplitter(TokenSplitter source, Predicate<String> filter) {
 		this.source = source;
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/SimpleTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/SimpleTokenSplitter.java
index c357886..c96f72a 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/SimpleTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/SimpleTokenSplitter.java
@@ -21,10 +21,10 @@ public class SimpleTokenSplitter implements TokenSplitter {
 	 * Create a new simple token splitter.
 	 *
 	 * @param splitter
-	 *                The pattern to split around.
+	 *        The pattern to split around.
 	 *
 	 * @param keepDelims
-	 *                Whether or not delimiters should be kept.
+	 *        Whether or not delimiters should be kept.
 	 */
 	public SimpleTokenSplitter(final Pattern splitter, final boolean keepDelims) {
 		spliter = splitter;
@@ -34,9 +34,10 @@ public class SimpleTokenSplitter implements TokenSplitter {
 
 	@Override
 	public IList<String> split(final String input) {
-		if (keepDelim)
+		if(keepDelim)
 			return RegexStringEditor.mapOccurances(input, spliter, ID.id(), ID.id());
-		else return RegexStringEditor.mapOccurances(input, spliter, ID.id(), strang -> "");
+		else
+			return RegexStringEditor.mapOccurances(input, spliter, ID.id(), strang -> "");
 	}
 
 	@Override
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/TokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/TokenSplitter.java
index ddb28a7..b042b8c 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/TokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/TokenSplitter.java
@@ -13,7 +13,7 @@ public interface TokenSplitter {
 	 * Split a string into a list of pieces.
 	 *
 	 * @param input
-	 *                The string to split.
+	 *        The string to split.
 	 *
 	 * @return The pieces of the string.
 	 */
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/TransformTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/TransformTokenSplitter.java
index 80490f5..1aa894d 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/TransformTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/TransformTokenSplitter.java
@@ -20,10 +20,10 @@ public class TransformTokenSplitter implements TokenSplitter {
 	 * Create a new transforming splitter.
 	 * 
 	 * @param source
-	 *                The splitter to use as a source.
+	 *        The splitter to use as a source.
 	 * 
 	 * @param transform
-	 *                The transform to apply to tokens.
+	 *        The transform to apply to tokens.
 	 */
 	public TransformTokenSplitter(TokenSplitter source, UnaryOperator<String> transform) {
 		this.source = source;