1 files changed, 53 insertions, 55 deletions

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 d5eaadf..6e24e50 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java
@@ -1,9 +1,9 @@
 package bjc.utils.funcutils;
 
-import com.ibm.icu.text.BreakIterator;
-
 import java.util.Deque;
 
+import com.ibm.icu.text.BreakIterator;
+
 /**
  * Utility methods for operations on strings
  *
@@ -16,25 +16,25 @@ public class StringUtils {
 	 * expression
 	 *
 	 * @param input
-	 *            The string to check
+	 *                The string to check
 	 * @param rRegex
-	 *            The regex to see if the string only contains matches of
-	 * @return Whether or not the string consists only of multiple matches of
-	 *         the provided regex
+	 *                The regex to see if the string only contains matches
+	 *                of
+	 * @return Whether or not the string consists only of multiple matches
+	 *         of the provided regex
 	 */
-	public static boolean containsOnly(String input, String rRegex) {
+	public static boolean containsOnly(final String input, final String rRegex) {
 		if (input == null)
 			throw new NullPointerException("Input must not be null");
-		else if (rRegex == null)
-			throw new NullPointerException("Regex must not be null");
+		else if (rRegex == null) throw new NullPointerException("Regex must not be null");
 
 		/*
 		 * This regular expression is fairly simple.
 		 *
 		 * First, we match the beginning of the string. Then, we start a
-		 * non-capturing group whose contents are the passed in regex. That
-		 * group is then matched one or more times and the pattern matches to
-		 * the end of the string
+		 * non-capturing group whose contents are the passed in regex.
+		 * That group is then matched one or more times and the pattern
+		 * matches to the end of the string
 		 */
 		return input.matches("\\A(?:" + rRegex + ")+\\Z");
 	}
@@ -43,51 +43,51 @@ public class StringUtils {
 	 * Indent the string being built in a StringBuilder n levels
 	 *
 	 * @param builder
-	 *            The builder to indent in
+	 *                The builder to indent in
 	 * @param levels
-	 *            The number of levels to indent
+	 *                The number of levels to indent
 	 */
-	public static void indentNLevels(StringBuilder builder, int levels) {
+	public static void indentNLevels(final StringBuilder builder, final int levels) {
 		for (int i = 0; i < levels; i++) {
 			builder.append("\t");
 		}
 	}
 
 	/**
-	 * Print out a deque with a special case for easily showing a deque is empty
+	 * Print out a deque with a special case for easily showing a deque is
+	 * empty
 	 *
 	 * @param <ContainedType>
-	 *            The type in the deque
+	 *                The type in the deque
 	 * @param queue
-	 *            The deque to print
-	 * @return A string version of the deque, with allowance for an empty deque
+	 *                The deque to print
+	 * @return A string version of the deque, with allowance for an empty
+	 *         deque
 	 */
-	public static <ContainedType> String printDeque(Deque<ContainedType> queue) {
+	public static <ContainedType> String printDeque(final Deque<ContainedType> queue) {
 		return queue.isEmpty() ? "(none)" : queue.toString();
 	}
 
 	/**
 	 * Converts a sequence to an English list.
-	 * 
+	 *
 	 * @param objects
-	 *            The sequence to convert to an English list.
+	 *                The sequence to convert to an English list.
 	 * @param join
-	 *            The string to use for separating the last element from the
-	 *            rest.
+	 *                The string to use for separating the last element from
+	 *                the rest.
 	 * @param comma
-	 *            The string to use as a comma
-	 * 
+	 *                The string to use as a comma
+	 *
 	 * @return The sequence as an English list.
 	 */
-	public static String toEnglishList(Object[] objects, String join, String comma) {
-		if (objects == null) {
-			throw new NullPointerException("Sequence must not be null");
-		}
+	public static String toEnglishList(final Object[] objects, final String join, final String comma) {
+		if (objects == null) throw new NullPointerException("Sequence must not be null");
 
-		StringBuilder sb = new StringBuilder();
+		final StringBuilder sb = new StringBuilder();
 
-		String joiner = join;
-		String coma = comma;
+		final String joiner = join;
+		final String coma = comma;
 
 		switch (objects.length) {
 		case 0:
@@ -119,9 +119,9 @@ public class StringUtils {
 			}
 			/*
 			 * Uncomment this to remove serial commas.
-			 * 
+			 *
 			 * int lc = sb.length() - 1;
-			 * 
+			 *
 			 * sb.delete(lc - coma.length(), lc);
 			 */
 			sb.append(joiner + " ");
@@ -133,47 +133,45 @@ public class StringUtils {
 
 	/**
 	 * Converts a sequence to an English list.
-	 * 
+	 *
 	 * @param objects
-	 *            The sequence to convert to an English list.
+	 *                The sequence to convert to an English list.
 	 * @param join
-	 *            The string to use for separating the last element from the
-	 *            rest.
-	 * 
+	 *                The string to use for separating the last element from
+	 *                the rest.
+	 *
 	 * @return The sequence as an English list.
 	 */
-	public static String toEnglishList(Object[] objects, String join) {
+	public static String toEnglishList(final Object[] objects, final String join) {
 		return toEnglishList(objects, join, ",");
 	}
 
 	/**
 	 * Converts a sequence to an English list.
-	 * 
+	 *
 	 * @param objects
-	 *            The sequence to convert to an English list.
+	 *                The sequence to convert to an English list.
 	 * @param and
-	 *            Whether to use 'and' or 'or'.
-	 * 
+	 *                Whether to use 'and' or 'or'.
+	 *
 	 * @return The sequence as an English list.
 	 */
-	public static String toEnglishList(Object[] objects, boolean and) {
-		if (and) {
+	public static String toEnglishList(final Object[] objects, final boolean and) {
+		if (and)
 			return toEnglishList(objects, "and");
-		} else {
-			return toEnglishList(objects, "or");
-		}
+		else return toEnglishList(objects, "or");
 	}
 
 	/**
 	 * Count the number of graphemes in a string.
-	 * 
+	 *
 	 * @param value
-	 *            The string to check.
-	 * 
+	 *                The string to check.
+	 *
 	 * @return The number of graphemes in the string.
 	 */
-	public static int graphemeCount(String value) {
-		BreakIterator it = BreakIterator.getCharacterInstance();
+	public static int graphemeCount(final String value) {
+		final BreakIterator it = BreakIterator.getCharacterInstance();
 		it.setText(value);
 
 		int count = 0;