diff options
Diffstat (limited to 'base/src/main/java/bjc/utils/ioutils/format')
8 files changed, 26 insertions, 27 deletions
diff --git a/base/src/main/java/bjc/utils/ioutils/format/AestheticDirective.java b/base/src/main/java/bjc/utils/ioutils/format/AestheticDirective.java index 9cc10d2..16d9d12 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/AestheticDirective.java +++ b/base/src/main/java/bjc/utils/ioutils/format/AestheticDirective.java @@ -10,15 +10,15 @@ class AestheticDirective implements Directive { public void format(StringBuffer sb, Object item, CLModifiers mods, CLParameters params, Tape<Object> tParams, Matcher dirMatcher, CLFormatter fmt) { CLFormatter.checkItem(item, 'A'); - + int mincol = 0, colinc = 1, minpad = 0; char padchar = ' '; - if (params.length() > 1) { + if(params.length() > 1) { mincol = params.getIntDefault(0, "minimum column count", 'A', 0); } - if (params.length() < 4) { + if(params.length() < 4) { throw new IllegalArgumentException( "Must provide either zero, one or four arguments to A directive"); } @@ -29,13 +29,13 @@ class AestheticDirective implements Directive { StringBuilder work = new StringBuilder(); - if (mods.atMod) { - for (int i = 0; i < minpad; i++) { + if(mods.atMod) { + for(int i = 0; i < minpad; i++) { work.append(padchar); } - for (int i = work.length(); i < mincol; i++) { - for (int k = 0; k < colinc; k++) { + for(int i = work.length(); i < mincol; i++) { + for(int k = 0; k < colinc; k++) { work.append(padchar); } } @@ -43,18 +43,18 @@ class AestheticDirective implements Directive { work.append(item.toString()); - if (!mods.atMod) { - for (int i = 0; i < minpad; i++) { + if(!mods.atMod) { + for(int i = 0; i < minpad; i++) { work.append(padchar); } - for (int i = work.length(); i < mincol; i++) { - for (int k = 0; k < colinc; k++) { + for(int i = work.length(); i < mincol; i++) { + for(int k = 0; k < colinc; k++) { work.append(padchar); } } } - + tParams.right(); } diff --git a/base/src/main/java/bjc/utils/ioutils/format/CLParameters.java b/base/src/main/java/bjc/utils/ioutils/format/CLParameters.java index 5bdcbbf..2588446 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/CLParameters.java +++ b/base/src/main/java/bjc/utils/ioutils/format/CLParameters.java @@ -126,7 +126,7 @@ public class CLParameters { return param.charAt(1); } - + /** * Get an optional integer parameter with a default value. * @@ -148,7 +148,7 @@ public class CLParameters { return def; } - + /** * Get a mandatory integer parameter. * diff --git a/base/src/main/java/bjc/utils/ioutils/format/CharacterDirective.java b/base/src/main/java/bjc/utils/ioutils/format/CharacterDirective.java index 7ff74bb..91ddabe 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/CharacterDirective.java +++ b/base/src/main/java/bjc/utils/ioutils/format/CharacterDirective.java @@ -11,7 +11,7 @@ class CharacterDirective implements Directive { public void format(StringBuffer buff, Object parm, CLModifiers mods, CLParameters arrParams, Tape<Object> tParams, Matcher dirMatcher, CLFormatter fmt) { CLFormatter.checkItem(parm, 'C'); - + if(!(parm instanceof Character)) { throw new IllegalFormatConversionException('C', parm.getClass()); } @@ -27,7 +27,7 @@ class CharacterDirective implements Directive { } else { buff.append(ch); } - + tParams.right(); } diff --git a/base/src/main/java/bjc/utils/ioutils/format/EscapeDirective.java b/base/src/main/java/bjc/utils/ioutils/format/EscapeDirective.java index 4f44479..8db3a86 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/EscapeDirective.java +++ b/base/src/main/java/bjc/utils/ioutils/format/EscapeDirective.java @@ -7,8 +7,8 @@ import java.util.regex.Matcher; class EscapeDirective implements Directive { @Override - public void format(StringBuffer sb, Object item, CLModifiers mods, CLParameters params, Tape<Object> formatParams, - Matcher dirMatcher, CLFormatter fmt) { + public void format(StringBuffer sb, Object item, CLModifiers mods, CLParameters params, + Tape<Object> formatParams, Matcher dirMatcher, CLFormatter fmt) { boolean shouldExit; switch(params.length()) { diff --git a/base/src/main/java/bjc/utils/ioutils/format/GotoDirective.java b/base/src/main/java/bjc/utils/ioutils/format/GotoDirective.java index b09053e..767a77e 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/GotoDirective.java +++ b/base/src/main/java/bjc/utils/ioutils/format/GotoDirective.java @@ -7,8 +7,8 @@ import java.util.regex.Matcher; class GotoDirective implements Directive { @Override - public void format(StringBuffer sb, Object item, CLModifiers mods, CLParameters params, Tape<Object> formatParams, - Matcher dirMatcher, CLFormatter fmt) { + public void format(StringBuffer sb, Object item, CLModifiers mods, CLParameters params, + Tape<Object> formatParams, Matcher dirMatcher, CLFormatter fmt) { if(mods.colonMod) { int num = 1; if(params.length() > 1) { diff --git a/base/src/main/java/bjc/utils/ioutils/format/IterationDirective.java b/base/src/main/java/bjc/utils/ioutils/format/IterationDirective.java index e13cb1c..81ce611 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/IterationDirective.java +++ b/base/src/main/java/bjc/utils/ioutils/format/IterationDirective.java @@ -51,11 +51,11 @@ class IterationDirective implements Directive { } int maxItr = Integer.MAX_VALUE; - + if(arrParams.length() > 0) { maxItr = arrParams.getInt(0, "maximum iterations", '{'); } - + if(mods.atMod && mods.colonMod) { } else if(mods.atMod) { diff --git a/base/src/main/java/bjc/utils/ioutils/format/LiteralDirective.java b/base/src/main/java/bjc/utils/ioutils/format/LiteralDirective.java index 77d26cc..5110a9b 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/LiteralDirective.java +++ b/base/src/main/java/bjc/utils/ioutils/format/LiteralDirective.java @@ -6,15 +6,14 @@ import java.util.regex.Matcher; 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; this.lit = lit; } - @Override public void format(StringBuffer buff, Object item, CLModifiers mods, CLParameters params, Tape<Object> tParams, Matcher dirMatcher, CLFormatter fmt) { diff --git a/base/src/main/java/bjc/utils/ioutils/format/RadixDirective.java b/base/src/main/java/bjc/utils/ioutils/format/RadixDirective.java index 3742582..668a0bd 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/RadixDirective.java +++ b/base/src/main/java/bjc/utils/ioutils/format/RadixDirective.java @@ -12,7 +12,7 @@ class RadixDirective extends GeneralNumberDirective { public void format(StringBuffer buff, Object arg, CLModifiers mods, CLParameters params, Tape<Object> tParams, Matcher dirMatcher, CLFormatter fmt) { CLFormatter.checkItem(arg, 'R'); - + if(!(arg instanceof Number)) { throw new IllegalFormatConversionException('R', arg.getClass()); } @@ -38,7 +38,7 @@ class RadixDirective extends GeneralNumberDirective { handleNumberDirective(buff, mods, params, 0, val, radix); } - + tParams.right(); } } |