From b6b6ab9d366be4e0a882e5e725bdc25636c4b925 Mon Sep 17 00:00:00 2001
From: Emmanuel Bigeon <emmanuel@bigeon.fr>
Date: Mon, 6 May 2019 21:19:42 -0400
Subject: [PATCH] Cut cycle

Signed-off-by: Emmanuel Bigeon <emmanuel@bigeon.fr>
---
 .../src/main/java/net/bigeon/gclc/swt/SWTConsole.java     | 3 +++
 .../src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java | 3 +++
 .../net/bigeon/gclc/swt/{ => api}/ConsoleDelayIO.java     | 2 +-
 .../bigeon/gclc/swt/{ => api}/ConsoleOutputDisplay.java   | 2 +-
 .../main/java/net/bigeon/gclc/swt/api/package-info.java   | 8 ++++++++
 .../net/bigeon/gclc/swt/{ => io}/ConsoleInputManager.java | 3 ++-
 .../bigeon/gclc/swt/{ => io}/ConsoleOutputManager.java    | 4 +++-
 .../bigeon/gclc/swt/{ => io}/ConsolePromptManager.java    | 2 +-
 .../main/java/net/bigeon/gclc/swt/io/package-info.java    | 8 ++++++++
 .../gclc/swt/{ => tools}/HistoryTextKeyListener.java      | 3 ++-
 .../gclc/swt/{ => tools}/TextAppendingRunnable.java       | 4 ++--
 .../gclc/swt/tools/ToSWTConsoleForwardRunnable.java       | 2 +-
 .../java/net/bigeon/gclc/swt/ConsoleInputManagerTest.java | 7 ++++---
 .../net/bigeon/gclc/swt/ConsoleOutputManagerTest.java     | 3 ++-
 .../net/bigeon/gclc/swt/ConsolePromptManagerTest.java     | 6 ++++--
 .../net/bigeon/gclc/swt/HistoryTextKeyListenerTest.java   | 5 ++++-
 16 files changed, 49 insertions(+), 16 deletions(-)
 rename gclc-swt/src/main/java/net/bigeon/gclc/swt/{ => api}/ConsoleDelayIO.java (96%)
 rename gclc-swt/src/main/java/net/bigeon/gclc/swt/{ => api}/ConsoleOutputDisplay.java (95%)
 create mode 100644 gclc-swt/src/main/java/net/bigeon/gclc/swt/api/package-info.java
 rename gclc-swt/src/main/java/net/bigeon/gclc/swt/{ => io}/ConsoleInputManager.java (94%)
 rename gclc-swt/src/main/java/net/bigeon/gclc/swt/{ => io}/ConsoleOutputManager.java (93%)
 rename gclc-swt/src/main/java/net/bigeon/gclc/swt/{ => io}/ConsolePromptManager.java (96%)
 create mode 100644 gclc-swt/src/main/java/net/bigeon/gclc/swt/io/package-info.java
 rename gclc-swt/src/main/java/net/bigeon/gclc/swt/{ => tools}/HistoryTextKeyListener.java (96%)
 rename gclc-swt/src/main/java/net/bigeon/gclc/swt/{ => tools}/TextAppendingRunnable.java (92%)

diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsole.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsole.java
index d019ec1..556c79a 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsole.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsole.java
@@ -79,6 +79,9 @@ import org.eclipse.swt.widgets.Text;
 
 import net.bigeon.gclc.manager.PipedConsoleInput;
 import net.bigeon.gclc.manager.PipedConsoleOutput;
