Formatting changes

7 files changed, 38 insertions, 40 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/FuncUtils.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/FuncUtils.java
index d89b7da..2119ed7 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/FuncUtils.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/FuncUtils.java
@@ -29,11 +29,16 @@ public class FuncUtils {
 	 * Convert a binary function into a unary function that returns a
 	 * function
 	 * 
-	 * @param <A> The initial type of the function
-	 * @param <B> The intermediate type of the function
-	 * @param <C> The terminal type of the function
-	 * @param func The function to transform
-	 * @return The function transformed into a unary function returning a function
+	 * @param <A>
+	 *            The initial type of the function
+	 * @param <B>
+	 *            The intermediate type of the function
+	 * @param <C>
+	 *            The terminal type of the function
+	 * @param func
+	 *            The function to transform
+	 * @return The function transformed into a unary function returning a
+	 *         function
 	 */
 	public static <A, B, C> Function<A, Function<B, C>> curry2(
 			BiFunction<A, B, C> func) {
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/FunctionalFileVisitor.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/FunctionalFileVisitor.java
index 6d3336a..2308d7c 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/FunctionalFileVisitor.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/FunctionalFileVisitor.java
@@ -7,8 +7,7 @@ import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.function.BiPredicate;
 
-final class FunctionalFileVisitor
-		extends SimpleFileVisitor<Path> {
+final class FunctionalFileVisitor extends SimpleFileVisitor<Path> {
 	private BiPredicate<Path, BasicFileAttributes>	traversalPredicate;
 	private BiPredicate<Path, BasicFileAttributes>	traversalAction;
 
@@ -30,8 +29,8 @@ final class FunctionalFileVisitor
 	}
 
 	@Override
-	public FileVisitResult visitFile(Path file,
-			BasicFileAttributes attrs) throws IOException {
+	public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+			throws IOException {
 		if (traversalAction.test(file, attrs)) {
 			return FileVisitResult.CONTINUE;
 		}
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/GroupPartIteration.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/GroupPartIteration.java
index 3837858..67cf4b1 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/GroupPartIteration.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/GroupPartIteration.java
@@ -15,8 +15,7 @@ import bjc.utils.funcdata.IFunctionalList;
  * @param <E>
  *            The type of element in the list being partitioned
  */
-final class GroupPartIteration<E>
-		implements Consumer<E> {
+final class GroupPartIteration<E> implements Consumer<E> {
 	private IFunctionalList<IFunctionalList<E>>	returnedList;
 	private IHolder<IFunctionalList<E>>			currentPartition;
 	private IFunctionalList<E>					rejectedItems;
@@ -24,8 +23,7 @@ final class GroupPartIteration<E>
 	private int									numberPerPartition;
 	private Function<E, Integer>				elementCounter;
 
-	public GroupPartIteration(
-			IFunctionalList<IFunctionalList<E>> returned,
+	public GroupPartIteration(IFunctionalList<IFunctionalList<E>> returned,
 			IHolder<IFunctionalList<E>> currPart,
 			IFunctionalList<E> rejects, IHolder<Integer> numInCurrPart,
 			int nPerPart, Function<E, Integer> eleCount) {
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/ListUtils.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/ListUtils.java
index 828f4c3..b0c30b3 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/ListUtils.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/ListUtils.java
@@ -53,14 +53,13 @@ public class ListUtils {
 		/*
 		 * List that holds our results
 		 */
-		IFunctionalList<IFunctionalList<E>> returnedList =
-				new FunctionalList<>();
+		IFunctionalList<IFunctionalList<E>> returnedList = new FunctionalList<>();
 
 		/*
 		 * List that holds current partition
 		 */
-		IHolder<IFunctionalList<E>> currentPartition =
-				new Identity<>(new FunctionalList<>());
+		IHolder<IFunctionalList<E>> currentPartition = new Identity<>(
+				new FunctionalList<>());
 		/*
 		 * List that holds elements rejected during current pass
 		 */
@@ -74,10 +73,8 @@ public class ListUtils {
 		/*
 		 * Run up to a certain number of passes
 		 */
-		for (int numberOfIterations =
-				0; numberOfIterations < MAX_NTRIESPART
-						&& !rejectedElements
-								.isEmpty(); numberOfIterations++) {
+		for (int numberOfIterations = 0; numberOfIterations < MAX_NTRIESPART
+				&& !rejectedElements.isEmpty(); numberOfIterations++) {
 			input.forEach(new GroupPartIteration<>(returnedList,
 					currentPartition, rejectedElements,
 					numberInCurrentPartition, numberPerPartition,
@@ -125,8 +122,8 @@ public class ListUtils {
 					"Set of operators must not be null");
 		}
 
-		IHolder<IFunctionalList<String>> returnedList =
-				new Identity<>(input);
+		IHolder<IFunctionalList<String>> returnedList = new Identity<>(
+				input);
 
 		operators.forEach((operator) -> {
 			returnedList.transform((oldReturn) -> {
@@ -159,8 +156,8 @@ public class ListUtils {
 					"Set of operators must not be null");
 		}
 
-		IHolder<IFunctionalList<String>> returnedList =
-				new Identity<>(input);
+		IHolder<IFunctionalList<String>> returnedList = new Identity<>(
+				input);
 
 		operators.forEach((operator) -> returnedList
 				.transform((oldReturn) -> oldReturn.flatMap((token) -> {
@@ -236,8 +233,8 @@ public class ListUtils {
 	public static <E> IFunctionalList<E> drawWithReplacement(
 			IFunctionalList<E> list, int numberOfItems,
 			Function<Integer, Integer> rng) {
-		IFunctionalList<E> selectedItems =
-				new FunctionalList<>(new ArrayList<>(numberOfItems));
+		IFunctionalList<E> selectedItems = new FunctionalList<>(
+				new ArrayList<>(numberOfItems));
 
 		for (int i = 0; i < numberOfItems; i++) {
 			selectedItems.add(list.randItem(rng));
@@ -265,8 +262,8 @@ public class ListUtils {
 	public static <E> IFunctionalList<E> drawWithoutReplacement(
 			IFunctionalList<E> list, int numberOfItems,
 			Function<Integer, Integer> rng) {
-		IFunctionalList<E> selectedItems =
-				new FunctionalList<>(new ArrayList<>(numberOfItems));
+		IFunctionalList<E> selectedItems = new FunctionalList<>(
+				new ArrayList<>(numberOfItems));
 
 		int totalItems = list.getSize();
 
@@ -295,8 +292,8 @@ public class ListUtils {
 	 * @return A list containing all the elements of the lists
 	 */
 	@SafeVarargs
-	public static <E> IFunctionalList<E>
-			mergeLists(IFunctionalList<E>... lists) {
+	public static <E> IFunctionalList<E> mergeLists(
+			IFunctionalList<E>... lists) {
 		IFunctionalList<E> returnedList = new FunctionalList<>();
 
 		for (IFunctionalList<E> list : lists) {
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java
index 1d1838e..728968e 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java
@@ -74,7 +74,8 @@ public class StringUtils {
 		}
 	}
 
-	public static <ContainedType> String printDeque(Deque<ContainedType> queuedTrees) {
+	public static <ContainedType> String printDeque(
+			Deque<ContainedType> queuedTrees) {
 		return queuedTrees.isEmpty() ? "(none)" : queuedTrees.toString();
 	}
 }
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenDeaffixer.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenDeaffixer.java
index 1cf5d44..9ea3596 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenDeaffixer.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenDeaffixer.java
@@ -5,8 +5,8 @@ import java.util.function.BiFunction;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IFunctionalList;
 
-final class TokenDeaffixer implements
-		BiFunction<String, String, IFunctionalList<String>> {
+final class TokenDeaffixer
+		implements BiFunction<String, String, IFunctionalList<String>> {
 	private String token;
 
 	public TokenDeaffixer(String tok) {
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java
index 0da9f7d..68dde25 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java
@@ -5,8 +5,8 @@ import java.util.function.BiFunction;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IFunctionalList;
 
-final class TokenSplitter implements
-		BiFunction<String, String, IFunctionalList<String>> {
+final class TokenSplitter
+		implements BiFunction<String, String, IFunctionalList<String>> {
 	private String tokenToSplit;
 
 	public TokenSplitter(String tok) {
@@ -25,8 +25,7 @@ final class TokenSplitter implements
 		}
 
 		if (tokenToSplit.contains(operatorName)) {
-			if (StringUtils.containsOnly(tokenToSplit,
-					operatorRegex)) {
+			if (StringUtils.containsOnly(tokenToSplit, operatorRegex)) {
 				return new FunctionalList<>(tokenToSplit);
 			}
 
@@ -39,8 +38,7 @@ final class TokenSplitter implements
 
 			splitTokens.forEachIndexed((tokenIndex, token) -> {
 
-				if (tokenIndex != tokenExpansionSize
-						&& tokenIndex != 0) {
+				if (tokenIndex != tokenExpansionSize && tokenIndex != 0) {
 					result.add(operatorName);
 					result.add(token);
 				} else {