1 files changed, 45 insertions, 0 deletions
diff --git a/base/src/main/java/bjc/utils/ioutils/format/GeneralNumberDirective.java b/base/src/main/java/bjc/utils/ioutils/format/GeneralNumberDirective.java
new file mode 100644
index 0000000..6a90f94
--- /dev/null
+++ b/base/src/main/java/bjc/utils/ioutils/format/GeneralNumberDirective.java
@@ -0,0 +1,45 @@
+package bjc.utils.ioutils.format;
+
+import bjc.utils.math.NumberUtils;
+
+abstract class GeneralNumberDirective implements Directive {
+	protected static void handleNumberDirective(StringBuffer buff, CLModifiers mods, CLParameters params,
+			int argidx, long val, int radix) {
+		/*
+		 * Initialize the two padding related parameters, and then fill
+		 * them in from the directive parameters if they are present.
+		 */
+		int mincol = 0;
+		char padchar = ' ';
+		if(params.length() > (argidx + 2)) {
+			mincol = params.getIntDefault(argidx + 1, "minimum column count", 'R', 0);
+		}
+		if(params.length() > (argidx + 3)) {
+			padchar = params.getCharDefault(argidx + 2, "padding character", 'R', ' ');
+		}
+
+		String res;
+
+		if(mods.colonMod) {
+			/*
+			 * We're doing commas, so check if the two comma-related
+			 * parameters were supplied.
+			 */
+			int commaInterval = 0;
+			char commaChar = ',';
+			if(params.length() > (argidx + 3)) {
+				commaChar = params.getCharDefault((argidx + 3), "comma character", 'R', ' ');
+			}
+			if(params.length() > (argidx + 4)) {
+				commaInterval = params.getIntDefault((argidx + 4), "comma interval", 'R', 0);
+			}
+
+			res = NumberUtils.toCommaString(val, mincol, padchar, commaInterval, commaChar, mods.atMod,
+					radix);
+		} else {
+			res = NumberUtils.toNormalString(val, mincol, padchar, mods.atMod, radix);
+		}
+
+		buff.append(res);
+	}
+}