Cleanup pass II

Part II of the cleanup pass

5 files changed, 42 insertions, 27 deletions

diff --git a/base/src/examples/java/bjc/utils/examples/AbbrevMapTest.java b/base/src/examples/java/bjc/utils/examples/AbbrevMapTest.java
index c2348d5..e6eacfa 100644
--- a/base/src/examples/java/bjc/utils/examples/AbbrevMapTest.java
+++ b/base/src/examples/java/bjc/utils/examples/AbbrevMapTest.java
@@ -18,7 +18,7 @@ public class AbbrevMapTest {
 	 * Main method.
 	 *
 	 * @param args
-	 *                Unused CLI args.
+	 *             Unused CLI args.
 	 */
 	public static void main(final String[] args) {
 		final Scanner scn = new Scanner(System.in);
@@ -39,10 +39,11 @@ public class AbbrevMapTest {
 				map.removeWords(commParts.get(1));
 				break;
 			case "check": {
-				String[] strings = map.deabbrevAll(commParts.get(1)).toArray(new String[0]);
-				
+				String[] strings
+						= map.deabbrevAll(commParts.get(1)).toArray(new String[0]);
+
 				final String list = StringUtils.toEnglishList(strings, false);
-				
+
 				System.out.println(list);
 				break;
 			}
@@ -50,7 +51,7 @@ public class AbbrevMapTest {
 				System.out.println(map.toString());
 				break;
 			case "help":
-				if(commParts.size() > 1) {
+				if (commParts.size() > 1) {
 					help(commParts.get(1));
 				} else {
 					help();
@@ -69,17 +70,18 @@ public class AbbrevMapTest {
 
 	private static void help() {
 		PrintStream strm = System.out;
-		
+
 		strm.println("Abbreviation Map Testing Commands:");
 		strm.println("\tadd    <word>\tAdd a word to the abbreviation map");
 		strm.println("\tremove <word>\tRemove a word from the abbreviation map");
-		strm.println("\tcheck  <word>\tCheck all of the possible things a word could be an abbreviation for");
+		strm.println(
+				"\tcheck  <word>\tCheck all of the possible things a word could be an abbreviation for");
 		strm.println("\tdebug        \tPrint out the abbreviation map");
 		strm.println("\thelp         \tList commands, or get help on a command\n");
 	}
 
 	private static void help(String com) {
-		switch(com) {
+		switch (com) {
 		default:
 			System.out.printf("\tNo help available for command: %s\n", com);
 		}
diff --git a/base/src/examples/java/bjc/utils/examples/BinarySearchTest.java b/base/src/examples/java/bjc/utils/examples/BinarySearchTest.java
index 4c66494..5e8e372 100644
--- a/base/src/examples/java/bjc/utils/examples/BinarySearchTest.java
+++ b/base/src/examples/java/bjc/utils/examples/BinarySearchTest.java
@@ -12,8 +12,10 @@ import bjc.funcdata.bst.TreeLinearizationMethod;
  *
  */
 public class BinarySearchTest {
-	private static void display(final BinarySearchTree<Character> tree, final Scanner input) {
-		System.out.print("What order would you like the tree to be printed in (m for options): ");
+	private static void display(final BinarySearchTree<Character> tree,
+			final Scanner input) {
+		System.out.print(
+				"What order would you like the tree to be printed in (m for options): ");
 		char command;
 
 		while (true) {
@@ -23,9 +25,12 @@ public class BinarySearchTest {
 			switch (command) {
 			case 'm':
 				System.out.println("Possible tree printing methods: ");
-				System.out.println("\tp: Preorder printing (print parent first, then left & right).");
-				System.out.println("\ti: Inorder printing (print left first, then parent & right).");
-				System.out.println("\to: Postorder printing (print left first, then right & parent).");
+				System.out.println(
+						"\tp: Preorder printing (print parent first, then left & right).");
+				System.out.println(
+						"\ti: Inorder printing (print left first, then parent & right).");
+				System.out.println(
+						"\to: Postorder printing (print left first, then right & parent).");
 				break;
 			case 'p':
 				method = TreeLinearizationMethod.PREORDER;
@@ -41,7 +46,7 @@ public class BinarySearchTest {
 			}
 
 			if (method != null) {
-				tree.traverse(method, (element) -> {
+				tree.traverse(method, element -> {
 					System.out.println("Node: " + element);
 					return true;
 				});
@@ -49,7 +54,8 @@ public class BinarySearchTest {
 				return;
 			}
 
-			System.out.print("What order would you like the tree to be printed in (m for options): ");
+			System.out.print(
+					"What order would you like the tree to be printed in (m for options): ");
 		}
 	}
 
@@ -57,12 +63,13 @@ public class BinarySearchTest {
 	 * Main method of class
 	 *
 	 * @param args
-	 *                Unused CLI args
+	 *             Unused CLI args
 	 */
 	public static void main(final String[] args) {
 		final Scanner input = new Scanner(System.in);
 		System.out.println("Binary Tree Constructor/Searcher");
-		final BinarySearchTree<Character> tree = new BinarySearchTree<>((o1, o2) -> o1 - o2);
+		final BinarySearchTree<Character> tree
+				= new BinarySearchTree<>((o1, o2) -> o1 - o2);
 
 		char command = ' ';
 		while (command != 'e') {
diff --git a/base/src/examples/java/bjc/utils/examples/ShuntTest.java b/base/src/examples/java/bjc/utils/examples/ShuntTest.java
index aefa5ff..b62a5a6 100644
--- a/base/src/examples/java/bjc/utils/examples/ShuntTest.java
+++ b/base/src/examples/java/bjc/utils/examples/ShuntTest.java
@@ -17,7 +17,7 @@ public class ShuntTest {
 	 * Main method
 	 *
 	 * @param args
-	 *                Unused CLI args
+	 *             Unused CLI args
 	 */
 	public static void main(final String[] args) {
 		final Scanner inputSource = new Scanner(System.in);
@@ -27,7 +27,8 @@ public class ShuntTest {
 
 		final ShuntingYard<String> yard = new ShuntingYard<>(true);
 
-		final IList<String> preTokens = new FunctionalStringTokenizer(line).toList(strang -> strang);
+		final IList<String> preTokens
+				= new FunctionalStringTokenizer(line).toList(strang -> strang);
 		final IList<String> shuntedTokens = yard.postfix(preTokens, strang -> strang);
 
 		System.out.println(shuntedTokens.toString());
diff --git a/base/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java b/base/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java
index 429e84c..935a189 100644
--- a/base/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java
+++ b/base/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java
@@ -13,8 +13,10 @@ import bjc.utils.gen.WeightedGrammar;
 public class DiabloItemGen {
 	private static WeightedGrammar<String> rules = new WeightedGrammar<>();
 
-	private static void addCase(final String ruleName, final int probability, final String ruleParts) {
-		final IList<String> parts = FunctionalStringTokenizer.fromString(ruleParts).toList(strang -> strang);
+	private static void addCase(final String ruleName, final int probability,
+			final String ruleParts) {
+		final IList<String> parts = FunctionalStringTokenizer.fromString(ruleParts)
+				.toList(strang -> strang);
 
 		rules.addCase(ruleName, probability, parts);
 	}
@@ -67,7 +69,7 @@ public class DiabloItemGen {
 	 * Main Method
 	 *
 	 * @param args
-	 *                Unused CLI args
+	 *             Unused CLI args
 	 */
 	public static void main(final String[] args) {
 		rules.addRule("<item>");
diff --git a/base/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java b/base/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java
index b305ebe..bdc4f53 100644
--- a/base/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java
+++ b/base/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java
@@ -18,7 +18,8 @@ public class RandomStringExamples {
 		final IList<IList<String>> cses = new FunctionalList<>();
 
 		for (final String strang : cases) {
-			final IList<String> lst = FunctionalStringTokenizer.fromString(strang).toList(s -> s);
+			final IList<String> lst
+					= FunctionalStringTokenizer.fromString(strang).toList(s -> s);
 
 			cses.add(lst);
 		}
@@ -30,13 +31,14 @@ public class RandomStringExamples {
 	 * Main method
 	 *
 	 * @param args
-	 *                Unused CLI args
+	 *             Unused CLI args
 	 */
 	public static void main(final String[] args) {
 		rg = new RandomGrammar<>();
 
-		addRule("<sentance>", "<person> <opines> <something>", "<person> thinks that I am <property>",
-				"I <opine> <something>", "You think that I am <property>");
+		addRule("<sentance>", "<person> <opines> <something>",
+				"<person> thinks that I am <property>", "I <opine> <something>",
+				"You think that I am <property>");
 
 		addRule("<activity>", "dancing", "eating", "sleeping");
 
@@ -46,7 +48,8 @@ public class RandomStringExamples {
 
 		addRule("<opines>", "hates", "loves");
 
-		addRule("<person>", "my sister", "my father", "my girlfriend", "the man next door");
+		addRule("<person>", "my sister", "my father", "my girlfriend",
+				"the man next door");
 
 		addRule("<property>", "creative", "intelligent");