Revision: 16037
Author: [email protected]
Date: Fri Dec 24 01:37:23 2010
Log: [No log message]
http://code.google.com/p/mobicents/source/detail?r=16037
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/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 23:04:08 2010
+++
/trunk/protocols/ss7/management/shell/src/main/java/org/mobicents/protocols/ss7/management/console/Console.java
Fri Dec 24 01:37:23 2010
@@ -8,7 +8,7 @@
/**
*
* @author amit bhayani
- *
+ *
*/
public class Console {
@@ -16,13 +16,17 @@
private final PrintWriter pw;
private final InputStream in;
private final Scanner scanner;
-
+
+ private final String prefix;
+
private boolean stopped = false;
private ConsoleListener consoleListener = null;
public Console(InputStream in, OutputStream out,
- ConsoleListener consoleListener) {
+ ConsoleListener consoleListener, String prefix) {
+ // prefix
+ this.prefix = prefix;
// Input
this.in = in;
@@ -38,17 +42,23 @@
}
public void start() {
-
+ addPrefix();
while (!stopped && scanner.hasNextLine()) {
String line = scanner.nextLine();
if (this.consoleListener != null) {
this.consoleListener.commandEntered(line);
}
-
+ addPrefix();
+ }
+ }
+
+ private void addPrefix() {
+ if (this.prefix != null) {
+ this.write(prefix);
}
}
-
- public void stop(){
+
+ public void stop() {
this.stopped = true;
this.scanner.close();
}
=======================================
---
/trunk/protocols/ss7/management/shell/src/main/java/org/mobicents/protocols/ss7/management/console/Shell.java
Fri Dec 24 00:24:26 2010
+++
/trunk/protocols/ss7/management/shell/src/main/java/org/mobicents/protocols/ss7/management/console/Shell.java
Fri Dec 24 01:37:23 2010
@@ -1,5 +1,8 @@
package org.mobicents.protocols.ss7.management.console;
+import java.io.InputStream;
+import java.io.PrintStream;
+
public class Shell {
Version version = Version.instance;
@@ -16,6 +19,9 @@
private final ConsoleListener listener;
private final Console console;
+
+ private static final InputStream in = System.in;
+ private static final PrintStream out = System.out;
private void showCliHelp() {
System.out.println(version.toString());
@@ -27,7 +33,7 @@
public Shell() {
listener = new ConsoleListenerImpl();
- console = new Console(System.in, System.out, listener);
+ console = new Console(in, out, listener, cliPrefix);
}
public static void main(String args[]) {
=======================================
---
/trunk/protocols/ss7/management/shell/src/test/java/org/mobicents/protocols/ss7/management/console/ConsoleTest.java
Thu Dec 23 23:04:08 2010
+++
/trunk/protocols/ss7/management/shell/src/test/java/org/mobicents/protocols/ss7/management/console/ConsoleTest.java
Fri Dec 24 01:37:23 2010
@@ -53,7 +53,7 @@
listener = new TestConsoleListener(out);
- console = new Console(in, out, listener);
+ console = new Console(in, out, listener, null);
console.start();
assertEquals("Sent message should be equal to received", message,