Cleanup

5 files changed, 35 insertions, 39 deletions

diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/BinarySearchTest.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/BinarySearchTest.java
index a33847c..1e0a1df 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/BinarySearchTest.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/BinarySearchTest.java
@@ -1,13 +1,13 @@
 package bjc.utils.examples;
 
-import java.util.Scanner;
-
 import bjc.utils.funcdata.bst.BinarySearchTree;
 import bjc.utils.funcdata.bst.TreeLinearizationMethod;
 
+import java.util.Scanner;
+
 /**
  * Example showing how to use the binary search tree.
- * 
+ *
  * @author ben
  *
  */
@@ -16,11 +16,11 @@ public class BinarySearchTest {
 		System.out.print("What order would you like the tree to be printed in (m for options): ");
 		char command;
 
-		while (true) {
+		while(true) {
 			command = input.nextLine().charAt(0);
 			TreeLinearizationMethod method = null;
 
-			switch (command) {
+			switch(command) {
 			case 'm':
 				System.out.println("Possible tree printing methods: ");
 				System.out.println("\tp: Preorder printing (print parent first, then left & right).");
@@ -40,7 +40,7 @@ public class BinarySearchTest {
 				System.out.println("ERROR: Unknown command.");
 			}
 
-			if (method != null) {
+			if(method != null) {
 				tree.traverse(method, (element) -> {
 					System.out.println("Node: " + element);
 					return true;
@@ -55,7 +55,7 @@ public class BinarySearchTest {
 
 	/**
 	 * Main method of class
-	 * 
+	 *
 	 * @param args
 	 *                Unused CLI args
 	 */
@@ -68,11 +68,11 @@ public class BinarySearchTest {
 
 		BinarySearchTree<Character> tree = new BinarySearchTree<>((o1, o2) -> o1 - o2);
 
-		while (command != 'e') {
+		while(command != 'e') {
 			System.out.print("Enter a command (m for help): ");
 			command = input.nextLine().charAt(0);
 
-			switch (command) {
+			switch(command) {
 			case 'm':
 				System.out.println("Valid commands: ");
 				System.out.println("\tm: Display this help message.");
@@ -104,7 +104,7 @@ public class BinarySearchTest {
 				command = input.nextLine().charAt(0);
 
 				boolean inTree = tree.isInTree(command);
-				if (inTree) {
+				if(inTree) {
 					System.out.printf("Node %s was found\n", command);
 				} else {
 					System.out.printf("Node %s was not found\n", command);
diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/ShuntTest.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/ShuntTest.java
index 6b523ce..e228765 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/ShuntTest.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/ShuntTest.java
@@ -1,21 +1,21 @@
 package bjc.utils.examples.parsing;
 
-import java.util.Scanner;
-
 import bjc.utils.funcdata.FunctionalStringTokenizer;
 import bjc.utils.funcdata.IList;
 import bjc.utils.parserutils.ShuntingYard;
 
+import java.util.Scanner;
+
 /**
  * Test of shunting yard
- * 
+ *
  * @author ben
  *
  */
 public class ShuntTest {
 	/**
 	 * Main method
-	 * 
+	 *
 	 * @param args
 	 *                Unused CLI args
 	 */
diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/TreeConstructTest.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/TreeConstructTest.java
index bd67cc8..58a6a5c 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/TreeConstructTest.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/TreeConstructTest.java
@@ -1,11 +1,5 @@
 package bjc.utils.examples.parsing;
 
-import java.util.Deque;
-import java.util.LinkedList;
-import java.util.Scanner;
-import java.util.function.Function;
-import java.util.function.Predicate;
-
 import bjc.utils.data.IPair;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Pair;
@@ -19,9 +13,15 @@ import bjc.utils.funcutils.StringUtils;
 import bjc.utils.parserutils.ShuntingYard;
 import bjc.utils.parserutils.TreeConstructor;
 
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.Scanner;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
 /**
  * Test of tree constructor
- * 
+ *
  * @author ben
  *
  */
@@ -29,13 +29,11 @@ public class TreeConstructTest {
 	private static final class OperatorPicker implements Predicate<String> {
 		@Override
 		public boolean test(String token) {
-			if (StringUtils.containsOnly(token, "\\[")) {
+			if(StringUtils.containsOnly(token, "\\["))
 				return true;
-			} else if (StringUtils.containsOnly(token, "\\]")) {
-				return true;
-			}
+			else if(StringUtils.containsOnly(token, "\\]")) return true;
 
-			switch (token) {
+			switch(token) {
 			case "+":
 			case "-":
 			case "*":
@@ -49,7 +47,7 @@ public class TreeConstructTest {
 
 	/**
 	 * Main method
-	 * 
+	 *
 	 * @param args
 	 *                Unused CLI args
 	 */
@@ -89,11 +87,9 @@ public class TreeConstructTest {
 		System.out.println("Shunted: " + shuntedTokens.toString());
 
 		Predicate<String> specialPicker = (operator) -> {
-			if (StringUtils.containsOnly(operator, "\\[")) {
+			if(StringUtils.containsOnly(operator, "\\["))
 				return true;
-			} else if (StringUtils.containsOnly(operator, "\\]")) {
-				return true;
-			}
+			else if(StringUtils.containsOnly(operator, "\\]")) return true;
 
 			return false;
 		};
@@ -115,7 +111,7 @@ public class TreeConstructTest {
 		operators.put("]", (queuedTrees) -> {
 			ITree<String> arrayTree = new Tree<>("[]");
 
-			while (!queuedTrees.peek().getHead().equals("[")) {
+			while(!queuedTrees.peek().getHead().equals("[")) {
 				arrayTree.addChild(queuedTrees.pop());
 			}
 
diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java
index 8ebf08f..c83c86e 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java
@@ -6,7 +6,7 @@ import bjc.utils.gen.WeightedGrammar;
 
 /**
  * Example showing how to use the weighted random number generator.
- * 
+ *
  * @author ben
  *
  */
@@ -65,7 +65,7 @@ public class DiabloItemGen {
 
 	/**
 	 * Main Method
-	 * 
+	 *
 	 * @param args
 	 *                Unused CLI args
 	 */
@@ -82,7 +82,7 @@ public class DiabloItemGen {
 		rules.addRule("<infix>");
 		addInfixRules();
 
-		for (int i = 0; i < 100; i++) {
+		for(int i = 0; i < 100; i++) {
 			IList<String> ls = rules.generateListValues("<item>", " ");
 
 			StringBuilder sb = new StringBuilder();
diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java
index 6de6c68..c490107 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java
@@ -7,7 +7,7 @@ import bjc.utils.gen.RandomGrammar;
 
 /**
  * Examples of random grammar
- * 
+ *
  * @author ben
  *
  */
@@ -17,7 +17,7 @@ public class RandomStringExamples {
 	private static void addRule(String rule, String... cases) {
 		IList<IList<String>> cses = new FunctionalList<>();
 
-		for (String strang : cases) {
+		for(String strang : cases) {
 			IList<String> lst = FunctionalStringTokenizer.fromString(strang).toList(s -> s);
 
 			cses.add(lst);
@@ -28,7 +28,7 @@ public class RandomStringExamples {
 
 	/**
 	 * Main method
-	 * 
+	 *
 	 * @param args
 	 *                Unused CLI args
 	 */
@@ -52,7 +52,7 @@ public class RandomStringExamples {
 
 		addRule("<something>", "<activity>", "<activity> with <person>", "<object>");
 
-		for (int i = 0; i < 10; i++) {
+		for(int i = 0; i < 10; i++) {
 			IList<String> ls = rg.generateListValues("<sentance>", " ");
 
 			StringBuilder sb = new StringBuilder();