diff options
Diffstat (limited to 'base/src/main/java/bjc/utils')
15 files changed, 35 insertions, 28 deletions
diff --git a/base/src/main/java/bjc/utils/cli/objects/BlockReaderCLI.java b/base/src/main/java/bjc/utils/cli/objects/BlockReaderCLI.java index bf8fc11..93d55d8 100644 --- a/base/src/main/java/bjc/utils/cli/objects/BlockReaderCLI.java +++ b/base/src/main/java/bjc/utils/cli/objects/BlockReaderCLI.java @@ -1,8 +1,12 @@ package bjc.utils.cli.objects; +import static bjc.utils.cli.objects.Command.CommandStatus.ERROR; +import static bjc.utils.cli.objects.Command.CommandStatus.FAIL; +import static bjc.utils.cli.objects.Command.CommandStatus.FINISH; +import static bjc.utils.cli.objects.Command.CommandStatus.SUCCESS; + import java.io.InputStreamReader; import java.io.Reader; - import java.util.HashMap; import java.util.Map; import java.util.Scanner; @@ -12,10 +16,15 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import bjc.utils.ioutils.blocks.*; - -import static bjc.utils.cli.objects.Command.CommandStatus; -import static bjc.utils.cli.objects.Command.CommandStatus.*; +import bjc.utils.cli.objects.Command.CommandStatus; +import bjc.utils.ioutils.blocks.Block; +import bjc.utils.ioutils.blocks.BlockReader; +import bjc.utils.ioutils.blocks.FilteredBlockReader; +import bjc.utils.ioutils.blocks.LayeredBlockReader; +import bjc.utils.ioutils.blocks.PushbackBlockReader; +import bjc.utils.ioutils.blocks.SerialBlockReader; +import bjc.utils.ioutils.blocks.SimpleBlockReader; +import bjc.utils.ioutils.blocks.ToggledBlockReader; /** * Command-line interface for configuring block readers. diff --git a/base/src/main/java/bjc/utils/cli/objects/DefineCLI.java b/base/src/main/java/bjc/utils/cli/objects/DefineCLI.java index c2a5a1a..fc6e04a 100644 --- a/base/src/main/java/bjc/utils/cli/objects/DefineCLI.java +++ b/base/src/main/java/bjc/utils/cli/objects/DefineCLI.java @@ -1,6 +1,7 @@ package bjc.utils.cli.objects; -import bjc.utils.funcutils.StringUtils; +import static bjc.utils.cli.objects.Command.CommandStatus.FAIL; +import static bjc.utils.cli.objects.Command.CommandStatus.SUCCESS; import java.util.ArrayList; import java.util.HashMap; @@ -12,8 +13,8 @@ import java.util.function.UnaryOperator; import java.util.logging.Logger; import java.util.regex.Pattern; -import static bjc.utils.cli.objects.Command.CommandStatus; -import static bjc.utils.cli.objects.Command.CommandStatus.*; +import bjc.utils.cli.objects.Command.CommandStatus; +import bjc.utils.funcutils.StringUtils; /* * @TODO 10/09/17 :DefineCLIFinish diff --git a/base/src/main/java/bjc/utils/cli/objects/DelimSplitterCLI.java b/base/src/main/java/bjc/utils/cli/objects/DelimSplitterCLI.java index 9bf6ee6..8ddad15 100644 --- a/base/src/main/java/bjc/utils/cli/objects/DelimSplitterCLI.java +++ b/base/src/main/java/bjc/utils/cli/objects/DelimSplitterCLI.java @@ -15,7 +15,12 @@ import bjc.utils.funcdata.FunctionalList; import bjc.utils.funcdata.IList; import bjc.utils.funcutils.StringUtils; import bjc.utils.ioutils.MirrorDB; -import bjc.utils.parserutils.delims.*; +import bjc.utils.parserutils.delims.DelimiterException; +import bjc.utils.parserutils.delims.DelimiterGroup; +import bjc.utils.parserutils.delims.RegexCloser; +import bjc.utils.parserutils.delims.RegexOpener; +import bjc.utils.parserutils.delims.SequenceDelimiter; +import bjc.utils.parserutils.delims.StringDelimiter; import bjc.utils.parserutils.splitter.ConfigurableTokenSplitter; /** diff --git a/base/src/main/java/bjc/utils/components/ComponentDescriptionFileParser.java b/base/src/main/java/bjc/utils/components/ComponentDescriptionFileParser.java index 31ae7d0..ee6e913 100644 --- a/base/src/main/java/bjc/utils/components/ComponentDescriptionFileParser.java +++ b/base/src/main/java/bjc/utils/components/ComponentDescriptionFileParser.java @@ -1,12 +1,12 @@ package bjc.utils.components; +import static bjc.utils.ioutils.RuleBasedReaderPragmas.buildInteger; +import static bjc.utils.ioutils.RuleBasedReaderPragmas.buildStringCollapser; + import java.io.InputStream; import bjc.utils.ioutils.RuleBasedConfigReader; -import static bjc.utils.ioutils.RuleBasedReaderPragmas.buildInteger; -import static bjc.utils.ioutils.RuleBasedReaderPragmas.buildStringCollapser; - /** * Read a component description from a file. * diff --git a/base/src/main/java/bjc/utils/funcutils/ListUtils.java b/base/src/main/java/bjc/utils/funcutils/ListUtils.java index b99c8a0..c064b2f 100644 --- a/base/src/main/java/bjc/utils/funcutils/ListUtils.java +++ b/base/src/main/java/bjc/utils/funcutils/ListUtils.java @@ -2,8 +2,8 @@ package bjc.utils.funcutils; import java.util.ArrayList; import java.util.Iterator; -import java.util.List; import java.util.LinkedList; +import java.util.List; import java.util.function.Function; import java.util.function.Supplier; diff --git a/base/src/main/java/bjc/utils/funcutils/StringUtils.java b/base/src/main/java/bjc/utils/funcutils/StringUtils.java index 5d191bc..7bcbacd 100644 --- a/base/src/main/java/bjc/utils/funcutils/StringUtils.java +++ b/base/src/main/java/bjc/utils/funcutils/StringUtils.java @@ -6,11 +6,11 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.ibm.icu.text.BreakIterator; + import bjc.utils.data.BooleanToggle; import bjc.utils.parserutils.TokenUtils; -import com.ibm.icu.text.BreakIterator; - /** * Utility methods for operations on strings. * diff --git a/base/src/main/java/bjc/utils/funcutils/TestUtils.java b/base/src/main/java/bjc/utils/funcutils/TestUtils.java index 0fd7ea8..048ab5e 100644 --- a/base/src/main/java/bjc/utils/funcutils/TestUtils.java +++ b/base/src/main/java/bjc/utils/funcutils/TestUtils.java @@ -1,7 +1,6 @@ package bjc.utils.funcutils; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import java.util.Iterator; import java.util.List; diff --git a/base/src/main/java/bjc/utils/ioutils/LevelSplitter.java b/base/src/main/java/bjc/utils/ioutils/LevelSplitter.java index 5d24661..e66ac75 100644 --- a/base/src/main/java/bjc/utils/ioutils/LevelSplitter.java +++ b/base/src/main/java/bjc/utils/ioutils/LevelSplitter.java @@ -1,8 +1,6 @@ package bjc.utils.ioutils; import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/base/src/main/java/bjc/utils/ioutils/blocks/BoundBlockReader.java b/base/src/main/java/bjc/utils/ioutils/blocks/BoundBlockReader.java index 7d08c7e..ba2c7ab 100644 --- a/base/src/main/java/bjc/utils/ioutils/blocks/BoundBlockReader.java +++ b/base/src/main/java/bjc/utils/ioutils/blocks/BoundBlockReader.java @@ -1,7 +1,6 @@ package bjc.utils.ioutils.blocks; import java.io.IOException; - import java.util.function.BooleanSupplier; import java.util.function.Supplier; diff --git a/base/src/main/java/bjc/utils/ioutils/blocks/FilteredBlockReader.java b/base/src/main/java/bjc/utils/ioutils/blocks/FilteredBlockReader.java index d4ca439..7a6eddc 100644 --- a/base/src/main/java/bjc/utils/ioutils/blocks/FilteredBlockReader.java +++ b/base/src/main/java/bjc/utils/ioutils/blocks/FilteredBlockReader.java @@ -1,7 +1,6 @@ package bjc.utils.ioutils.blocks; import java.io.IOException; - import java.util.function.Consumer; import java.util.function.Predicate; diff --git a/base/src/main/java/bjc/utils/ioutils/blocks/FlatMappedBlockReader.java b/base/src/main/java/bjc/utils/ioutils/blocks/FlatMappedBlockReader.java index 8636247..9c1bcd5 100644 --- a/base/src/main/java/bjc/utils/ioutils/blocks/FlatMappedBlockReader.java +++ b/base/src/main/java/bjc/utils/ioutils/blocks/FlatMappedBlockReader.java @@ -1,7 +1,6 @@ package bjc.utils.ioutils.blocks; import java.io.IOException; - import java.util.Iterator; import java.util.List; import java.util.function.Function; diff --git a/base/src/main/java/bjc/utils/ioutils/blocks/MappedBlockReader.java b/base/src/main/java/bjc/utils/ioutils/blocks/MappedBlockReader.java index 72da16d..4439da2 100644 --- a/base/src/main/java/bjc/utils/ioutils/blocks/MappedBlockReader.java +++ b/base/src/main/java/bjc/utils/ioutils/blocks/MappedBlockReader.java @@ -1,7 +1,6 @@ package bjc.utils.ioutils.blocks; import java.io.IOException; - import java.util.function.UnaryOperator; /** diff --git a/base/src/main/java/bjc/utils/misc/Direction.java b/base/src/main/java/bjc/utils/misc/Direction.java index 4833f14..a530f47 100644 --- a/base/src/main/java/bjc/utils/misc/Direction.java +++ b/base/src/main/java/bjc/utils/misc/Direction.java @@ -3,12 +3,12 @@ package bjc.utils.misc; import java.util.Random; import java.util.function.Consumer; +import org.apache.commons.lang3.text.WordUtils; + import bjc.utils.exceptions.InvalidDirectionException; import bjc.utils.funcdata.FunctionalList; import bjc.utils.funcdata.IList; -import org.apache.commons.lang3.text.WordUtils; - /** * A set of cardinal directions * diff --git a/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java b/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java index c3733b9..12bc148 100644 --- a/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java +++ b/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java @@ -2,7 +2,6 @@ package bjc.utils.parserutils; import java.util.Deque; import java.util.LinkedList; -import java.util.function.Consumer; import java.util.function.Function; import bjc.utils.funcdata.FunctionalList; diff --git a/base/src/main/java/bjc/utils/parserutils/StringDescaper.java b/base/src/main/java/bjc/utils/parserutils/StringDescaper.java index d6c4f3c..8d5dda4 100644 --- a/base/src/main/java/bjc/utils/parserutils/StringDescaper.java +++ b/base/src/main/java/bjc/utils/parserutils/StringDescaper.java @@ -1,16 +1,16 @@ package bjc.utils.parserutils; +import static bjc.utils.misc.PropertyDB.getRegex; + import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import java.util.function.UnaryOperator; import java.util.logging.Logger; 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; - /** <<<<<<< Updated upstream * Customizable string escapes. |