Formatting

5 files changed, 29 insertions, 59 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 3c6f124..a33847c 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/BinarySearchTest.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/BinarySearchTest.java
@@ -12,8 +12,7 @@ import bjc.utils.funcdata.bst.TreeLinearizationMethod;
  *
  */
 public class BinarySearchTest {
-	private static void display(BinarySearchTree<Character> tree,
-			Scanner input) {
+	private static void display(BinarySearchTree<Character> tree, Scanner input) {
 		System.out.print("What order would you like the tree to be printed in (m for options): ");
 		char command;
 
@@ -58,7 +57,7 @@ public class BinarySearchTest {
 	 * Main method of class
 	 * 
 	 * @param args
-	 *            Unused CLI args
+	 *                Unused CLI args
 	 */
 	public static void main(String[] args) {
 		Scanner input = new Scanner(System.in);
@@ -105,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 1317db7..6b523ce 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
@@ -17,7 +17,7 @@ public class ShuntTest {
 	 * Main method
 	 * 
 	 * @param args
-	 *            Unused CLI args
+	 *                Unused CLI args
 	 */
 	public static void main(String[] args) {
 		Scanner inputSource = new Scanner(System.in);
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 6559a1e..bd67cc8 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
@@ -51,7 +51,7 @@ public class TreeConstructTest {
 	 * Main method
 	 * 
 	 * @param args
-	 *            Unused CLI args
+	 *                Unused CLI args
 	 */
 	@SuppressWarnings("resource")
 	public static void main(String[] args) {
@@ -98,8 +98,7 @@ public class TreeConstructTest {
 			return false;
 		};
 
-		IMap<String, Function<Deque<ITree<String>>, ITree<String>>> operators =
-			new FunctionalMap<>();
+		IMap<String, Function<Deque<ITree<String>>, ITree<String>>> operators = new FunctionalMap<>();
 
 		operators.put("[", (queuedTrees) -> {
 			return null;
@@ -125,9 +124,8 @@ public class TreeConstructTest {
 			return arrayTree;
 		});
 
-		ITree<String> constructedTree =
-			TreeConstructor.constructTree(shuntedTokens,
-					new OperatorPicker(), specialPicker, operators::get);
+		ITree<String> constructedTree = TreeConstructor.constructTree(shuntedTokens, new OperatorPicker(),
+				specialPicker, operators::get);
 
 		System.out.println("AST: " + constructedTree.toString());
 
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 fc1d6c2..8ebf08f 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
@@ -13,10 +13,8 @@ import bjc.utils.gen.WeightedGrammar;
 public class DiabloItemGen {
 	private static WeightedGrammar<String> rules = new WeightedGrammar<>();
 
-	private static void addCase(String ruleName, int probability,
-			String ruleParts) {
-		IList<String> parts = FunctionalStringTokenizer.fromString(ruleParts)
-			.toList(strang -> strang);
+	private static void addCase(String ruleName, int probability, String ruleParts) {
+		IList<String> parts = FunctionalStringTokenizer.fromString(ruleParts).toList(strang -> strang);
 
 		rules.addCase(ruleName, probability, parts);
 	}
@@ -69,7 +67,7 @@ public class DiabloItemGen {
 	 * Main Method
 	 * 
 	 * @param args
-	 *            Unused CLI args
+	 *                Unused CLI args
 	 */
 	public static void main(String[] args) {
 		rules.addRule("<item>");
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 3b4e44f..6de6c68 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
@@ -18,8 +18,7 @@ public class RandomStringExamples {
 		IList<IList<String>> cses = new FunctionalList<>();
 
 		for (String strang : cases) {
-			IList<String> lst = FunctionalStringTokenizer.fromString(strang)
-				.toList(s -> s);
+			IList<String> lst = FunctionalStringTokenizer.fromString(strang).toList(s -> s);
 
 			cses.add(lst);
 		}
@@ -31,51 +30,27 @@ public class RandomStringExamples {
 	 * Main method
 	 * 
 	 * @param args
-	 *            Unused CLI args
+	 *                Unused CLI args
 	 */
 	public static void main(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("<activity>",
-				"dancing",
-				"eating",
-				"sleeping");
-
-		addRule("<object>",
-				"<person>",
-				"life",
-				"my computer",
-				"my friends");
-
-		addRule("<opine>",
-				"hate",
-				"am jealous of",
-				"love");
-
-		addRule("<opines>",
-				"hates",
-				"loves");
-
-		addRule("<person>",
-				"my sister",
-				"my father",
-				"my girlfriend",
-				"the man next door");
-
-		addRule("<property>",
-				"creative",
-				"intelligent");
-
-		addRule("<something>",
-				"<activity>",
-				"<activity> with <person>",
-				"<object>");
+		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");
+
+		addRule("<object>", "<person>", "life", "my computer", "my friends");
+
+		addRule("<opine>", "hate", "am jealous of", "love");
+
+		addRule("<opines>", "hates", "loves");
+
+		addRule("<person>", "my sister", "my father", "my girlfriend", "the man next door");
+
+		addRule("<property>", "creative", "intelligent");
+
+		addRule("<something>", "<activity>", "<activity> with <person>", "<object>");
 
 		for (int i = 0; i < 10; i++) {
 			IList<String> ls = rg.generateListValues("<sentance>", " ");