Remove dead code, from before compilation

3 files changed, 0 insertions, 104 deletions

diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java
index 4c8cdab..444e6df 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java
@@ -20,23 +20,6 @@ public class FreshlineDirective implements Directive {
 		edt.format(dirParams.toFormatCTX());
 	}
 
-	public void formatF(FormatParameters dirParams) throws IOException {
-		int nTimes = 1;
-
-		CLParameters params = dirParams.getParams();
-
-		if(params.length() >= 1) {
-			params.mapIndices("count");
-			nTimes = params.getInt(dirParams.tParams, "count", "occurance count", "&", 1);
-		}
-
-		if(dirParams.rw.isLastCharNL()) nTimes -= 1;
-
-		for(int i = 0; i < nTimes; i++) {
-			dirParams.rw.write("\n");
-		}
-	}
-
 	@Override
 	public Edict compile(CompileContext compCTX) {
 		CLParameters params = compCTX.decr.parameters;
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java
index 6685346..a6df0d7 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java
@@ -44,55 +44,6 @@ public abstract class GeneralNumberDirective implements Directive {
 		public CLValue commaChar     = CLValue.nil();
 	}
 
-	protected static void handleNumberDirective(Tape<Object> itemTape, ReportWriter rw, Decree decr, int argidx,
-			long val, int radix) throws IOException {
-
-		CLParameters params = decr.parameters;
-		CLModifiers mods = decr.modifiers;
-
-		/*
-		 * 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)) {
-			params.mapIndex("mincol", argidx + 1);
-			mincol = params.getInt(itemTape, "mincol", "minimum column count", "R", 0);
-		}
-
-		if (params.length() >= (argidx + 3)) {
-			params.mapIndex("padchar", argidx + 2);
-			padchar = params.getChar(itemTape, "padchar", "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 + 4)) {
-				params.mapIndex("cchar", argidx + 3);
-				commaChar = params.getChar(itemTape, "cchar", "comma character", "R", ',');
-			}
-			if (params.length() >= (argidx + 5)) {
-				params.mapIndex("cinterval", argidx + 4);
-				commaInterval = params.getInt(itemTape, "cinterval", "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);
-		}
-
-		rw.write(res);
-	}
-
 	protected NumberParams getParams(CompileContext compCTX, int argidx) {
 		CLParameters params = compCTX.decr.parameters;
 		CLModifiers mods    = compCTX.decr.modifiers;
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java
index 698c4ac..b6f8e1f 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java
@@ -24,44 +24,6 @@ public class RadixDirective extends GeneralNumberDirective {
 		edt.format(dirParams.toFormatCTX());
 	}
 
-	public void formatF(FormatParameters dirParams) throws IOException {
-		CLFormatter.checkItem(dirParams.item, 'R');
-
-		if (!(dirParams.item instanceof Number)) {
-			throw new IllegalFormatConversionException('R', dirParams.item.getClass());
-		}
-
-		/*
-		 * @TODO see if this is the way we want to do this.
-		 */
-		long val = ((Number) dirParams.item).longValue();
-
-		CLParameters params = dirParams.getParams();
-		CLModifiers mods = dirParams.getMods();
-
-		if (params.length() == 0) {
-			if (mods.atMod) {
-				dirParams.rw.write(NumberUtils.toRoman(val,mods.colonMod));
-			} else if (mods.colonMod) {
-				dirParams.rw.write(NumberUtils.toOrdinal(val));
-			} else {
-				dirParams.rw.write(NumberUtils.toCardinal(val));
-			}
-		} else {
-			if (params.length() < 1)
-				throw new IllegalArgumentException("R directive requires at least one parameter, the radix");
-
-			params.mapIndex("radix", 0);
-
-			int radix = params.getInt(dirParams.tParams, "radix", "radix", "R", 10);
-
-			handleNumberDirective(dirParams.tParams, dirParams.rw,
-					dirParams.decr, 0, val, radix);
-		}
-
-		dirParams.tParams.right();
-	}
-
 	@Override
 	public Edict compile(CompileContext compCTX) {
 		CLParameters params = compCTX.decr.parameters;