Big chunk of readline classes renaming to not collide with terminal API

readline/src/main/java/org/aesh/readline/AeshConsoleBuffer.java

@@ -9,7 +9,7 @@
 import org.aesh.readline.completion.CompletionHandler;
 import org.aesh.readline.editing.EditMode;
 import org.aesh.readline.history.History;
-import org.aesh.tty.Connection;
+import org.aesh.readline.tty.Connection;
 import org.aesh.util.LoggerUtil;
 
 import java.util.logging.Logger;

readline/src/main/java/org/aesh/readline/InputProcessor.java

@@ -20,7 +20,7 @@
 package org.aesh.readline;
 
 import org.aesh.readline.editing.EditMode;
-import org.aesh.tty.Connection;
+import org.aesh.readline.tty.Connection;
 
 /**
  * InputProcessor is used by {@link org.aesh.readline.Readline} to process the input.

readline/src/main/java/org/aesh/readline/Prompt.java

@@ -19,9 +19,9 @@
  */
 package org.aesh.readline;
 
-import org.aesh.terminal.formatting.TerminalString;
+import org.aesh.readline.terminal.formatting.TerminalString;
 import org.aesh.util.Parser;
-import org.aesh.terminal.formatting.TerminalCharacter;
+import org.aesh.readline.terminal.formatting.TerminalCharacter;
 
 import java.util.Arrays;
 import java.util.List;

readline/src/main/java/org/aesh/readline/Readline.java

@@ -29,10 +29,10 @@
 import org.aesh.readline.editing.EditModeBuilder;
 import org.aesh.readline.history.History;
 import org.aesh.readline.history.InMemoryHistory;
-import org.aesh.terminal.Key;
+import org.aesh.readline.terminal.Key;
 import org.aesh.util.Config;
 import org.aesh.util.Parser;
-import org.aesh.tty.Connection;
+import org.aesh.readline.tty.Connection;
 import org.aesh.util.LoggerUtil;
 
 import java.util.List;
@@ -45,7 +45,7 @@
 
 /**
  * Readline is a simple way to read a single input line from the terminal/shell/console.
- * Readline reads/writes from/to a {@link org.aesh.tty.Connection}.
+ * Readline reads/writes from/to a {@link org.aesh.readline.tty.Connection}.
  *
  * Readline is thread safe and will not accept new {@link org.aesh.readline.Readline#readline} calls
  * while currently reading input.

readline/src/main/java/org/aesh/readline/action/ActionDecoder.java

@@ -19,7 +19,7 @@
  */
 package org.aesh.readline.action;
 
-import org.aesh.terminal.Key;
+import org.aesh.readline.terminal.Key;
 import org.aesh.readline.editing.EditMode;
 
 import java.util.Arrays;

readline/src/main/java/org/aesh/readline/action/mappings/Complete.java

@@ -23,7 +23,7 @@
 import org.aesh.readline.action.ActionEvent;
 import org.aesh.readline.action.KeyAction;
 import org.aesh.readline.completion.CompletionHandler;
-import org.aesh.terminal.Key;
+import org.aesh.readline.terminal.Key;
 import org.aesh.util.Config;
 import org.aesh.readline.InputProcessor;
 

readline/src/main/java/org/aesh/readline/action/mappings/SearchHistory.java

@@ -20,7 +20,7 @@
 package org.aesh.readline.action.mappings;
 
 import org.aesh.readline.action.KeyAction;
-import org.aesh.terminal.Key;
+import org.aesh.readline.terminal.Key;
 import org.aesh.util.IntArrayBuilder;
 import org.aesh.util.Parser;
 import org.aesh.readline.InputProcessor;

readline/src/main/java/org/aesh/readline/completion/CompleteOperation.java

@@ -19,7 +19,7 @@
  */
 package org.aesh.readline.completion;
 
-import org.aesh.terminal.formatting.TerminalString;
+import org.aesh.readline.terminal.formatting.TerminalString;
 
 import java.util.List;
 

readline/src/main/java/org/aesh/readline/completion/CompleteOperationImpl.java

