diff options
32 files changed, 110 insertions, 98 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. diff --git a/base/src/test/java/bjc/utils/cli/objects/CommandTest.java b/base/src/test/java/bjc/utils/cli/objects/CommandTest.java index a38940a..2bebaa9 100644 --- a/base/src/test/java/bjc/utils/cli/objects/CommandTest.java +++ b/base/src/test/java/bjc/utils/cli/objects/CommandTest.java @@ -1,6 +1,6 @@ package bjc.utils.cli.objects; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; diff --git a/base/src/test/java/bjc/utils/data/BooleanToggleTest.java b/base/src/test/java/bjc/utils/data/BooleanToggleTest.java index f2b4994..66f44c0 100644 --- a/base/src/test/java/bjc/utils/data/BooleanToggleTest.java +++ b/base/src/test/java/bjc/utils/data/BooleanToggleTest.java @@ -1,6 +1,6 @@ package bjc.utils.data; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; diff --git a/base/src/test/java/bjc/utils/data/CircularIteratorTest.java b/base/src/test/java/bjc/utils/data/CircularIteratorTest.java index f91feda..a809887 100644 --- a/base/src/test/java/bjc/utils/data/CircularIteratorTest.java +++ b/base/src/test/java/bjc/utils/data/CircularIteratorTest.java @@ -1,6 +1,6 @@ package bjc.utils.data; -import static bjc.utils.funcutils.TestUtils.*; +import static bjc.utils.funcutils.TestUtils.assertIteratorEquals; import java.util.Arrays; import java.util.List; diff --git a/base/src/test/java/bjc/utils/ioutils/LevelSplitterTest.java b/base/src/test/java/bjc/utils/ioutils/LevelSplitterTest.java index 30ec919..cc86df4 100644 --- a/base/src/test/java/bjc/utils/ioutils/LevelSplitterTest.java +++ b/base/src/test/java/bjc/utils/ioutils/LevelSplitterTest.java @@ -1,13 +1,9 @@ package bjc.utils.ioutils; -import static org.junit.Assert.*; - -import java.util.Arrays; -import java.util.List; +import static bjc.utils.funcutils.TestUtils.assertListEquals; +import static bjc.utils.ioutils.LevelSplitterTest.RXPair.pair; import org.junit.Test; -import static bjc.utils.funcutils.TestUtils.*; -import static bjc.utils.ioutils.LevelSplitterTest.RXPair.pair; /** * Test of LevelSplitter. diff --git a/base/src/test/java/bjc/utils/ioutils/ReportWriterTest.java b/base/src/test/java/bjc/utils/ioutils/ReportWriterTest.java index 2092ae0..a9f7072 100644 --- a/base/src/test/java/bjc/utils/ioutils/ReportWriterTest.java +++ b/base/src/test/java/bjc/utils/ioutils/ReportWriterTest.java @@ -1,12 +1,10 @@ package bjc.utils.ioutils; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.io.IOException; import java.io.StringWriter; -import bjc.utils.ioutils.ReportWriter; - import org.junit.Test; /** diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java index 9c79ec5..f330e42 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java @@ -1,22 +1,35 @@ package bjc.utils.ioutils.format; -import bjc.utils.esodata.SingleTape; -import bjc.utils.esodata.Tape; -import bjc.utils.ioutils.ReportWriter; -import bjc.utils.ioutils.SimpleProperties; -import bjc.utils.ioutils.format.directives.*; - -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.StringWriter; import java.io.Writer; - import java.util.HashMap; import java.util.Map; -import java.util.UnknownFormatConversionException; import java.util.regex.Matcher; import java.util.regex.Pattern; +import bjc.utils.esodata.SingleTape; +import bjc.utils.esodata.Tape; +import bjc.utils.ioutils.ReportWriter; +import bjc.utils.ioutils.SimpleProperties; +import bjc.utils.ioutils.format.directives.AestheticDirective; +import bjc.utils.ioutils.format.directives.CaseDirective; +import bjc.utils.ioutils.format.directives.CharacterDirective; +import bjc.utils.ioutils.format.directives.ConditionalDirective; +import bjc.utils.ioutils.format.directives.Directive; +import bjc.utils.ioutils.format.directives.EscapeDirective; +import bjc.utils.ioutils.format.directives.FormatParameters; +import bjc.utils.ioutils.format.directives.FreshlineDirective; +import bjc.utils.ioutils.format.directives.GotoDirective; +import bjc.utils.ioutils.format.directives.InflectDirective; +import bjc.utils.ioutils.format.directives.IterationDirective; +import bjc.utils.ioutils.format.directives.LiteralDirective; +import bjc.utils.ioutils.format.directives.NumberDirective; +import bjc.utils.ioutils.format.directives.RadixDirective; +import bjc.utils.ioutils.format.directives.RecursiveDirective; +import bjc.utils.ioutils.format.directives.TabulateDirective; + /** * An implementation of CL's FORMAT. * @@ -190,7 +203,6 @@ public class CLFormatter { * The format string to use. * @param params * The parameters for the string. - * @return The formatted string. */ public void formatString(Writer target, String format, Iterable<Object> params) throws IOException { ReportWriter rw = new ReportWriter(target); @@ -209,10 +221,12 @@ public class CLFormatter { * * @param format * The format to use. - * @param sb + * @param rw * The buffer to file output into. * @param tParams * The parameters to use. + * @param isToplevel Whether or not this is a top-level format + * @throws IOException If something goes wrong */ public void doFormatString(String format, ReportWriter rw, Tape<Object> tParams, boolean isToplevel) throws IOException { Matcher dirMatcher = pFormatDirective.matcher(format); diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java index 0135129..a21fd37 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java @@ -1,17 +1,12 @@ package bjc.utils.ioutils.format.directives; -import bjc.utils.ioutils.format.*; -import bjc.utils.ioutils.ReportWriter; - import java.io.IOException; import java.io.StringWriter; -import java.util.ArrayList; -import java.util.IllegalFormatConversionException; -import java.util.List; -import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; +import bjc.utils.ioutils.ReportWriter; + public class CaseDirective implements Directive { private static final Pattern wordPattern = Pattern.compile("(\\w+)(\\b*)"); diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java index 1a2d196..d9ea3da 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java @@ -1,10 +1,10 @@ package bjc.utils.ioutils.format.directives; -import bjc.utils.ioutils.format.CLFormatter; - import java.io.IOException; import java.util.IllegalFormatConversionException; +import bjc.utils.ioutils.format.CLFormatter; + /** * Implements the C directive. * diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java index 8b952ec..d660248 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java @@ -1,13 +1,13 @@ package bjc.utils.ioutils.format.directives; -import bjc.utils.ioutils.format.*; - import java.io.IOException; import java.util.ArrayList; import java.util.IllegalFormatConversionException; import java.util.List; import java.util.logging.Logger; +import bjc.utils.ioutils.format.EscapeException; + /** * Implements the [ directive. * diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java index ab66752..73e2454 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java @@ -12,12 +12,17 @@ import java.io.IOException; public interface Directive { /** * Execute this format directive. - * @param dirParams TODO - * @param sb - * The buffer the string is being output to. + * @param dirParams + * The parameters for the directive. + * @throws IOException If something goes wrong. */ public void format(FormatParameters dirParams) throws IOException; + /** + * Check if a particular directive is an opening directive. + * @param str The directive to check. + * @return Whether or not the directive is opening. + */ public static boolean isOpening(String str) { switch(str) { case "(": @@ -31,6 +36,11 @@ public interface Directive { } } + /** + * Check if a particular directive is an opening directive. + * @param str The directive to check. + * @return Whether or not the directive is opening. + */ public static boolean isClosing(String str) { switch(str) { case ")": @@ -50,4 +60,4 @@ public interface Directive { // stuff that Iteration/Conditional/CaseDirective do. // // The main issue is thinking of a good interface to it. -} +}
\ No newline at end of file diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java index ee86a33..1d0ecdc 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java @@ -1,12 +1,12 @@ package bjc.utils.ioutils.format.directives; +import java.io.IOException; + +import bjc.utils.ioutils.ReportWriter; import bjc.utils.ioutils.format.CLModifiers; import bjc.utils.ioutils.format.CLParameters; -import bjc.utils.ioutils.ReportWriter; import bjc.utils.math.NumberUtils; -import java.io.IOException; - /** * Implementation skeleton for number directives. * diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java index 48de9b3..2fe3903 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java @@ -1,17 +1,12 @@ package bjc.utils.ioutils.format.directives; -import bjc.inflexion.InflectionML; -import bjc.utils.ioutils.format.*; -import bjc.utils.ioutils.ReportWriter; - import java.io.IOException; import java.io.StringWriter; -import java.util.ArrayList; -import java.util.IllegalFormatConversionException; -import java.util.List; -import java.util.logging.Logger; import java.util.regex.Pattern; +import bjc.inflexion.InflectionML; +import bjc.utils.ioutils.ReportWriter; + public class InflectDirective implements Directive { private static final Pattern wordPattern = Pattern.compile("(\\w+)(\\b*)"); diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java index c5e0fa0..2a702ea 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java @@ -1,14 +1,14 @@ package bjc.utils.ioutils.format.directives; -import bjc.utils.esodata.SingleTape; -import bjc.utils.esodata.Tape; -import bjc.utils.ioutils.format.*; - import java.io.IOException; - +import java.util.IllegalFormatConversionException; import java.util.Iterator; -import java.util.IllegalFormatConversionException; +import bjc.utils.esodata.SingleTape; +import bjc.utils.esodata.Tape; +import bjc.utils.ioutils.format.CLFormatter; +import bjc.utils.ioutils.format.CLParameters; +import bjc.utils.ioutils.format.EscapeException; /** * Implements the { directive. diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java index b75154e..4696c60 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java @@ -1,12 +1,12 @@ package bjc.utils.ioutils.format.directives; +import java.io.IOException; +import java.util.IllegalFormatConversionException; + import bjc.utils.ioutils.format.CLFormatter; import bjc.utils.ioutils.format.CLParameters; import bjc.utils.math.NumberUtils; -import java.io.IOException; -import java.util.IllegalFormatConversionException; - /** * Generalized radix directive. * diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java index dddae77..d4dcbb2 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java @@ -1,12 +1,12 @@ package bjc.utils.ioutils.format.directives; -import bjc.utils.esodata.SingleTape; -import bjc.utils.esodata.Tape; -import bjc.utils.ioutils.format.*; - +import java.io.IOException; import java.util.IllegalFormatConversionException; -import java.io.IOException; +import bjc.utils.esodata.SingleTape; +import bjc.utils.esodata.Tape; +import bjc.utils.ioutils.format.CLFormatter; +import bjc.utils.ioutils.format.EscapeException; public class RecursiveDirective implements Directive { public void format(FormatParameters dirParams) throws IOException { diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java index eb8aa4f..d0bd55b 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java @@ -2,7 +2,7 @@ package bjc.utils.ioutils.format.directives; import java.io.IOException; -import bjc.utils.ioutils.format.*; +import bjc.utils.ioutils.format.CLParameters; public class TabulateDirective implements Directive { public void format(FormatParameters dirParams) throws IOException { diff --git a/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java b/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java index 08dfe78..b14a6b3 100644 --- a/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java +++ b/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java @@ -1,16 +1,13 @@ package bjc.utils.test.ioutils; -import static org.junit.Assert.*; +import static java.util.Arrays.asList; +import static org.junit.Assert.assertEquals; import java.io.IOException; -import java.util.Arrays; - -import bjc.utils.ioutils.format.CLFormatter; - import org.junit.Test; -import static java.util.Arrays.asList; +import bjc.utils.ioutils.format.CLFormatter; /** * Tests for CL format strings. * |