Bugfix - let PipeController set modes

The command design is still terrible

diff --git a/src/kaka/cakelight/Commands.java b/src/kaka/cakelight/Commands.java
index 825ebe32872fd6afcf820f18a9ba6eef5ade4fab..9a2be3bdfdab2cf75f3ec086ad97868f4c9f25d7 100644 (file)
--- a/src/kaka/cakelight/Commands.java
+++ b/src/kaka/cakelight/Commands.java
@@ -59,7 +59,7 @@ class Commands {
 
     static Console.Command push() {
         return command(new String[] {"push"}, (console, args) -> {
-            Object obj = console.handleInput(String.join(" ", args));
+            Object obj = console.internalHandleInput(String.join(" ", args));
            if (obj instanceof Mode) { // obj could be anything, which should be fixed
                console.out("pushing mode " + obj.getClass().getSimpleName());
                console.getCakelight().pushMode((Mode) obj);

diff --git a/src/kaka/cakelight/Console.java b/src/kaka/cakelight/Console.java
index 5dfe091e8935ec6a6f95238acc3c03564374afa4..89acbbd1e876f81115556e70ccb7de5274b16d91 100644 (file)
--- a/src/kaka/cakelight/Console.java
+++ b/src/kaka/cakelight/Console.java
@@ -75,21 +75,21 @@ public class Console extends Thread {
            while (running) {
                System.out.print("> ");
                String input = reader.readLine();
-               internalHandleInput(input);
+               handleInput(input);
            }
        } catch (IOException e) {
            System.out.println("Error reading from command line");
        }
     }
 
-    private void internalHandleInput(String input) {
-       Object obj = handleInput(input);
+    void handleInput(String input) {
+       Object obj = internalHandleInput(input);
        if (obj instanceof Mode) {
            cakelight.setMode((Mode) obj);
        }
     }
 
-    Object handleInput(String input) {
+    Object internalHandleInput(String input) {
        String[] splitInput = input.split("\\s+", 2);
        String name = splitInput[0];
        String[] args = splitInput.length == 2