From 504ca816530efdff06bc202e0432ebd354aec304 Mon Sep 17 00:00:00 2001
From: EVE <EVE@EVE-PC>
Date: Tue, 14 Mar 2017 12:07:14 -0400
Subject: Cleanup

---
 .../java/bjc/utils/funcutils/TokenSplitter.java     | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java')

diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java
index 4176088..84f5270 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java
@@ -1,11 +1,11 @@
 package bjc.utils.funcutils;
 
-import java.util.Iterator;
-import java.util.function.BiFunction;
-
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
 
+import java.util.Iterator;
+import java.util.function.BiFunction;
+
 final class TokenSplitter implements BiFunction<String, String, IList<String>> {
 	private String tokenToSplit;
 
@@ -15,16 +15,13 @@ final class TokenSplitter implements BiFunction<String, String, IList<String>> {
 
 	@Override
 	public IList<String> apply(String operatorName, String operatorRegex) {
-		if (operatorName == null) {
+		if(operatorName == null)
 			throw new NullPointerException("Operator name must not be null");
-		} else if (operatorRegex == null) {
-			throw new NullPointerException("Operator regex must not be null");
-		}
+		else if(operatorRegex == null) throw new NullPointerException("Operator regex must not be null");
 
-		if (tokenToSplit.contains(operatorName)) {
-			if (StringUtils.containsOnly(tokenToSplit, operatorRegex)) {
+		if(tokenToSplit.contains(operatorName)) {
+			if(StringUtils.containsOnly(tokenToSplit, operatorRegex))
 				return new FunctionalList<>(tokenToSplit);
-			}
 
 			IList<String> splitTokens = new FunctionalList<>(tokenToSplit.split(operatorRegex));
 			IList<String> result = new FunctionalList<>();
@@ -34,10 +31,10 @@ final class TokenSplitter implements BiFunction<String, String, IList<String>> {
 
 			String elm = itr.next();
 
-			for (int i = 0; itr.hasNext(); elm = itr.next()) {
+			for(int i = 0; itr.hasNext(); elm = itr.next()) {
 				result.add(elm);
 
-				if (i != tokenExpansionSize) {
+				if(i != tokenExpansionSize) {
 					result.add(operatorName);
 				}
 			}
-- 
cgit v1.2.3