Dolda2000 GitWeb
/
kaka
/
cakelight.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Push and pop modes
[kaka/cakelight.git]
/
src
/
kaka
/
cakelight
/
Console.java
diff --git
a/src/kaka/cakelight/Console.java
b/src/kaka/cakelight/Console.java
index
3f9bce9
..
5dfe091
100644
(file)
--- a/
src/kaka/cakelight/Console.java
+++ b/
src/kaka/cakelight/Console.java
@@
-1,5
+1,7
@@
package kaka.cakelight;
package kaka.cakelight;
+import kaka.cakelight.mode.Mode;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@
-26,6
+28,8
@@
public class Console extends Thread {
this.config = config;
register(Commands.help());
register(Commands.quit());
this.config = config;
register(Commands.help());
register(Commands.quit());
+ register(Commands.push());
+ register(Commands.pop());
register(Commands.video());
register(Commands.color());
register(Commands.brightness());
register(Commands.video());
register(Commands.color());
register(Commands.brightness());
@@
-71,14
+75,21
@@
public class Console extends Thread {
while (running) {
System.out.print("> ");
String input = reader.readLine();
while (running) {
System.out.print("> ");
String input = reader.readLine();
-
h
andleInput(input);
+
internalH
andleInput(input);
}
} catch (IOException e) {
System.out.println("Error reading from command line");
}
}
}
} catch (IOException e) {
System.out.println("Error reading from command line");
}
}
- void handleInput(String input) {
+ private void internalHandleInput(String input) {
+ Object obj = handleInput(input);
+ if (obj instanceof Mode) {
+ cakelight.setMode((Mode) obj);
+ }
+ }
+
+ Object handleInput(String input) {
String[] splitInput = input.split("\\s+", 2);
String name = splitInput[0];
String[] args = splitInput.length == 2
String[] splitInput = input.split("\\s+", 2);
String name = splitInput[0];
String[] args = splitInput.length == 2
@@
-87,10
+98,11
@@
public class Console extends Thread {
Command cmd = commands.get(name);
if (cmd != null) {
Command cmd = commands.get(name);
if (cmd != null) {
- cmd.activate(this, args);
+
return
cmd.activate(this, args);
} else {
out("no command named '" + name + "'");
}
} else {
out("no command named '" + name + "'");
}
+ return null;
}
void out(String text) {
}
void out(String text) {
@@
-126,6
+138,6
@@
public class Console extends Thread {
public interface Command {
String[] getNames();
public interface Command {
String[] getNames();
-
void
activate(Console console, String[] args);
+
Object
activate(Console console, String[] args);
}
}
}
}