Cleanup

6 files changed, 165 insertions, 160 deletions

diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/AbbrevMapTest.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/AbbrevMapTest.java
index ddf8e0c..ac4ea76 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/AbbrevMapTest.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/AbbrevMapTest.java
@@ -1,35 +1,35 @@
 package bjc.utils.examples;
 
+import java.util.Scanner;
+
 import bjc.utils.esodata.AbbrevMap;
 import bjc.utils.funcutils.StringUtils;
 
-import java.util.Scanner;
-
 /**
  * Test for abbreviation map.
- * 
+ *
  * @author EVE
  *
  */
 public class AbbrevMapTest {
 	/**
 	 * Main method.
-	 * 
+	 *
 	 * @param args
 	 *                Unused CLI args.
 	 */
-	public static void main(String[] args) {
-		Scanner scn = new Scanner(System.in);
+	public static void main(final String[] args) {
+		final Scanner scn = new Scanner(System.in);
 
-		AbbrevMap map = new AbbrevMap();
+		final AbbrevMap map = new AbbrevMap();
 
 		System.out.print("Enter a command (blank line to quit): ");
 		String ln = scn.nextLine();
 
-		while(!ln.equals("")) {
-			String[] commParts = ln.split(" ");
+		while (!ln.equals("")) {
+			final String[] commParts = ln.split(" ");
 
-			switch(commParts[0]) {
+			switch (commParts[0]) {
 			case "add":
 				map.addWords(commParts[1]);
 				break;
@@ -40,7 +40,7 @@ public class AbbrevMapTest {
 				map.recalculate();
 				break;
 			case "check":
-				String list = StringUtils.toEnglishList(map.deabbrev(commParts[1]), false);
+				final String list = StringUtils.toEnglishList(map.deabbrev(commParts[1]), false);
 				System.out.println(list);
 				break;
 			case "debug":
@@ -49,7 +49,7 @@ public class AbbrevMapTest {
 			default:
 				System.out.println("Unknown command: " + ln);
 			}
-			
+
 			System.out.print("Enter a command (blank line to quit): ");
 			ln = scn.nextLine();
 		}
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 5e42b8f..758af61 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/BinarySearchTest.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/BinarySearchTest.java
@@ -1,10 +1,10 @@
 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.
  *
@@ -12,15 +12,15 @@ import java.util.Scanner;
  *
  */
 public class BinarySearchTest {
-	private static void display(BinarySearchTree<Character> tree, Scanner input) {
+	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) {
+		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;
@@ -59,17 +59,17 @@ public class BinarySearchTest {
 	 * @param args
 	 *                Unused CLI args
 	 */
-	public static void main(String[] args) {
-		Scanner input = new Scanner(System.in);
+	public static void main(final String[] args) {
+		final Scanner input = new Scanner(System.in);
 		System.out.println("Binary Tree Constructor/Searcher");
-		BinarySearchTree<Character> tree = new BinarySearchTree<>((o1, o2) -> o1 - o2);
+		final BinarySearchTree<Character> tree = new BinarySearchTree<>((o1, o2) -> o1 - o2);
 
 		char command = ' ';
-		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.");
@@ -100,8 +100,8 @@ public class BinarySearchTest {
 				System.out.print("Enter the letter to add to the binary tree: ");
 				command = input.nextLine().charAt(0);
 
-				boolean inTree = tree.isInTree(command);
-				if(inTree) {
+				final boolean inTree = tree.isInTree(command);
+				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/DelimSplitterTest.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/DelimSplitterTest.java
index ecb5c4b..cda9a09 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/DelimSplitterTest.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/DelimSplitterTest.java
@@ -1,5 +1,16 @@
 package bjc.utils.examples;
 
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Scanner;
+
 import bjc.utils.data.ITree;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
@@ -12,20 +23,10 @@ import bjc.utils.parserutils.delims.SequenceDelimiter;
 import bjc.utils.parserutils.delims.StringDelimiter;
 import bjc.utils.parserutils.splitterv2.ConfigurableTokenSplitter;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Scanner;
-
 /**
- * Test for {@link SequenceDelimiter} as well as {@link ConfigurableTokenSplitter}
- * 
+ * Test for {@link SequenceDelimiter} as well as
+ * {@link ConfigurableTokenSplitter}
+ *
  * @author EVE
  *
  */
@@ -58,25 +59,29 @@ public class DelimSplitterTest {
 	private void loadMirrorDB() {
 		mirrored = new HashMap<>();
 
-		InputStream stream = getClass().getResourceAsStream("/BidiMirrorDB.txt");
+		final InputStream stream = getClass().getResourceAsStream("/BidiMirrorDB.txt");
 
-		try(Scanner scn = new Scanner(stream)) {
+		try (Scanner scn = new Scanner(stream)) {
 			String ln = "";
 
-			while(scn.hasNextLine()) {
+			while (scn.hasNextLine()) {
 				ln = scn.nextLine();
 
-				if(ln.equals("")) continue;
-				if(ln.startsWith("#")) continue;
+				if (ln.equals("")) {
+					continue;
+				}
+				if (ln.startsWith("#")) {
+					continue;
+				}
 
-				int cp1 = Integer.parseInt(ln.substring(0, 4), 16);
-				int cp2 = Integer.parseInt(ln.substring(6, 10), 16);
+				final int cp1 = Integer.parseInt(ln.substring(0, 4), 16);
+				final int cp2 = Integer.parseInt(ln.substring(6, 10), 16);
 
-				char[] cpa1 = Character.toChars(cp1);
-				char[] cpa2 = Character.toChars(cp2);
+				final char[] cpa1 = Character.toChars(cp1);
+				final char[] cpa2 = Character.toChars(cp2);
 
-				String cps1 = new String(cpa1);
-				String cps2 = new String(cpa2);
+				final String cps1 = new String(cpa1);
+				final String cps2 = new String(cpa2);
 
 				mirrored.put(cps1, cps2);
 			}
@@ -87,13 +92,13 @@ public class DelimSplitterTest {
 	 * Run the tester interface.
 	 */
 	private void runLoop() {
-		Scanner scn = new Scanner(System.in);
+		final Scanner scn = new Scanner(System.in);
 
 		System.out.print("Enter a command (blank line to quit): ");
 		String inp = scn.nextLine().trim();
 		System.out.println();
 
-		while(!inp.equals("")) {
+		while (!inp.equals("")) {
 			handleCommand(inp, scn, true);
 
 			System.out.println();
@@ -110,23 +115,21 @@ public class DelimSplitterTest {
 	/*
 	 * Handle a input command.
 	 */
-	private void handleCommand(String inp, Scanner scn, boolean isInteractive) {
-		if(inp.equals("")) {
-			return;
-		}
+	private void handleCommand(final String inp, final Scanner scn, final boolean isInteractive) {
+		if (inp.equals("")) return;
 
 		int idx = inp.indexOf(' ');
 
-		if(idx == -1) {
+		if (idx == -1) {
 			idx = inp.length();
 		}
 
-		String command = inp.substring(0, idx);
+		final String command = inp.substring(0, idx);
 
-		String args = inp.substring(idx).trim();
-		String[] argArray = args.split(" ");
+		final String args = inp.substring(idx).trim();
+		final String[] argArray = args.split(" ");
 
-		switch(command) {
+		switch (command) {
 		case "test":
 			handleTest(args, false);
 			break;
@@ -138,28 +141,28 @@ public class DelimSplitterTest {
 			break;
 		case "splitter-compile":
 			split.compile();
-			if(verbose) {
+			if (verbose) {
 				System.out.println("Compiled splitter");
 			}
 			break;
 		case "splitter-add":
 			split.addSimpleDelimiters(argArray);
-			if(verbose) {
+			if (verbose) {
 				System.out.println("Added delimiters " + StringUtils.toEnglishList(argArray, true));
 			}
 			break;
 		case "splitter-addmulti":
 			split.addMultiDelimiters(argArray);
-			if(verbose) {
+			if (verbose) {
 				System.out.println(
 						"Added multi-delimiters " + StringUtils.toEnglishList(argArray, true));
 			}
 			break;
 		case "splitter-addmatch":
-			for(String arg : argArray) {
+			for (final String arg : argArray) {
 				split.addSimpleDelimiters(arg, mirrored.get(arg));
 			}
-			if(verbose) {
+			if (verbose) {
 				System.out.println("Added matched delimiters "
 						+ StringUtils.toEnglishList(argArray, true));
 			}
@@ -169,22 +172,22 @@ public class DelimSplitterTest {
 			break;
 		case "splitter-reset":
 			split = new ConfigurableTokenSplitter(true);
-			if(verbose) {
+			if (verbose) {
 				System.out.println("Reset splitter");
 			}
 			break;
 
 		case "delims-addgroup":
-			for(String arg : argArray) {
+			for (final String arg : argArray) {
 				dlm.addGroup(groups.get(arg));
 			}
-			if(verbose) {
+			if (verbose) {
 				System.out.println("Added groups " + StringUtils.toEnglishList(argArray, true));
 			}
 			break;
 		case "delims-setinitial":
 			dlm.setInitialGroup(groups.get(argArray[0]));
-			if(verbose) {
+			if (verbose) {
 				System.out.println("Set initial group");
 			}
 			break;
@@ -196,32 +199,32 @@ public class DelimSplitterTest {
 			break;
 		case "delims-reset":
 			dlm = new StringDelimiter();
-			if(verbose) {
+			if (verbose) {
 				System.out.println("Reset delimiter");
 			}
 			break;
 		case "delimgroups-new":
-			for(String arg : argArray) {
+			for (final String arg : argArray) {
 				groups.put(arg, new DelimiterGroup<>(arg));
 			}
-			if(verbose) {
+			if (verbose) {
 				System.out.println("Created groups " + StringUtils.toEnglishList(argArray, true));
 			}
 			break;
 		case "delimgroups-edit":
-			for(String arg : argArray) {
+			for (final String arg : argArray) {
 				handleEditGroup(arg, scn, isInteractive);
 			}
 			break;
 		case "delimgroups-debug":
-			for(DelimiterGroup<String> group : groups.values()) {
+			for (final DelimiterGroup<String> group : groups.values()) {
 				System.out.println(group.toString());
 			}
 			break;
 		case "delimgroups-reset":
 			dlm = new StringDelimiter();
 			groups = new HashMap<>();
-			if(verbose) {
+			if (verbose) {
 				System.out.println("Reset delimiter groups + delimiter");
 			}
 			break;
@@ -237,32 +240,36 @@ public class DelimSplitterTest {
 	/*
 	 * Load script commands from a file.
 	 */
-	private void handleLoadFile(String args) {
+	private void handleLoadFile(final String args) {
 		String pth = args;
 
-		if(args.startsWith("\"")) {
+		if (args.startsWith("\"")) {
 			pth = args.substring(1, args.length() - 1);
 		}
 
-		try(FileInputStream fis = new FileInputStream(pth)) {
-			Scanner scn = new Scanner(fis);
+		try (FileInputStream fis = new FileInputStream(pth)) {
+			final Scanner scn = new Scanner(fis);
 
-			while(scn.hasNextLine()) {
-				String ln = scn.nextLine().trim();
+			while (scn.hasNextLine()) {
+				final String ln = scn.nextLine().trim();
 
-				if(ln.equals("")) continue;
-				if(ln.startsWith("#")) continue;
+				if (ln.equals("")) {
+					continue;
+				}
+				if (ln.startsWith("#")) {
+					continue;
+				}
 
-				if(verbose) {
+				if (verbose) {
 					System.out.println("\nRead command '" + ln + "' from file\n");
 				}
 				handleCommand(ln, scn, false);
 			}
 
 			scn.close();
-		} catch(FileNotFoundException fnfex) {
+		} catch (final FileNotFoundException fnfex) {
 			System.out.println("Couldn't find file '" + args + "'");
-		} catch(IOException ioex) {
+		} catch (final IOException ioex) {
 			System.out.println("I/O error with file '" + args + "'\nCause: " + ioex.getMessage());
 		}
 	}
@@ -270,88 +277,88 @@ public class DelimSplitterTest {
 	/*
 	 * Handle editing a group.
 	 */
-	private void handleEditGroup(String arg, Scanner scn, boolean isInteractive) {
-		if(!groups.containsKey(arg)) {
+	private void handleEditGroup(final String arg, final Scanner scn, final boolean isInteractive) {
+		if (!groups.containsKey(arg)) {
 			System.out.println("No group named '" + arg + "'");
 			return;
 		}
 
-		DelimiterGroup<String> group = groups.get(arg);
+		final DelimiterGroup<String> group = groups.get(arg);
 
-		if(verbose) {
+		if (verbose) {
 			System.out.println("Editing group '" + arg + "'");
 		}
-		if(isInteractive) {
+		if (isInteractive) {
 			System.out.println("Enter command (blank line to stop editing): ");
 		}
 
 		String ln = scn.nextLine().trim();
 
-		while(!ln.equals("")) {
+		while (!ln.equals("")) {
 			int idx = ln.indexOf(' ');
 
-			if(idx == -1) {
+			if (idx == -1) {
 				idx = ln.length();
 			}
 
-			String command = ln.substring(0, idx);
+			final String command = ln.substring(0, idx);
 
-			String args = ln.substring(idx).trim();
-			String[] argArray = args.split(" ");
+			final String args = ln.substring(idx).trim();
+			final String[] argArray = args.split(" ");
 
-			switch(command) {
+			switch (command) {
 			case "add-closing":
 				group.addClosing(argArray);
-				if(verbose) {
+				if (verbose) {
 					System.out.println(
 							"Added closers " + StringUtils.toEnglishList(argArray, true));
 				}
 				break;
 			case "add-tlexclude":
 				group.addTopLevelForbid(argArray);
-				if(verbose) {
+				if (verbose) {
 					System.out.println("Added top-level exclusions "
 							+ StringUtils.toEnglishList(argArray, true));
 				}
 				break;
 			case "add-exclude":
 				group.addTopLevelForbid(argArray);
-				if(verbose) {
+				if (verbose) {
 					System.out.println("Added nested exclusions "
 							+ StringUtils.toEnglishList(argArray, true));
 				}
 				break;
 			case "add-subgroup":
 				group.addSubgroup(argArray[0], Integer.parseInt(argArray[1]));
-				if(verbose) {
+				if (verbose) {
 					System.out.printf("Added subgroup %s with priority %s\n", argArray[0],
 							argArray[1]);
 				}
 				break;
 			case "add-implied-subgroup":
 				group.implySubgroup(argArray[0], argArray[1]);
-				if(verbose) {
+				if (verbose) {
 					System.out.printf("Made closer '%s' imply a '%s' subgroup\n", argArray[0],
 							argArray[1]);
 				}
 				break;
 			case "add-opener":
 				group.addOpener(argArray[0], argArray[1]);
-				if(verbose) {
+				if (verbose) {
 					System.out.printf("Added opener '%s' for group '%s'\n", argArray[0],
 							argArray[1]);
 				}
 				break;
 			case "add-reopener":
 				group.addPredOpener(new RegexOpener(argArray[0], argArray[1]));
-				if(verbose) {
+				if (verbose) {
 					System.out.printf("Added regex '%s' as opener for '%s'\n", argArray[1],
 							argArray[0]);
 				}
 				break;
 			case "add-recloser":
 				group.addPredCloser(new RegexCloser(argArray[0]));
-				if(verbose) {
+				if (verbose) {
 					System.out.printf("Added parameterized string '%s' as closer\n", argArray[0]);
 				}
 				break;
@@ -362,71 +369,71 @@ public class DelimSplitterTest {
 				System.out.println("Unknown command " + command);
 			}
 
-			if(isInteractive) {
+			if (isInteractive) {
 				System.out.println("Enter command (blank line to stop editing): ");
 			}
 
 			ln = scn.nextLine().trim();
 		}
 
-		if(verbose) {
+		if (verbose) {
 			System.out.println("Finished editing group '" + arg + "'");
 		}
 	}
 
-	private void handleDelim(String args) {
+	private void handleDelim(final String args) {
 		try {
-			ITree<String> res = dlm.delimitSequence(args.split(" "));
+			final ITree<String> res = dlm.delimitSequence(args.split(" "));
 
 			printDelimSeq(res);
-		} catch(DelimiterException dex) {
+		} catch (final DelimiterException dex) {
 			System.out.println("Expression '" + args + "' isn't properly delimited.\n\tCause: "
 					+ dex.getMessage());
 		}
 	}
 
-	private void handleSplit(String[] argArray) {
-		for(int i = 0; i < argArray.length; i++) {
-			String arg = argArray[i];
+	private void handleSplit(final String[] argArray) {
+		for (int i = 0; i < argArray.length; i++) {
+			final String arg = argArray[i];
 
-			IList<String> strangs = split.split(arg);
+			final IList<String> strangs = split.split(arg);
 
 			System.out.printf("%d '%s' %s\n", i, arg, strangs);
 		}
 	}
 
-	private void handleTest(String inp, boolean splitWS) {
+	private void handleTest(final String inp, final boolean splitWS) {
 		IList<String> strings;
 
 		try {
 			strings = split.split(inp);
-		} catch(IllegalStateException isex) {
+		} catch (final IllegalStateException isex) {
 			System.out.println("Splitter must be compiled at least once before use.");
 			return;
 		}
 
 		System.out.println("Split tokens: " + strings);
 
-		if(splitWS) {
-			List<String> tks = new LinkedList<>();
+		if (splitWS) {
+			final List<String> tks = new LinkedList<>();
 
-			for(String strang : strings) {
+			for (final String strang : strings) {
 				tks.addAll(Arrays.asList(strang.split(" ")));
 			}
 
 			strings = new FunctionalList<>(tks);
 		}
 		try {
-			ITree<String> delim = dlm.delimitSequence(strings.toArray(new String[0]));
+			final ITree<String> delim = dlm.delimitSequence(strings.toArray(new String[0]));
 
 			printDelimSeq(delim);
-		} catch(DelimiterException dex) {
+		} catch (final DelimiterException dex) {
 			System.out.println("Expression isn't properly delimited.");
 			System.out.println("Cause: " + dex.getMessage());
 		}
 	}
 
-	private void printDelimSeq(ITree<String> delim) {
+	private void printDelimSeq(final ITree<String> delim) {
 		System.out.println("Delimited tokens:\n" + delim.getChild(1).toString());
 		System.out.print("Delimited expr: ");
 		printDelimTree(delim);
@@ -436,27 +443,27 @@ public class DelimSplitterTest {
 		System.out.println();
 	}
 
-	private void printDelimTree(ITree<String> tree) {
-		StringBuilder sb = new StringBuilder();
+	private void printDelimTree(final ITree<String> tree) {
+		final StringBuilder sb = new StringBuilder();
 
 		intPrintDelimTree(tree.getChild(1), sb);
 
 		System.out.println(sb.toString().replaceAll("\\s+", " "));
 	}
 
-	private void intPrintDelimTree(ITree<String> tree, StringBuilder sb) {
+	private void intPrintDelimTree(final ITree<String> tree, final StringBuilder sb) {
 		tree.doForChildren((child) -> {
 			intPrintDelimNode(child, sb);
 		});
 	}
 
-	private void intPrintDelimNode(ITree<String> tree, StringBuilder sb) {
-		if(tree.getHead().equals("contents")) {
+	private void intPrintDelimNode(final ITree<String> tree, final StringBuilder sb) {
+		if (tree.getHead().equals("contents")) {
 			intPrintDelimTree(tree, sb);
 			return;
 		}
 
-		switch(tree.getChildrenCount()) {
+		switch (tree.getChildrenCount()) {
 		case 0:
 			sb.append(tree.getHead());
 			sb.append(" ");
@@ -474,7 +481,7 @@ public class DelimSplitterTest {
 		case 3:
 			intPrintDelimNode(tree.getChild(0), sb);
 
-			ITree<String> contents = tree.getChild(1);
+			final ITree<String> contents = tree.getChild(1);
 
 			intPrintDelimTree(contents.getChild(0), sb);
 			intPrintDelimNode(tree.getChild(2), sb);
@@ -485,12 +492,12 @@ public class DelimSplitterTest {
 
 	/**
 	 * Main method
-	 * 
+	 *
 	 * @param args
 	 *                Unused CLI args.
 	 */
-	public static void main(String[] args) {
-		DelimSplitterTest tst = new DelimSplitterTest();
+	public static void main(final String[] args) {
+		final DelimSplitterTest tst = new DelimSplitterTest();
 
 		tst.runLoop();
 	}
diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/ShuntTest.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/ShuntTest.java
index e0c29fe..ed530ed 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/ShuntTest.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/ShuntTest.java
@@ -1,11 +1,11 @@
 package bjc.utils.examples;
 
+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
  *
@@ -19,16 +19,16 @@ public class ShuntTest {
 	 * @param args
 	 *                Unused CLI args
 	 */
-	public static void main(String[] args) {
-		Scanner inputSource = new Scanner(System.in);
+	public static void main(final String[] args) {
+		final Scanner inputSource = new Scanner(System.in);
 
 		System.out.print("Enter a expression to shunt: ");
-		String line = inputSource.nextLine();
+		final String line = inputSource.nextLine();
 
-		ShuntingYard<String> yard = new ShuntingYard<>(true);
+		final ShuntingYard<String> yard = new ShuntingYard<>(true);
 
-		IList<String> preTokens = new FunctionalStringTokenizer(line).toList(strang -> strang);
-		IList<String> shuntedTokens = yard.postfix(preTokens, 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/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java
index 2c84bcc..250318f 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,15 +13,14 @@ 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(final String ruleName, final int probability, final String ruleParts) {
+		final IList<String> parts = FunctionalStringTokenizer.fromString(ruleParts).toList(strang -> strang);
 
 		rules.addCase(ruleName, probability, parts);
 	}
 
 	private static void addInfixRules() {
-		String rn = "<infix>";
+		final String rn = "<infix>";
 
 		addCase(rn, 60, "sword");
 		addCase(rn, 50, "armor");
@@ -32,7 +31,7 @@ public class DiabloItemGen {
 	}
 
 	private static void addItemRules() {
-		String rn = "<item>";
+		final String rn = "<item>";
 
 		addCase(rn, 10, "<infix>");
 		addCase(rn, 20, "<prefix> <infix>");
@@ -43,7 +42,7 @@ public class DiabloItemGen {
 	}
 
 	private static void addPrefixRules() {
-		String rn = "<prefix>";
+		final String rn = "<prefix>";
 
 		addCase(rn, 60, "sturdy");
 		addCase(rn, 50, "fine");
@@ -54,7 +53,7 @@ public class DiabloItemGen {
 	}
 
 	private static void addSuffixRules() {
-		String rn = "<suffix>";
+		final String rn = "<suffix>";
 
 		addCase(rn, 60, "of Health");
 		addCase(rn, 50, "of Wealth");
@@ -70,7 +69,7 @@ public class DiabloItemGen {
 	 * @param args
 	 *                Unused CLI args
 	 */
-	public static void main(String[] args) {
+	public static void main(final String[] args) {
 		rules.addRule("<item>");
 		addItemRules();
 
@@ -83,10 +82,10 @@ public class DiabloItemGen {
 		rules.addRule("<infix>");
 		addInfixRules();
 
-		for(int i = 0; i < 100; i++) {
-			IList<String> ls = rules.generateListValues("<item>", " ");
+		for (int i = 0; i < 100; i++) {
+			final IList<String> ls = rules.generateListValues("<item>", " ");
 
-			StringBuilder sb = new StringBuilder();
+			final StringBuilder sb = new StringBuilder();
 			ls.forEach(sb::append);
 
 			System.out.println(sb.toString().replaceAll("\\s+", " "));
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 8546d2e..a84f70d 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
@@ -14,12 +14,11 @@ import bjc.utils.gen.RandomGrammar;
 public class RandomStringExamples {
 	private static RandomGrammar<String> rg;
 
-	private static void addRule(String rule, String... cases) {
-		IList<IList<String>> cses = new FunctionalList<>();
+	private static void addRule(final String rule, final String... cases) {
+		final IList<IList<String>> cses = new FunctionalList<>();
 
-		for(String strang : cases) {
-			IList<String> lst = FunctionalStringTokenizer.fromString(strang)
-				.toList(s -> s);
+		for (final String strang : cases) {
+			final IList<String> lst = FunctionalStringTokenizer.fromString(strang).toList(s -> s);
 
 			cses.add(lst);
 		}
@@ -33,7 +32,7 @@ public class RandomStringExamples {
 	 * @param args
 	 *                Unused CLI args
 	 */
-	public static void main(String[] args) {
+	public static void main(final String[] args) {
 		rg = new RandomGrammar<>();
 
 		addRule("<sentance>", "<person> <opines> <something>", "<person> thinks that I am <property>",
@@ -53,10 +52,10 @@ public class RandomStringExamples {
 
 		addRule("<something>", "<activity>", "<activity> with <person>", "<object>");
 
-		for(int i = 0; i < 10; i++) {
-			IList<String> ls = rg.generateListValues("<sentance>", " ");
+		for (int i = 0; i < 10; i++) {
+			final IList<String> ls = rg.generateListValues("<sentance>", " ");
 
-			StringBuilder sb = new StringBuilder();
+			final StringBuilder sb = new StringBuilder();
 			ls.forEach(sb::append);
 
 			System.out.println(sb.toString().replaceAll("\\s+", " "));