From f4baa925b0b5590bc8b12ba5f32e0218384c8efc Mon Sep 17 00:00:00 2001 From: bjculkin Date: Fri, 7 Apr 2017 16:06:18 -0400 Subject: Add simple toggle values --- .../src/main/java/bjc/utils/parserutils/TokenUtils.java | 15 +++++++++++++++ .../utils/parserutils/splitter/SimpleTokenSplitter.java | 5 +---- .../bjc/utils/parserutils/splitter/TokenSplitter.java | 1 + .../bjc/utils/parserutils/splitter/TwoLevelSplitter.java | 1 + 4 files changed, 18 insertions(+), 4 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/parserutils') diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenUtils.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenUtils.java index 1d31522..39e0c4e 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenUtils.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenUtils.java @@ -1,5 +1,9 @@ package bjc.utils.parserutils; +import bjc.utils.funcdata.FunctionalList; +import bjc.utils.funcdata.IList; +import bjc.utils.parserutils.splitterv2.TokenSplitter; + import java.util.LinkedList; import java.util.List; import java.util.regex.Matcher; @@ -17,6 +21,17 @@ import static bjc.utils.PropertyDB.applyFormat; * TODO add support for user defined escapes. */ public class TokenUtils { + /** + * @author EVE + * + */ + public static class StringTokenSplitter implements TokenSplitter { + @Override + public IList split(String input) { + return new FunctionalList<>(TokenUtils.removeDQuotedStrings(input)); + } + } + /* * Patterns and pattern parts. */ diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitter/SimpleTokenSplitter.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitter/SimpleTokenSplitter.java index 170c619..ccc823d 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitter/SimpleTokenSplitter.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitter/SimpleTokenSplitter.java @@ -1,7 +1,5 @@ package bjc.utils.parserutils.splitter; -import bjc.utils.ioutils.RegexStringEditor; - import java.util.HashSet; import java.util.Set; import java.util.regex.Pattern; @@ -10,9 +8,8 @@ import java.util.regex.Pattern; * Simple implementation of {@link TokenSplitter} * * @author EVE - * - * TODO rewrite using {@link RegexStringEditor} */ +@Deprecated public class SimpleTokenSplitter implements TokenSplitter { /* * This string is a format template for the delimiter matching regex diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitter/TokenSplitter.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitter/TokenSplitter.java index e59d88e..04551a7 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitter/TokenSplitter.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitter/TokenSplitter.java @@ -5,6 +5,7 @@ package bjc.utils.parserutils.splitter; * * @author Ben Culkin */ +@Deprecated public interface TokenSplitter { /** * Split a provided string using configured delimiters, and keeping the diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitter/TwoLevelSplitter.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitter/TwoLevelSplitter.java index d65b06a..1d6d0a2 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitter/TwoLevelSplitter.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitter/TwoLevelSplitter.java @@ -18,6 +18,7 @@ import java.util.regex.Pattern; * @author EVE * */ +@Deprecated public class TwoLevelSplitter implements TokenSplitter { private SimpleTokenSplitter high; private SimpleTokenSplitter low; -- cgit v1.2.3