1 files changed, 34 insertions, 46 deletions
diff --git a/base/src/main/java/bjc/utils/ioutils/format/NumberDirective.java b/base/src/main/java/bjc/utils/ioutils/format/NumberDirective.java
index d5d4b29..28e61ea 100644
--- a/base/src/main/java/bjc/utils/ioutils/format/NumberDirective.java
+++ b/base/src/main/java/bjc/utils/ioutils/format/NumberDirective.java
@@ -1,46 +1,34 @@
-package bjc.utils.ioutils.format;
-
-import java.util.regex.Matcher;
-
-import bjc.utils.esodata.Tape;
-import bjc.utils.ioutils.NumberUtils;
-
-public class NumberDirective implements Directive {
-
-	@Override
-	public void format(StringBuffer sb, Object item, CLModifiers mods, CLParameters params, Tape<Object> tParams,
-			Matcher dirMatcher) {
-		/*
-		 * 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', ' ');
-		}
-
-		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);
-			}
-
-			NumberUtils.toCommaString(val, mincol, padchar, commaInterval, commaChar, mods.atMod, radix);
-		} else {
-			NumberUtils.toNormalString(val, mincol, padchar, mods.atMod, radix);
-		}
-	}
-
-}
+package bjc.utils.ioutils.format;
+
+import java.util.IllegalFormatConversionException;
+import java.util.regex.Matcher;
+
+import bjc.utils.esodata.Tape;
+
+class NumberDirective extends GeneralNumberDirective {
+
+	public NumberDirective(int argidx, int radix) {
+		this.argidx = argidx;
+		this.radix = radix;
+	}
+
+	private int	argidx;
+	private int	radix;
+
+	@Override
+	public void format(StringBuffer sb, Object item, CLModifiers mods, CLParameters params, Tape<Object> tParams,
+			Matcher dirMatcher, CLFormatter fmt) {
+		CLFormatter.checkItem(item, 'B');
+
+		if(!(item instanceof Number)) {
+			throw new IllegalFormatConversionException('B', item.getClass());
+		}
+
+		long val = ((Number) item).longValue();
+
+		handleNumberDirective(sb, mods, params, argidx, val, radix);
+
+		tParams.right();
+	}
+
+}