+import net.bigeon.gclc.swt.io.ConsoleInputManager;
+import net.bigeon.gclc.swt.io.ConsoleOutputManager;
+import net.bigeon.gclc.swt.io.ConsolePromptManager;
 
 /** A shell containing a {@link SWTConsoleView}
  * <p>
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java
index 04f06d1..a54754e 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java
@@ -78,6 +78,9 @@ import org.eclipse.swt.widgets.Text;
 import net.bigeon.gclc.ConsoleApplication;
 import net.bigeon.gclc.manager.PipedConsoleInput;
 import net.bigeon.gclc.manager.PipedConsoleOutput;
+import net.bigeon.gclc.swt.io.ConsoleInputManager;
+import net.bigeon.gclc.swt.io.ConsoleOutputManager;
+import net.bigeon.gclc.swt.tools.HistoryTextKeyListener;
 
 /** A SWT component to connect to gclc {@link ConsoleApplication}.
  *
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleDelayIO.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/api/ConsoleDelayIO.java
similarity index 96%
rename from gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleDelayIO.java
rename to gclc-swt/src/main/java/net/bigeon/gclc/swt/api/ConsoleDelayIO.java
index f274eb2..9a78894 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleDelayIO.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/api/ConsoleDelayIO.java
@@ -33,7 +33,7 @@
  * gclc-swt:net.bigeon.gclc.swt.ConsoleDelayIO.java
  * Created on: Nov 19, 2016
  */
-package net.bigeon.gclc.swt;
+package net.bigeon.gclc.swt.api;
 
 import java.io.IOException;
 
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleOutputDisplay.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/api/ConsoleOutputDisplay.java
similarity index 95%
rename from gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleOutputDisplay.java
rename to gclc-swt/src/main/java/net/bigeon/gclc/swt/api/ConsoleOutputDisplay.java
index 585b6ed..924913c 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleOutputDisplay.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/api/ConsoleOutputDisplay.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package net.bigeon.gclc.swt;
+package net.bigeon.gclc.swt.api;
 
 /*-
  * #%L
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/api/package-info.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/api/package-info.java
new file mode 100644
index 0000000..d6a77fb
--- /dev/null
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/api/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * 
+ */
+/**
+ * @author Emmanuel Bigeon
+ *
+ */
+package net.bigeon.gclc.swt.api;
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleInputManager.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/io/ConsoleInputManager.java
similarity index 94%
rename from gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleInputManager.java
rename to gclc-swt/src/main/java/net/bigeon/gclc/swt/io/ConsoleInputManager.java
index ea47666..1896f52 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleInputManager.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/io/ConsoleInputManager.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package net.bigeon.gclc.swt;
+package net.bigeon.gclc.swt.io;
 
 /*-
  * #%L
@@ -42,6 +42,7 @@ import java.io.IOException;
 import org.eclipse.swt.widgets.Text;
 
 import net.bigeon.gclc.manager.PipedConsoleInput;
+import net.bigeon.gclc.swt.api.ConsoleDelayIO;
 
 /** The object managing the console input.
  * 
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleOutputManager.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/io/ConsoleOutputManager.java
similarity index 93%
rename from gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleOutputManager.java
rename to gclc-swt/src/main/java/net/bigeon/gclc/swt/io/ConsoleOutputManager.java
index a9f5505..b43eebd 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleOutputManager.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/io/ConsoleOutputManager.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package net.bigeon.gclc.swt;
+package net.bigeon.gclc.swt.io;
 
 /*-
  * #%L
@@ -40,6 +40,8 @@ package net.bigeon.gclc.swt;
 import org.eclipse.swt.widgets.Text;
 
 import net.bigeon.gclc.manager.PipedConsoleOutput;
+import net.bigeon.gclc.swt.api.ConsoleOutputDisplay;
+import net.bigeon.gclc.swt.tools.TextAppendingRunnable;
 import net.bigeon.gclc.swt.tools.ToSWTConsoleForwardRunnable;
 
 /** The manager for console output to insert in a text.
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsolePromptManager.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/io/ConsolePromptManager.java
similarity index 96%
rename from gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsolePromptManager.java
rename to gclc-swt/src/main/java/net/bigeon/gclc/swt/io/ConsolePromptManager.java
index fa9098d..3fb5d38 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsolePromptManager.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/io/ConsolePromptManager.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package net.bigeon.gclc.swt;
+package net.bigeon.gclc.swt.io;
 
 /*-
  * #%L
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/io/package-info.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/io/package-info.java
new file mode 100644
index 0000000..3f12cb3
--- /dev/null
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/io/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * 
+ */
+/**
+ * @author Emmanuel Bigeon
+ *
+ */
+package net.bigeon.gclc.swt.io;
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/HistoryTextKeyListener.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/HistoryTextKeyListener.java
similarity index 96%
rename from gclc-swt/src/main/java/net/bigeon/gclc/swt/HistoryTextKeyListener.java
rename to gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/HistoryTextKeyListener.java
index be06431..ddab62d 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/HistoryTextKeyListener.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/HistoryTextKeyListener.java
@@ -33,7 +33,7 @@
  * gclc-swt:net.bigeon.gclc.swt.HistoryTextKeyListener.java
  * Created on: Jun 9, 2016
  */
