From d7bae4d2145d8337570fec03974272d49ba5269d Mon Sep 17 00:00:00 2001 From: bjculkin Date: Wed, 25 Apr 2018 15:29:18 -0400 Subject: Add some new classes Import some new classes from an old project --- base/src/main/java/bjc/utils/parserutils/DoubleMatcher.java | 4 ++-- base/src/main/java/bjc/utils/parserutils/StringDescaper.java | 3 +-- base/src/main/java/bjc/utils/parserutils/TokenUtils.java | 6 +++--- .../bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) (limited to 'base/src/main/java/bjc/utils/parserutils') diff --git a/base/src/main/java/bjc/utils/parserutils/DoubleMatcher.java b/base/src/main/java/bjc/utils/parserutils/DoubleMatcher.java index 31966d7..3618c50 100644 --- a/base/src/main/java/bjc/utils/parserutils/DoubleMatcher.java +++ b/base/src/main/java/bjc/utils/parserutils/DoubleMatcher.java @@ -1,7 +1,7 @@ package bjc.utils.parserutils; -import static bjc.utils.PropertyDB.applyFormat; -import static bjc.utils.PropertyDB.getRegex; +import static bjc.utils.misc.PropertyDB.applyFormat; +import static bjc.utils.misc.PropertyDB.getRegex; import java.util.regex.Pattern; diff --git a/base/src/main/java/bjc/utils/parserutils/StringDescaper.java b/base/src/main/java/bjc/utils/parserutils/StringDescaper.java index e8c340a..d6c4f3c 100644 --- a/base/src/main/java/bjc/utils/parserutils/StringDescaper.java +++ b/base/src/main/java/bjc/utils/parserutils/StringDescaper.java @@ -8,10 +8,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import static bjc.utils.misc.PropertyDB.getRegex; import static java.util.Map.Entry; -import static bjc.utils.PropertyDB.getRegex; - /** <<<<<<< Updated upstream * Customizable string escapes. diff --git a/base/src/main/java/bjc/utils/parserutils/TokenUtils.java b/base/src/main/java/bjc/utils/parserutils/TokenUtils.java index 7b159af..c1a68a8 100644 --- a/base/src/main/java/bjc/utils/parserutils/TokenUtils.java +++ b/base/src/main/java/bjc/utils/parserutils/TokenUtils.java @@ -1,8 +1,8 @@ package bjc.utils.parserutils; -import static bjc.utils.PropertyDB.applyFormat; -import static bjc.utils.PropertyDB.getCompiledRegex; -import static bjc.utils.PropertyDB.getRegex; +import static bjc.utils.misc.PropertyDB.applyFormat; +import static bjc.utils.misc.PropertyDB.getCompiledRegex; +import static bjc.utils.misc.PropertyDB.getRegex; import java.util.LinkedList; import java.util.List; diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java index 731c9c6..2a565f2 100644 --- a/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java +++ b/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java @@ -1,6 +1,6 @@ package bjc.utils.parserutils.splitter; -import static bjc.utils.PropertyDB.applyFormat; +import static bjc.utils.misc.PropertyDB.applyFormat; import java.util.LinkedHashSet; import java.util.Set; -- cgit v1.2.3