summaryrefslogtreecommitdiff
path: root/base/src/main/java/bjc/utils/ioutils/format
diff options
context:
space:
mode:
authorbjculkin <bjculkin@mix.wvu.edu>2018-03-01 14:53:15 -0500
committerbjculkin <bjculkin@mix.wvu.edu>2018-03-01 14:53:15 -0500
commit10beb8e502ec8cbb02162a09da2d826ea2a1b1fc (patch)
tree6f04883aee2b8300c3989067d02f6245f1aee187 /base/src/main/java/bjc/utils/ioutils/format
parentc6fa9c56ee7d339f4b7d49e528bde1b15039e359 (diff)
Format pass
Diffstat (limited to 'base/src/main/java/bjc/utils/ioutils/format')
-rw-r--r--base/src/main/java/bjc/utils/ioutils/format/CLModifiers.java96
-rw-r--r--base/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java12
-rw-r--r--base/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java4
-rw-r--r--base/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java4
4 files changed, 58 insertions, 58 deletions
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,