diff --git a/gclc/src/main/java/net/bigeon/gclc/ConsoleApplication.java b/gclc/src/main/java/net/bigeon/gclc/ConsoleApplication.java index 0f636ed..22b4ef1 100644 --- a/gclc/src/main/java/net/bigeon/gclc/ConsoleApplication.java +++ b/gclc/src/main/java/net/bigeon/gclc/ConsoleApplication.java @@ -95,8 +95,8 @@ import net.bigeon.gclc.manager.ConsoleOutput; * A typical use case is the following: * *
- * {@link ConsoleOutput} out = new {@link net.bigeon.gclc.utils.StreamConsoleOutput StreamConsoleOutput}();
- * {@link ConsoleInput} in = new {@link net.bigeon.gclc.utils.StreamConsoleInput StreamConsoleInput}();
+ * {@link ConsoleOutput} out = new {@link net.bigeon.gclc.manager.StreamConsoleOutput StreamConsoleOutput}();
+ * {@link ConsoleInput} in = new {@link net.bigeon.gclc.manager.StreamConsoleInput StreamConsoleInput}();
  * {@link ConsoleApplication} app = new {@link ConsoleApplication}(out, in, "welcome", "see you latter")};
  * app.{@link ConsoleApplication#add(ICommand) add}("my_command", new {@link ICommand MyCommand()});
  * app.{@link ConsoleApplication#start() start()};
diff --git a/gclc/src/main/java/net/bigeon/gclc/utils/PipedConsoleInput.java b/gclc/src/main/java/net/bigeon/gclc/manager/PipedConsoleInput.java
similarity index 96%
rename from gclc/src/main/java/net/bigeon/gclc/utils/PipedConsoleInput.java
rename to gclc/src/main/java/net/bigeon/gclc/manager/PipedConsoleInput.java
index 51dcdd4..ba24707 100644
--- a/gclc/src/main/java/net/bigeon/gclc/utils/PipedConsoleInput.java
+++ b/gclc/src/main/java/net/bigeon/gclc/manager/PipedConsoleInput.java
@@ -36,7 +36,7 @@
  * gclc-test:net.bigeon.gclc.test.TestConsoleManager.java
  * Created on: Nov 18, 2016
  */
-package net.bigeon.gclc.utils;
+package net.bigeon.gclc.manager;
 
 /*-
  * #%L
@@ -78,7 +78,7 @@ import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 import java.util.function.Supplier;
 
-import net.bigeon.gclc.manager.ConsoleInput;
+import net.bigeon.gclc.utils.WritingRunnable;
 
 /** This console input allows to enter commands and retrieve the output as an
  * input.
diff --git a/gclc/src/main/java/net/bigeon/gclc/utils/PipedConsoleOutput.java b/gclc/src/main/java/net/bigeon/gclc/manager/PipedConsoleOutput.java
similarity index 96%
rename from gclc/src/main/java/net/bigeon/gclc/utils/PipedConsoleOutput.java
rename to gclc/src/main/java/net/bigeon/gclc/manager/PipedConsoleOutput.java
index 235fa2a..2432b4a 100644
--- a/gclc/src/main/java/net/bigeon/gclc/utils/PipedConsoleOutput.java
+++ b/gclc/src/main/java/net/bigeon/gclc/manager/PipedConsoleOutput.java
@@ -36,7 +36,7 @@
  * gclc-test:net.bigeon.gclc.test.TestConsoleManager.java
  * Created on: Nov 18, 2016
  */
-package net.bigeon.gclc.utils;
+package net.bigeon.gclc.manager;
 
 /*-
  * #%L
@@ -79,7 +79,7 @@ import java.io.PipedOutputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 
-import net.bigeon.gclc.manager.ConsoleOutput;
+import net.bigeon.gclc.utils.ReadingRunnable;
 
 /** This console output allows to retrieve the output as an input.
  * 

diff --git a/gclc/src/main/java/net/bigeon/gclc/utils/StreamConsoleInput.java b/gclc/src/main/java/net/bigeon/gclc/manager/StreamConsoleInput.java similarity index 96% rename from gclc/src/main/java/net/bigeon/gclc/utils/StreamConsoleInput.java rename to gclc/src/main/java/net/bigeon/gclc/manager/StreamConsoleInput.java index 2d325d2..d8adb3e 100644 --- a/gclc/src/main/java/net/bigeon/gclc/utils/StreamConsoleInput.java +++ b/gclc/src/main/java/net/bigeon/gclc/manager/StreamConsoleInput.java @@ -36,7 +36,7 @@ * gclc:net.bigeon.gclc.system.SystemConsoleManager.java * Created on: Dec 19, 2014 */ -package net.bigeon.gclc.utils; +package net.bigeon.gclc.manager; /*- * #%L @@ -79,8 +79,8 @@ import java.io.PrintStream; import java.nio.charset.Charset; import java.util.function.Supplier; -import net.bigeon.gclc.manager.ConsoleInput; import net.bigeon.gclc.tools.ConstantString; +import net.bigeon.gclc.utils.ReadingRunnable; /** A console using the input stream and print stream. *

diff --git a/gclc/src/main/java/net/bigeon/gclc/utils/StreamConsoleOutput.java b/gclc/src/main/java/net/bigeon/gclc/manager/StreamConsoleOutput.java similarity index 95% rename from gclc/src/main/java/net/bigeon/gclc/utils/StreamConsoleOutput.java rename to gclc/src/main/java/net/bigeon/gclc/manager/StreamConsoleOutput.java index db371b6..cc1e0cc 100644 --- a/gclc/src/main/java/net/bigeon/gclc/utils/StreamConsoleOutput.java +++ b/gclc/src/main/java/net/bigeon/gclc/manager/StreamConsoleOutput.java @@ -36,7 +36,7 @@ * gclc:net.bigeon.gclc.system.SystemConsoleManager.java * Created on: Dec 19, 2014 */ -package net.bigeon.gclc.utils; +package net.bigeon.gclc.manager; /*- * #%L @@ -74,8 +74,6 @@ package net.bigeon.gclc.utils; import java.io.IOException; import java.io.PrintStream; -import net.bigeon.gclc.manager.ConsoleOutput; - /** A console using the input stream and print stream. *

* The default constructor will use the system standart input and output. diff --git a/gclc/src/main/java/net/bigeon/gclc/utils/AOutputForwardRunnable.java b/gclc/src/main/java/net/bigeon/gclc/utils/AOutputForwardRunnable.java index 04c9d37..596938f 100644 --- a/gclc/src/main/java/net/bigeon/gclc/utils/AOutputForwardRunnable.java +++ b/gclc/src/main/java/net/bigeon/gclc/utils/AOutputForwardRunnable.java @@ -75,6 +75,8 @@ import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; +import net.bigeon.gclc.manager.PipedConsoleOutput; + /** An incomplete implematation used to forward messages from a piped console. *

* This forwarding can be interrupted without closing the piped manager. diff --git a/gclc/src/test/java/net/bigeon/gclc/CommandTestingApplication.java b/gclc/src/test/java/net/bigeon/gclc/CommandTestingApplication.java index 0abbcda..a0d7bf5 100644 --- a/gclc/src/test/java/net/bigeon/gclc/CommandTestingApplication.java +++ b/gclc/src/test/java/net/bigeon/gclc/CommandTestingApplication.java @@ -75,8 +75,8 @@ import java.io.IOException; import net.bigeon.gclc.command.ICommand; import net.bigeon.gclc.exception.InvalidCommandName; -import net.bigeon.gclc.utils.PipedConsoleInput; -import net.bigeon.gclc.utils.PipedConsoleOutput; +import net.bigeon.gclc.manager.PipedConsoleInput; +import net.bigeon.gclc.manager.PipedConsoleOutput; /** *

diff --git a/gclc/src/test/java/net/bigeon/gclc/ConsoleApplicationTest.java b/gclc/src/test/java/net/bigeon/gclc/ConsoleApplicationTest.java index b952e71..e8b63ef 100644 --- a/gclc/src/test/java/net/bigeon/gclc/ConsoleApplicationTest.java +++ b/gclc/src/test/java/net/bigeon/gclc/ConsoleApplicationTest.java @@ -95,8 +95,8 @@ import net.bigeon.gclc.exception.InvalidCommandName; import net.bigeon.gclc.i18n.Messages; import net.bigeon.gclc.manager.ConsoleInput; import net.bigeon.gclc.manager.ConsoleOutput; -import net.bigeon.gclc.utils.PipedConsoleInput; -import net.bigeon.gclc.utils.PipedConsoleOutput; +import net.bigeon.gclc.manager.PipedConsoleInput; +import net.bigeon.gclc.manager.PipedConsoleOutput; /** Test class for ConsoleApplication * diff --git a/gclc/src/test/java/net/bigeon/gclc/command/CommandTest.java b/gclc/src/test/java/net/bigeon/gclc/command/CommandTest.java index 534ca1d..790a43d 100644 --- a/gclc/src/test/java/net/bigeon/gclc/command/CommandTest.java +++ b/gclc/src/test/java/net/bigeon/gclc/command/CommandTest.java @@ -82,7 +82,7 @@ import org.junit.Test; import net.bigeon.gclc.exception.CommandRunException; import net.bigeon.gclc.manager.ConsoleInput; import net.bigeon.gclc.manager.ConsoleOutput; -import net.bigeon.gclc.utils.PipedConsoleOutput; +import net.bigeon.gclc.manager.PipedConsoleOutput; /** *

diff --git a/gclc/src/test/java/net/bigeon/gclc/command/HelpExecutorTest.java b/gclc/src/test/java/net/bigeon/gclc/command/HelpExecutorTest.java index b5ef157..c25d466 100644 --- a/gclc/src/test/java/net/bigeon/gclc/command/HelpExecutorTest.java +++ b/gclc/src/test/java/net/bigeon/gclc/command/HelpExecutorTest.java @@ -83,7 +83,7 @@ import net.bigeon.gclc.command.base.MockCommand; import net.bigeon.gclc.exception.CommandRunException; import net.bigeon.gclc.manager.ConsoleInput; import net.bigeon.gclc.manager.ConsoleOutput; -import net.bigeon.gclc.utils.PipedConsoleOutput; +import net.bigeon.gclc.manager.PipedConsoleOutput; /** *

diff --git a/gclc/src/test/java/net/bigeon/gclc/command/ParametrizedCommandTest.java b/gclc/src/test/java/net/bigeon/gclc/command/ParametrizedCommandTest.java index 4c643ff..a650f46 100644 --- a/gclc/src/test/java/net/bigeon/gclc/command/ParametrizedCommandTest.java +++ b/gclc/src/test/java/net/bigeon/gclc/command/ParametrizedCommandTest.java @@ -91,8 +91,8 @@ import net.bigeon.gclc.exception.CommandRunException; import net.bigeon.gclc.exception.InvalidParameterException; import net.bigeon.gclc.manager.ConsoleInput; import net.bigeon.gclc.manager.ConsoleOutput; -import net.bigeon.gclc.utils.PipedConsoleInput; -import net.bigeon.gclc.utils.PipedConsoleOutput; +import net.bigeon.gclc.manager.PipedConsoleInput; +import net.bigeon.gclc.manager.PipedConsoleOutput; import net.bigeon.test.junitmt.ATestRunnable; import net.bigeon.test.junitmt.FunctionalTestRunnable; import net.bigeon.test.junitmt.TestFunction; diff --git a/gclc/src/test/java/net/bigeon/gclc/command/ScriptExecutionTest.java b/gclc/src/test/java/net/bigeon/gclc/command/ScriptExecutionTest.java index e2e8863..9e74007 100644 --- a/gclc/src/test/java/net/bigeon/gclc/command/ScriptExecutionTest.java +++ b/gclc/src/test/java/net/bigeon/gclc/command/ScriptExecutionTest.java @@ -85,8 +85,8 @@ import net.bigeon.gclc.ConsoleTestApplication; import net.bigeon.gclc.command.base.ScriptExecution; import net.bigeon.gclc.exception.CommandRunException; import net.bigeon.gclc.exception.CommandRunExceptionType; -import net.bigeon.gclc.utils.PipedConsoleInput; -import net.bigeon.gclc.utils.PipedConsoleOutput; +import net.bigeon.gclc.manager.PipedConsoleInput; +import net.bigeon.gclc.manager.PipedConsoleOutput; /** *

diff --git a/gclc/src/test/java/net/bigeon/gclc/command/SubedCommandTest.java b/gclc/src/test/java/net/bigeon/gclc/command/SubedCommandTest.java index 1f5a259..2d5ddb8 100644 --- a/gclc/src/test/java/net/bigeon/gclc/command/SubedCommandTest.java +++ b/gclc/src/test/java/net/bigeon/gclc/command/SubedCommandTest.java @@ -85,7 +85,7 @@ import net.bigeon.gclc.exception.CommandRunException; import net.bigeon.gclc.exception.InvalidCommandName; import net.bigeon.gclc.manager.ConsoleInput; import net.bigeon.gclc.manager.ConsoleOutput; -import net.bigeon.gclc.utils.PipedConsoleOutput; +import net.bigeon.gclc.manager.PipedConsoleOutput; /** *

diff --git a/gclc/src/test/java/net/bigeon/gclc/command/base/EchoCommandTest.java b/gclc/src/test/java/net/bigeon/gclc/command/base/EchoCommandTest.java index 96b04ab..b8e61d7 100644 --- a/gclc/src/test/java/net/bigeon/gclc/command/base/EchoCommandTest.java +++ b/gclc/src/test/java/net/bigeon/gclc/command/base/EchoCommandTest.java @@ -9,7 +9,7 @@ import java.io.IOException; import org.junit.Test; import net.bigeon.gclc.exception.CommandRunException; -import net.bigeon.gclc.utils.PipedConsoleOutput; +import net.bigeon.gclc.manager.PipedConsoleOutput; public class EchoCommandTest { diff --git a/gclc/src/test/java/net/bigeon/gclc/manager/SystemConsoleManagerTest.java b/gclc/src/test/java/net/bigeon/gclc/manager/SystemConsoleManagerTest.java index b50283f..2025aae 100644 --- a/gclc/src/test/java/net/bigeon/gclc/manager/SystemConsoleManagerTest.java +++ b/gclc/src/test/java/net/bigeon/gclc/manager/SystemConsoleManagerTest.java @@ -85,8 +85,6 @@ import java.nio.charset.Charset; import org.junit.Test; -import net.bigeon.gclc.utils.StreamConsoleInput; - /** *

* TODO diff --git a/gclc/src/test/java/net/bigeon/gclc/prompt/CLIPrompterTest.java b/gclc/src/test/java/net/bigeon/gclc/prompt/CLIPrompterTest.java index 2811bc1..dcbbd88 100644 --- a/gclc/src/test/java/net/bigeon/gclc/prompt/CLIPrompterTest.java +++ b/gclc/src/test/java/net/bigeon/gclc/prompt/CLIPrompterTest.java @@ -92,8 +92,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import net.bigeon.gclc.utils.PipedConsoleInput; -import net.bigeon.gclc.utils.PipedConsoleOutput; +import net.bigeon.gclc.manager.PipedConsoleInput; +import net.bigeon.gclc.manager.PipedConsoleOutput; import net.bigeon.test.junitmt.ATestRunnable; import net.bigeon.test.junitmt.FunctionalTestRunnable; import net.bigeon.test.junitmt.TestFunction; diff --git a/gclc/src/test/java/net/bigeon/gclc/tools/AOutputForwardRunnableTest.java b/gclc/src/test/java/net/bigeon/gclc/tools/AOutputForwardRunnableTest.java index 031b29f..6b3b040 100644 --- a/gclc/src/test/java/net/bigeon/gclc/tools/AOutputForwardRunnableTest.java +++ b/gclc/src/test/java/net/bigeon/gclc/tools/AOutputForwardRunnableTest.java @@ -77,8 +77,8 @@ import java.io.IOException; import org.junit.Test; +import net.bigeon.gclc.manager.PipedConsoleOutput; import net.bigeon.gclc.utils.AOutputForwardRunnable; -import net.bigeon.gclc.utils.PipedConsoleOutput; /** *