@@ -20,7 +20,7 @@
 package org.aesh.readline.completion;
 
 import org.aesh.util.Parser;
-import org.aesh.terminal.formatting.TerminalString;
+import org.aesh.readline.terminal.formatting.TerminalString;
 
 import java.util.ArrayList;
 import java.util.List;

readline/src/main/java/org/aesh/readline/completion/CompletionHandler.java

@@ -22,7 +22,7 @@
 import org.aesh.readline.Buffer;
 import org.aesh.readline.InputProcessor;
 import org.aesh.readline.action.mappings.ActionMapper;
-import org.aesh.terminal.formatting.TerminalString;
+import org.aesh.readline.terminal.formatting.TerminalString;
 import org.aesh.util.Config;
 import org.aesh.util.Parser;
 

readline/src/main/java/org/aesh/readline/editing/EditMode.java

@@ -20,7 +20,7 @@
 package org.aesh.readline.editing;
 
 import org.aesh.readline.action.KeyAction;
-import org.aesh.terminal.Key;
+import org.aesh.readline.terminal.Key;
 import org.aesh.readline.action.Action;
 
 import java.util.Arrays;

readline/src/main/java/org/aesh/readline/editing/EditModeBuilder.java

@@ -42,7 +42,7 @@
 import org.aesh.readline.action.mappings.NoAction;
 import org.aesh.readline.action.mappings.PrevHistory;
 import org.aesh.readline.action.mappings.Undo;
-import org.aesh.terminal.Key;
+import org.aesh.readline.terminal.Key;
 import org.aesh.readline.action.mappings.DeleteBackwardWord;
 import org.aesh.readline.action.mappings.DeleteForwardWord;
 import org.aesh.readline.action.mappings.ForwardChar;

readline/src/main/java/org/aesh/readline/editing/Emacs.java

@@ -23,7 +23,7 @@
 import org.aesh.readline.action.ActionEvent;
 import org.aesh.readline.action.KeyAction;
 import org.aesh.readline.action.mappings.ActionMapper;
-import org.aesh.terminal.Key;
+import org.aesh.readline.terminal.Key;
 
 import java.util.ArrayList;
 import java.util.EnumMap;

readline/src/main/java/org/aesh/readline/editing/Vi.java

@@ -22,7 +22,7 @@
 
 import org.aesh.readline.action.KeyAction;
 import org.aesh.readline.action.mappings.ActionMapper;
-import org.aesh.terminal.Key;
+import org.aesh.readline.terminal.Key;
 import org.aesh.readline.action.Action;
 import org.aesh.readline.action.ActionEvent;
 

readline/src/main/java/org/aesh/terminal/Key.java → readline/src/main/java/org/aesh/readline/terminal/Key.java

@@ -17,10 +17,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal;
+package org.aesh.readline.terminal;
 
 import org.aesh.readline.action.KeyAction;
-import org.aesh.terminal.utils.InfoCmpHelper;
+import org.aesh.readline.terminal.utils.InfoCmpHelper;
 import org.aesh.util.Config;
 import org.aesh.util.Parser;
 

readline/src/main/java/org/aesh/terminal/TerminalBuilder.java → readline/src/main/java/org/aesh/readline/terminal/TerminalBuilder.java

@@ -17,16 +17,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal;
-
-import org.aesh.terminal.impl.CygwinPty;
-import org.aesh.terminal.impl.ExecPty;
-import org.aesh.terminal.impl.ExternalTerminal;
-import org.aesh.terminal.impl.PosixSysTerminal;
-import org.aesh.terminal.impl.Pty;
-import org.aesh.terminal.impl.WinExternalTerminal;
-import org.aesh.terminal.impl.WinSysTerminal;
-import org.aesh.terminal.utils.OSUtils;
+package org.aesh.readline.terminal;
+
+import org.aesh.readline.terminal.impl.CygwinPty;
+import org.aesh.readline.terminal.impl.ExecPty;
+import org.aesh.readline.terminal.impl.ExternalTerminal;
+import org.aesh.readline.terminal.impl.PosixSysTerminal;
+import org.aesh.readline.terminal.impl.Pty;
+import org.aesh.readline.terminal.impl.WinExternalTerminal;
+import org.aesh.readline.terminal.impl.WinSysTerminal;
+import org.aesh.readline.terminal.utils.OSUtils;
 import org.aesh.util.LoggerUtil;
 
 import java.io.IOException;
