Continue work on FDS

1 files changed, 3 insertions, 31 deletions

diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/cli/FDSExample.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/cli/FDSExample.java
index f9cf08e..e01e87e 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/cli/FDSExample.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/cli/FDSExample.java
@@ -2,16 +2,10 @@ package bjc.utils.examples.cli;
 
 import java.io.InputStreamReader;
 
-import bjc.utils.cli.fds.FDS;
 import bjc.utils.cli.fds.FDSException;
 import bjc.utils.cli.fds.FDSMode;
-import bjc.utils.cli.fds.FDSState;
+import bjc.utils.cli.fds.FDSUtils;
 import bjc.utils.cli.fds.SimpleFDSMode;
-import bjc.utils.cli.fds.FDSState.InputMode;
-import bjc.utils.ioutils.BlockReader;
-import bjc.utils.ioutils.PushbackBlockReader;
-
-import static bjc.utils.ioutils.BlockReaders.*;
 
 /**
  * Simple example for FDS.
@@ -20,18 +14,11 @@ import static bjc.utils.ioutils.BlockReaders.*;
  *
  */
 public class FDSExample {
-	private static final class Prompter implements Runnable {
-		@Override
-		public void run() {
-			System.out.print("Enter a command (m to exit): ");
-		}
-	}
-
 	/**
 	 * Main method.
 	 * 
 	 * @param args
-	 *            Unused CLI arguments.
+	 *                Unused CLI arguments.
 	 */
 	public static void main(String[] args) {
 		System.out.println("Entering rudimentary FDS");
@@ -43,22 +30,7 @@ public class FDSExample {
 		InputStreamReader reader = new InputStreamReader(System.in);
 
 		try {
-			BlockReader input = simple("\\R", reader);
-
-			Prompter comPrompter = new Prompter();
-			Prompter dataPrompter = new Prompter();
-
-			BlockReader rawComInput = trigger(input, comPrompter);
-			BlockReader rawDataInput = trigger(input, dataPrompter);
-
-			PushbackBlockReader comInput = pushback(rawComInput);
-			PushbackBlockReader dataInput = pushback(rawDataInput);
-
-			FDSState<TestContext> fdsState = new FDSState<>(ctx, InputMode.CHORD, comInput::addBlock,
-					dataInput::addBlock);
-			fdsState.modes.push(testMode);
-
-			FDS.runFDS(comInput, dataInput, System.out, fdsState);
+			FDSUtils.runFromReader(reader, System.out, testMode, ctx);
 		} catch (FDSException fex) {
 			fex.printStackTrace();
 		}