diff --git a/gclc-socket/pom.xml b/gclc-socket/pom.xml
index 26e118d..fce654a 100644
--- a/gclc-socket/pom.xml
+++ b/gclc-socket/pom.xml
@@ -81,7 +81,7 @@ of Emmanuel Bigeon. -->
fr.bigeon
gclc
- 1.3.6
+ 1.5.0
fr.bigeon
diff --git a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/ConsoleRunnableTest.java b/gclc-socket/src/test/java/fr/bigeon/gclc/socket/ConsoleRunnableTest.java
index 4b2ac7b..a32f9a4 100644
--- a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/ConsoleRunnableTest.java
+++ b/gclc-socket/src/test/java/fr/bigeon/gclc/socket/ConsoleRunnableTest.java
@@ -128,6 +128,21 @@ public class ConsoleRunnableTest {
public void interruptPrompt() {
//
}
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.manager.ConsoleManager#prompt(long) */
+ @Override
+ public String prompt(long timeout) throws IOException {
+ return prompt();
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.manager.ConsoleManager#prompt(java.lang.String,
+ * long) */
+ @Override
+ public String prompt(String message, long timeout) throws IOException {
+ return prompt(message);
+ }
}
/** Test method for
diff --git a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/ConsoleTestApplication.java b/gclc-socket/src/test/java/fr/bigeon/gclc/socket/ConsoleTestApplication.java
index b0db4d9..2993853 100644
--- a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/ConsoleTestApplication.java
+++ b/gclc-socket/src/test/java/fr/bigeon/gclc/socket/ConsoleTestApplication.java
@@ -47,20 +47,22 @@ import fr.bigeon.gclc.manager.ConsoleManager;
/** A test-purpose application
*
* @author Emmanuel Bigeon */
-public class ConsoleTestApplication extends ConsoleApplication {
+public class ConsoleTestApplication {
/** Exit command */
public static final String EXIT = "exit"; //$NON-NLS-1$
/** @param manager the manager */
@SuppressWarnings("nls")
- public ConsoleTestApplication(final ConsoleManager manager) {
- super(manager, "Welcome to the test application. Type help or test.",
- "See you");
+ public static ConsoleApplication create(final ConsoleManager manager) {
try {
- add(new ExitCommand(EXIT, this));
- add(new HelpExecutor("help", manager, this.getRoot()));
- add(new Command("test") {
+ ConsoleApplication application = new ConsoleApplication(manager,
+ "Welcome to the test application. Type help or test.",
+ "See you");
+ application.add(new ExitCommand(EXIT, application));
+ application.add(
+ new HelpExecutor("help", manager, application.root));
+ application.add(new Command("test") {
@Override
public String tip() {
@@ -77,7 +79,7 @@ public class ConsoleTestApplication extends ConsoleApplication {
}
}
});
- add(new Command("long") {
+ application.add(new Command("long") {
@Override
public String tip() {
@@ -95,8 +97,10 @@ public class ConsoleTestApplication extends ConsoleApplication {
}
}
});
+ return application;
} catch (final InvalidCommandName e) {
e.printStackTrace();
}
+ return null;
}
}
diff --git a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/TestServer.java b/gclc-socket/src/test/java/fr/bigeon/gclc/socket/TestServer.java
index dc78925..7cd253c 100644
--- a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/TestServer.java
+++ b/gclc-socket/src/test/java/fr/bigeon/gclc/socket/TestServer.java
@@ -37,6 +37,8 @@ package fr.bigeon.gclc.socket;
import java.io.IOException;
import java.nio.charset.Charset;
+import fr.bigeon.gclc.ConsoleApplication;
+
/** A test server
*
* @author Emmanuel Bigeon */
@@ -68,8 +70,8 @@ public class TestServer {
if (SHELL == null) {
SHELL = new SocketConsoleApplicationShell(3300, "close",
ConsoleTestApplication.EXIT, Charset.forName("UTF-8"));
- final ConsoleTestApplication app = new ConsoleTestApplication(
- SHELL.getConsoleManager());
+ final ConsoleApplication app = ConsoleTestApplication
+ .create(SHELL.getConsoleManager());
SHELL.setApplication(app);
}
return SHELL;
@@ -79,8 +81,8 @@ public class TestServer {
if (SHELL == null) {
SHELL = new SocketConsoleApplicationShell(3300, autoClose,
ConsoleTestApplication.EXIT, Charset.forName("UTF-8"));
- final ConsoleTestApplication app = new ConsoleTestApplication(
- SHELL.getConsoleManager());
+ final ConsoleApplication app = ConsoleTestApplication
+ .create(SHELL.getConsoleManager());
SHELL.setApplication(app);
server = null;
}
@@ -91,8 +93,8 @@ public class TestServer {
if (SHELL == null) {
SHELL = new SocketConsoleApplicationShell(3300, closeConnection,
ConsoleTestApplication.EXIT, Charset.forName("UTF-8"));
- final ConsoleTestApplication app = new ConsoleTestApplication(
- SHELL.getConsoleManager());
+ final ConsoleApplication app = ConsoleTestApplication
+ .create(SHELL.getConsoleManager());
SHELL.setApplication(app);
server = null;
}