@@ -36,6 +36,7 @@
 import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.aesh.terminal.Terminal;
 
 public final class TerminalBuilder {
 

readline/src/main/java/org/aesh/terminal/formatting/CharacterType.java → readline/src/main/java/org/aesh/readline/terminal/formatting/CharacterType.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.formatting;
+package org.aesh.readline.terminal.formatting;
 
 /**
  * Define what kind of character type to display

readline/src/main/java/org/aesh/terminal/formatting/Color.java → readline/src/main/java/org/aesh/readline/terminal/formatting/Color.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.formatting;
+package org.aesh.readline.terminal.formatting;
 
 /**
  * @author <a href="mailto:[email protected]">Ståle W. Pedersen</a>

readline/src/main/java/org/aesh/terminal/formatting/TerminalCharacter.java → readline/src/main/java/org/aesh/readline/terminal/formatting/TerminalCharacter.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.formatting;
+package org.aesh.readline.terminal.formatting;
 
 import org.aesh.util.ANSI;
 

readline/src/main/java/org/aesh/terminal/formatting/TerminalColor.java → readline/src/main/java/org/aesh/readline/terminal/formatting/TerminalColor.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.formatting;
+package org.aesh.readline.terminal.formatting;
 
 import org.aesh.util.ANSI;
 

readline/src/main/java/org/aesh/terminal/formatting/TerminalString.java → readline/src/main/java/org/aesh/readline/terminal/formatting/TerminalString.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.formatting;
+package org.aesh.readline.terminal.formatting;
 
 import org.aesh.util.ANSI;
 import org.aesh.util.Parser;

readline/src/main/java/org/aesh/terminal/formatting/TerminalTextStyle.java → readline/src/main/java/org/aesh/readline/terminal/formatting/TerminalTextStyle.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.formatting;
+package org.aesh.readline.terminal.formatting;
 
 /**
  * Specify a text style.

readline/src/main/java/org/aesh/terminal/impl/AbstractPosixTerminal.java → readline/src/main/java/org/aesh/readline/terminal/impl/AbstractPosixTerminal.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.impl;
+package org.aesh.readline.terminal.impl;
 
 import org.aesh.terminal.Attributes;
 

readline/src/main/java/org/aesh/terminal/impl/AbstractTerminal.java → readline/src/main/java/org/aesh/readline/terminal/impl/AbstractTerminal.java

@@ -17,12 +17,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.impl;
+package org.aesh.readline.terminal.impl;
 
 import org.aesh.terminal.Attributes;
 import org.aesh.terminal.Terminal;
-import org.aesh.terminal.utils.Curses;
-import org.aesh.terminal.utils.InfoCmp;
+import org.aesh.readline.terminal.utils.Curses;
+import org.aesh.readline.terminal.utils.InfoCmp;
 import org.aesh.terminal.tty.Capability;
 import org.aesh.util.Config;
 import org.aesh.util.LoggerUtil;

readline/src/main/java/org/aesh/terminal/impl/AbstractWindowsTerminal.java → readline/src/main/java/org/aesh/readline/terminal/impl/AbstractWindowsTerminal.java

@@ -17,12 +17,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.impl;
+package org.aesh.readline.terminal.impl;
 
 import org.aesh.terminal.Attributes;
-import org.aesh.terminal.utils.Curses;
-import org.aesh.terminal.utils.ShutdownHooks;
-import org.aesh.terminal.utils.Signals;
+import org.aesh.readline.terminal.utils.Curses;
+import org.aesh.readline.terminal.utils.ShutdownHooks;
+import org.aesh.readline.terminal.utils.Signals;
 import org.aesh.terminal.tty.Capability;
 
 import java.io.FilterInputStream;

readline/src/main/java/org/aesh/terminal/impl/CygwinPty.java → readline/src/main/java/org/aesh/readline/terminal/impl/CygwinPty.java

@@ -17,11 +17,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.impl;
+package org.aesh.readline.terminal.impl;
 
 import org.aesh.terminal.Attributes;
-import org.aesh.terminal.utils.ExecHelper;
-import org.aesh.terminal.utils.OSUtils;
+import org.aesh.readline.terminal.utils.ExecHelper;
+import org.aesh.readline.terminal.utils.OSUtils;
 import org.aesh.util.LoggerUtil;
 
 import java.io.FileDescriptor;

readline/src/main/java/org/aesh/terminal/impl/ExecPty.java → readline/src/main/java/org/aesh/readline/terminal/impl/ExecPty.java

@@ -17,11 +17,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.impl;
+package org.aesh.readline.terminal.impl;
 
 import org.aesh.terminal.Attributes;
-import org.aesh.terminal.utils.ExecHelper;
-import org.aesh.terminal.utils.OSUtils;
+import org.aesh.readline.terminal.utils.ExecHelper;
+import org.aesh.readline.terminal.utils.OSUtils;
 import org.aesh.util.LoggerUtil;
 
 import java.io.FileInputStream;

readline/src/main/java/org/aesh/terminal/impl/ExternalTerminal.java → readline/src/main/java/org/aesh/readline/terminal/impl/ExternalTerminal.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.impl;
+package org.aesh.readline.terminal.impl;
 
 import java.io.IOException;
 import java.io.InputStream;

readline/src/main/java/org/aesh/terminal/impl/LineDisciplineTerminal.java → readline/src/main/java/org/aesh/readline/terminal/impl/LineDisciplineTerminal.java

@@ -17,9 +17,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.impl;
+package org.aesh.readline.terminal.impl;
 
-import org.aesh.terminal.utils.LinePipedInputStream;
+import org.aesh.readline.terminal.utils.LinePipedInputStream;
 import org.aesh.terminal.Attributes;
 import org.aesh.terminal.Terminal;
 

readline/src/main/java/org/aesh/terminal/impl/NativeSignalHandler.java → readline/src/main/java/org/aesh/readline/terminal/impl/NativeSignalHandler.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.impl;
+package org.aesh.readline.terminal.impl;
 
 import org.aesh.terminal.Terminal;
 import org.aesh.terminal.tty.Signal;

readline/src/main/java/org/aesh/terminal/impl/PosixSysTerminal.java → readline/src/main/java/org/aesh/readline/terminal/impl/PosixSysTerminal.java

@@ -17,10 +17,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.impl;
+package org.aesh.readline.terminal.impl;
 
-import org.aesh.terminal.utils.ShutdownHooks;
-import org.aesh.terminal.utils.Signals;
+import org.aesh.readline.terminal.utils.ShutdownHooks;
+import org.aesh.readline.terminal.utils.Signals;
 
 import java.io.IOException;
 import java.io.InputStream;

readline/src/main/java/org/aesh/terminal/impl/Pty.java → readline/src/main/java/org/aesh/readline/terminal/impl/Pty.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.impl;
+package org.aesh.readline.terminal.impl;
 
 import org.aesh.terminal.Attributes;
 

readline/src/main/java/org/aesh/terminal/impl/SignalHandlers.java → readline/src/main/java/org/aesh/readline/terminal/impl/SignalHandlers.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.aesh.terminal.impl;
+package org.aesh.readline.terminal.impl;
 
 import org.aesh.terminal.Terminal.SignalHandler;
 

readline/src/main/java/org/aesh/terminal/impl/WinExternalTerminal.java → readline/src/main/java/org/aesh/readline/terminal/impl/WinExternalTerminal.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.impl;
+package org.aesh.readline.terminal.impl;
 
 import org.aesh.terminal.Attributes;
 

readline/src/main/java/org/aesh/terminal/impl/WinSysTerminal.java → readline/src/main/java/org/aesh/readline/terminal/impl/WinSysTerminal.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.terminal.impl;
+package org.aesh.readline.terminal.impl;
 
 import java.io.FileDescriptor;
 import java.io.FileOutputStream;