Revision: 16035
Author: [email protected]
Date: Thu Dec 23 23:04:08 2010
Log: Implemented Shell initial version
http://code.google.com/p/mobicents/source/detail?r=16035
Modified:
/trunk/protocols/ss7/management/shell/src/main/java/org/mobicents/protocols/ss7/management/console/Console.java
/trunk/protocols/ss7/management/shell/src/main/java/org/mobicents/protocols/ss7/management/console/ConsoleListener.java
/trunk/protocols/ss7/management/shell/src/main/java/org/mobicents/protocols/ss7/management/console/Shell.java
/trunk/protocols/ss7/management/shell/src/test/java/org/mobicents/protocols/ss7/management/console/ConsoleTest.java
=======================================
---
/trunk/protocols/ss7/management/shell/src/main/java/org/mobicents/protocols/ss7/management/console/Console.java
Thu Dec 23 22:24:29 2010
+++
/trunk/protocols/ss7/management/shell/src/main/java/org/mobicents/protocols/ss7/management/console/Console.java
Thu Dec 23 23:04:08 2010
@@ -16,6 +16,8 @@
private final PrintWriter pw;
private final InputStream in;
private final Scanner scanner;
+
+ private boolean stopped = false;
private ConsoleListener consoleListener = null;
@@ -24,7 +26,7 @@
// Input
this.in = in;
- this.scanner = new Scanner(in);
+ this.scanner = new Scanner(this.in);
// Output
this.out = out;
@@ -37,7 +39,7 @@
public void start() {
- while (scanner.hasNextLine()) {
+ while (!stopped && scanner.hasNextLine()) {
String line = scanner.nextLine();
if (this.consoleListener != null) {
this.consoleListener.commandEntered(line);
@@ -45,6 +47,11 @@
}
}
+
+ public void stop(){
+ this.stopped = true;
+ this.scanner.close();
+ }
public void write(String text) {
pw.write(text);
=======================================
---
/trunk/protocols/ss7/management/shell/src/main/java/org/mobicents/protocols/ss7/management/console/ConsoleListener.java
Thu Dec 23 22:24:29 2010
+++
/trunk/protocols/ss7/management/shell/src/main/java/org/mobicents/protocols/ss7/management/console/ConsoleListener.java
Thu Dec 23 23:04:08 2010
@@ -1,10 +1,8 @@
package org.mobicents.protocols.ss7.management.console;
-public class ConsoleListener {
-
- public void commandEntered(String consoleInput){
-
- }
+public interface ConsoleListener {
+
+ public void commandEntered(String consoleInput);
}
=======================================
---
/trunk/protocols/ss7/management/shell/src/main/java/org/mobicents/protocols/ss7/management/console/Shell.java
Thu Dec 23 22:28:07 2010
+++
/trunk/protocols/ss7/management/shell/src/main/java/org/mobicents/protocols/ss7/management/console/Shell.java
Thu Dec 23 23:04:08 2010
@@ -2,12 +2,34 @@
public class Shell {
- public static void main(String args[]) {
- Console ss7Cli = new Console(System.in, System.out, new
ConsoleListener());
-
+ private final ConsoleListener listener;
+ private final Console console;
+
+ public Shell() {
+ listener = new ConsoleListenerImpl();
+ console = new Console(System.in, System.out, listener);
+ }
+
+ public static void main(String args[]) {
// TODO : Oleg what about command line arguments?
-
- ss7Cli.start();
+ Shell shell = new Shell();
+ shell.start();
+
+ }
+
+ private void start() {
+ console.start();
+ }
+
+ private class ConsoleListenerImpl implements ConsoleListener {
+
+ public void commandEntered(String consoleInput) {
+ System.out.println(consoleInput);
+ if (consoleInput.compareTo("exit") == 0) {
+ console.stop();
+ }
+ }
+
}
}
=======================================
---
/trunk/protocols/ss7/management/shell/src/test/java/org/mobicents/protocols/ss7/management/console/ConsoleTest.java
Thu Dec 23 22:24:29 2010
+++
/trunk/protocols/ss7/management/shell/src/test/java/org/mobicents/protocols/ss7/management/console/ConsoleTest.java
Thu Dec 23 23:04:08 2010
@@ -60,7 +60,7 @@
new String(out.toByteArray()));
}
- private class TestConsoleListener extends ConsoleListener {
+ private class TestConsoleListener implements ConsoleListener {
ByteArrayOutputStream out;
@@ -68,7 +68,6 @@
this.out = out;
}
- @Override
public void commandEntered(String consoleInput) {
System.out.println(consoleInput);