-package net.bigeon.gclc.swt;
+package net.bigeon.gclc.swt.tools;
 
 import java.io.IOException;
 import java.util.logging.Level;
@@ -78,6 +78,7 @@ import org.eclipse.swt.events.KeyEvent;
 
 import net.bigeon.collections.Ribbon;
 import net.bigeon.collections.ribbon.ArrayRibbon;
+import net.bigeon.gclc.swt.api.ConsoleDelayIO;
 
 /** A key listener to validate commands and manage the history of commands.
  *
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/TextAppendingRunnable.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/TextAppendingRunnable.java
similarity index 92%
rename from gclc-swt/src/main/java/net/bigeon/gclc/swt/TextAppendingRunnable.java
rename to gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/TextAppendingRunnable.java
index 7fa603d..648d1bb 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/TextAppendingRunnable.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/TextAppendingRunnable.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package net.bigeon.gclc.swt;
+package net.bigeon.gclc.swt.tools;
 
 import org.eclipse.swt.widgets.Text;
 
@@ -33,4 +33,4 @@ public class TextAppendingRunnable implements Runnable {
         }
         text.append(next);
     }
-}
\ No newline at end of file
+}
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/ToSWTConsoleForwardRunnable.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/ToSWTConsoleForwardRunnable.java
index a747cca..87037f3 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/ToSWTConsoleForwardRunnable.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/ToSWTConsoleForwardRunnable.java
@@ -7,7 +7,7 @@ import org.eclipse.swt.widgets.Widget;
 
 import net.bigeon.gclc.manager.PipedConsoleOutput;
 import net.bigeon.gclc.manager.forwarding.AOutputForwardRunnable;
-import net.bigeon.gclc.swt.ConsoleOutputDisplay;
+import net.bigeon.gclc.swt.api.ConsoleOutputDisplay;
 
 /** The local implementation of the forwarding runnable.
  *
diff --git a/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleInputManagerTest.java b/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleInputManagerTest.java
index 29fc977..d2da8bb 100644
--- a/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleInputManagerTest.java
+++ b/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleInputManagerTest.java
@@ -47,6 +47,7 @@ import org.eclipse.swt.widgets.Text;
 import org.junit.Test;
 
 import net.bigeon.gclc.manager.PipedConsoleInput;
+import net.bigeon.gclc.swt.io.ConsoleInputManager;
 
 /** @author Emmanuel Bigeon */
 public class ConsoleInputManagerTest {
@@ -55,7 +56,7 @@ public class ConsoleInputManagerTest {
     private final ConsoleInputManager cim  = new ConsoleInputManager(text);
 
     /** Test method for
-     * {@link net.bigeon.gclc.swt.ConsoleInputManager#setInput(java.lang.String)}. */
+     * {@link net.bigeon.gclc.swt.io.ConsoleInputManager#setInput(java.lang.String)}. */
     @Test
     public void testSetText() {
         cim.setInput("Text");
@@ -63,7 +64,7 @@ public class ConsoleInputManagerTest {
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.swt.ConsoleInputManager#validateInput()}.
+     * {@link net.bigeon.gclc.swt.io.ConsoleInputManager#validateInput()}.
      * 
      * @throws IOException if an error occurred */
     @Test
@@ -101,7 +102,7 @@ public class ConsoleInputManagerTest {
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.swt.ConsoleInputManager#getText()}. */
+     * {@link net.bigeon.gclc.swt.io.ConsoleInputManager#getText()}. */
     @Test
     public void testGetText() {
         assertEquals("Text component should be preserved", text, cim.getText());
diff --git a/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleOutputManagerTest.java b/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleOutputManagerTest.java
index 663cfd2..f0ca6c0 100644
--- a/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleOutputManagerTest.java
+++ b/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleOutputManagerTest.java
@@ -49,6 +49,7 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 import net.bigeon.gclc.manager.PipedConsoleOutput;
+import net.bigeon.gclc.swt.io.ConsoleOutputManager;
 
 /** @author Emmanuel Bigeon */
 public class ConsoleOutputManagerTest {
@@ -71,7 +72,7 @@ public class ConsoleOutputManagerTest {
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.swt.ConsoleOutputManager#appendLine(java.lang.String)}. */
+     * {@link net.bigeon.gclc.swt.io.ConsoleOutputManager#appendLine(java.lang.String)}. */
     @Test
     public void testAppendConsoleOutput() {
         when(text.getText()).thenReturn("", "abc",
diff --git a/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsolePromptManagerTest.java b/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsolePromptManagerTest.java
index 12aa3e4..b9a0340 100644
--- a/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsolePromptManagerTest.java
+++ b/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsolePromptManagerTest.java
@@ -45,6 +45,8 @@ import java.io.BufferedReader;
 import org.eclipse.swt.widgets.Label;
 import org.junit.Test;
 
+import net.bigeon.gclc.swt.io.ConsolePromptManager;
+
 /**
  * @author Emmanuel Bigeon
  *
@@ -56,7 +58,7 @@ public class ConsolePromptManagerTest {
     private final ConsolePromptManager manager = new ConsolePromptManager(label);
 
     /**
-     * Test method for {@link net.bigeon.gclc.swt.ConsolePromptManager#setPrompt(java.lang.String)}.
+     * Test method for {@link net.bigeon.gclc.swt.io.ConsolePromptManager#setPrompt(java.lang.String)}.
      */
     @Test
     public void testSetPrompt() {
@@ -65,7 +67,7 @@ public class ConsolePromptManagerTest {
     }
 
     /**
-     * Test method for {@link net.bigeon.gclc.swt.ConsolePromptManager#setStream(java.io.BufferedReader)}.
+     * Test method for {@link net.bigeon.gclc.swt.io.ConsolePromptManager#setStream(java.io.BufferedReader)}.
      */
     @Test
     public void testSetStream() {
diff --git a/gclc-swt/src/test/java/net/bigeon/gclc/swt/HistoryTextKeyListenerTest.java b/gclc-swt/src/test/java/net/bigeon/gclc/swt/HistoryTextKeyListenerTest.java
index 5e82145..49138c6 100644
--- a/gclc-swt/src/test/java/net/bigeon/gclc/swt/HistoryTextKeyListenerTest.java
+++ b/gclc-swt/src/test/java/net/bigeon/gclc/swt/HistoryTextKeyListenerTest.java
@@ -75,6 +75,9 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
 import org.junit.Test;
 
+import net.bigeon.gclc.swt.api.ConsoleDelayIO;
+import net.bigeon.gclc.swt.tools.HistoryTextKeyListener;
+
 /**
  * <p>
  * TODO
@@ -83,7 +86,7 @@ import org.junit.Test;
 public class HistoryTextKeyListenerTest {
 
     /** Test method for
-     * {@link net.bigeon.gclc.swt.HistoryTextKeyListener#keyPressed(org.eclipse.swt.events.KeyEvent)}. */
+     * {@link net.bigeon.gclc.swt.tools.HistoryTextKeyListener#keyPressed(org.eclipse.swt.events.KeyEvent)}. */
     @Test
     public final void testKeyPressedKeyEvent() {
         final ConsoleDelayIO io = new ConsoleDelayIO() {