diff options
Diffstat (limited to 'base/src/main/java/bjc/utils/ioutils')
11 files changed, 73 insertions, 73 deletions
diff --git a/base/src/main/java/bjc/utils/ioutils/Prompter.java b/base/src/main/java/bjc/utils/ioutils/Prompter.java index b318222..f39020d 100644 --- a/base/src/main/java/bjc/utils/ioutils/Prompter.java +++ b/base/src/main/java/bjc/utils/ioutils/Prompter.java @@ -12,8 +12,8 @@ import bjc.utils.ioutils.blocks.TriggeredBlockReader; * */ public final class Prompter implements Runnable { - private String promt; - private final PrintStream printer; + private String promt; + private final PrintStream printer; /** * Create a new prompter using the specified prompt. 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 36e0ac1..7d08c7e 100644 --- a/base/src/main/java/bjc/utils/ioutils/blocks/BoundBlockReader.java +++ b/base/src/main/java/bjc/utils/ioutils/blocks/BoundBlockReader.java @@ -29,9 +29,9 @@ public class BoundBlockReader implements BlockReader { public void close() throws IOException; } - private BooleanSupplier checker; - private Supplier<Block> getter; - private Closer closer; + private BooleanSupplier checker; + private Supplier<Block> getter; + private Closer closer; private Block current; 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 070713d..d4ca439 100644 --- a/base/src/main/java/bjc/utils/ioutils/blocks/FilteredBlockReader.java +++ b/base/src/main/java/bjc/utils/ioutils/blocks/FilteredBlockReader.java @@ -22,8 +22,8 @@ public class FilteredBlockReader implements BlockReader { * * Both have already been checked for the predicate. */ - private Block current; - private Block pending; + private Block current; + private Block pending; /* * Number of blocks that passed the 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 bab463e..8636247 100644 --- a/base/src/main/java/bjc/utils/ioutils/blocks/FlatMappedBlockReader.java +++ b/base/src/main/java/bjc/utils/ioutils/blocks/FlatMappedBlockReader.java @@ -22,8 +22,8 @@ public class FlatMappedBlockReader implements BlockReader { /* * The current block, and any blocks pending from the last source block. */ - private Iterator<Block> pending; - private Block current; + private Iterator<Block> pending; + private Block current; /* * The operator to open blocks with. diff --git a/base/src/main/java/bjc/utils/ioutils/blocks/LayeredBlockReader.java b/base/src/main/java/bjc/utils/ioutils/blocks/LayeredBlockReader.java index af138e7..48c4963 100644 --- a/base/src/main/java/bjc/utils/ioutils/blocks/LayeredBlockReader.java +++ b/base/src/main/java/bjc/utils/ioutils/blocks/LayeredBlockReader.java @@ -17,8 +17,8 @@ public class LayeredBlockReader implements BlockReader { /* * The readers to drain from. */ - private final BlockReader first; - private final BlockReader second; + private final BlockReader first; + private final BlockReader second; /* * The current block number. diff --git a/base/src/main/java/bjc/utils/ioutils/blocks/SimpleBlockReader.java b/base/src/main/java/bjc/utils/ioutils/blocks/SimpleBlockReader.java index 4b7f76b..3814e41 100644 --- a/base/src/main/java/bjc/utils/ioutils/blocks/SimpleBlockReader.java +++ b/base/src/main/java/bjc/utils/ioutils/blocks/SimpleBlockReader.java @@ -31,8 +31,8 @@ public class SimpleBlockReader implements BlockReader { /* * Info about the current block. */ - private int blockNo; - private int lineNo; + private int blockNo; + private int lineNo; /** * Create a new block reader. diff --git a/base/src/main/java/bjc/utils/ioutils/blocks/ToggledBlockReader.java b/base/src/main/java/bjc/utils/ioutils/blocks/ToggledBlockReader.java index 91952fc..73badcd 100644 --- a/base/src/main/java/bjc/utils/ioutils/blocks/ToggledBlockReader.java +++ b/base/src/main/java/bjc/utils/ioutils/blocks/ToggledBlockReader.java @@ -11,8 +11,8 @@ import bjc.utils.data.BooleanToggle; * */ public class ToggledBlockReader implements BlockReader { - private BlockReader leftSource; - private BlockReader rightSource; + private BlockReader leftSource; + private BlockReader rightSource; /* We choose the left source when this is true. */ private BooleanToggle leftToggle; diff --git a/base/src/main/java/bjc/utils/ioutils/format/CLModifiers.java b/base/src/main/java/bjc/utils/ioutils/format/CLModifiers.java index a535697..0625ff8 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/CLModifiers.java +++ b/base/src/main/java/bjc/utils/ioutils/format/CLModifiers.java @@ -1,49 +1,49 @@ -package bjc.utils.ioutils.format;
-
-/**
- * A collection of the modifiers attached to a CL format directive.
- *
- * @author EVE
- *
- */
-public class CLModifiers {
- /**
- * Whether the at mod is on.
- */
- public final boolean atMod;
- /**
- * Whether the colon mod is on.
- */
- public final boolean colonMod;
-
- /**
- * Create a new set of CL modifiers.
- *
- * @param at
- * The state of the at mod.
- * @param colon
- * The state of the colon mod.
- */
- public CLModifiers(boolean at, boolean colon) {
- atMod = at;
- colonMod = colon;
- }
-
- /**
- * Create a set of modifiers from a modifier string.
- *
- * @param modString
- * The string to parse modifiers from.
- * @return A set of modifiers matching the string.
- */
- public static CLModifiers fromString(String modString) {
- boolean atMod = false;
- boolean colonMod = false;
- if(modString != null) {
- atMod = modString.contains("@");
- colonMod = modString.contains(":");
- }
-
- return new CLModifiers(atMod, colonMod);
- }
+package bjc.utils.ioutils.format; + +/** + * A collection of the modifiers attached to a CL format directive. + * + * @author EVE + * + */ +public class CLModifiers { + /** + * Whether the at mod is on. + */ + public final boolean atMod; + /** + * Whether the colon mod is on. + */ + public final boolean colonMod; + + /** + * Create a new set of CL modifiers. + * + * @param at + * The state of the at mod. + * @param colon + * The state of the colon mod. + */ + public CLModifiers(boolean at, boolean colon) { + atMod = at; + colonMod = colon; + } + + /** + * Create a set of modifiers from a modifier string. + * + * @param modString + * The string to parse modifiers from. + * @return A set of modifiers matching the string. + */ + public static CLModifiers fromString(String modString) { + boolean atMod = false; + boolean colonMod = false; + if(modString != null) { + atMod = modString.contains("@"); + colonMod = modString.contains(":"); + } + + return new CLModifiers(atMod, colonMod); + } }
\ No newline at end of file diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java b/base/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java index 52b2e40..de093dd 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java +++ b/base/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java @@ -61,12 +61,12 @@ public class IterationDirective implements Directive { } int numItr = 0; - + if(mods.atMod && mods.colonMod) { do { if(numItr > maxItr) break; numItr += 1; - + if(!(iter instanceof Iterable<?>)) { throw new IllegalFormatConversionException('{', iter.getClass()); } @@ -76,14 +76,14 @@ public class IterationDirective implements Directive { Tape<Object> nParams = new SingleTape<>(nitr); fmt.doFormatString(frmt, sb, nParams); - + iter = tParams.right(); } while(tParams.position() < tParams.size()); } else if(mods.atMod) { while(tParams.position() < tParams.size()) { if(numItr > maxItr) break; numItr += 1; - + fmt.doFormatString(frmt, sb, tParams); } } else if(mods.colonMod) { @@ -97,7 +97,7 @@ public class IterationDirective implements Directive { for(Object obj : itr) { if(numItr > maxItr) break; numItr += 1; - + if(!(obj instanceof Iterable<?>)) { throw new IllegalFormatConversionException('{', obj.getClass()); } @@ -121,7 +121,7 @@ public class IterationDirective implements Directive { while(nParams.position() < nParams.size()) { if(numItr > maxItr) break; numItr += 1; - + fmt.doFormatString(frmt, sb, nParams); } } diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java b/base/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java index ea04781..e77ab35 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java +++ b/base/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java @@ -9,8 +9,8 @@ import java.util.regex.Matcher; public class LiteralDirective implements Directive { - private char directive; - private String lit; + private char directive; + private String lit; public LiteralDirective(String lit, char directive) { this.directive = directive; diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java b/base/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java index 98d6c16..b65e3cd 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java +++ b/base/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java @@ -15,8 +15,8 @@ public class NumberDirective extends GeneralNumberDirective { this.radix = radix; } - private int argidx; - private int radix; + private int argidx; + private int radix; @Override public void format(StringBuffer sb, Object item, CLModifiers mods, CLParameters params, Tape<Object> tParams, |