Fix subgroups.

This fixes subgroups, by mostly rewriting the way the delimiter works.

1 files changed, 7 insertions, 1 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenSplitter.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenSplitter.java
index ec69ade..db2c288 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenSplitter.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenSplitter.java
@@ -104,6 +104,8 @@ public class TokenSplitter {
 	 */
 	public void addDelimiter(String... delims) {
 		for(String delim : delims) {
+			if(delim == null) throw new NullPointerException("Delim must not be null");
+			
 			String quoteDelim = Pattern.quote(delim);
 			String delimPat = String.format(WITH_DELIM, quoteDelim);
 
@@ -133,6 +135,8 @@ public class TokenSplitter {
 	 */
 	public void addMultiDelimiter(String... delims) {
 		for(String delim : delims) {
+			if(delim == null) throw new NullPointerException("Delim must not be null");
+			
 			String delimPat = String.format(WITH_MULTI_DELIM, "(?:" + delim + ")");
 
 			if(currPatt == null) {
@@ -154,11 +158,13 @@ public class TokenSplitter {
 	/**
 	 * Marks strings matching the pattern delim as non-splittable.
 	 *
-	 * @param delimSet
+	 * @param delims
 	 *                The regex to not splitting matching strings.
 	 */
 	public void addNonMatcher(String... delims) {
 		for(String delim : delims) {
+			if(delim == null) throw new NullPointerException("Delim must not be null");
+			
 			if(currPatt == null) {
 				currPatt = new StringBuilder();
 				currExclusionPatt = new StringBuilder();