From 9ed6fb26efba89331e8e1ec62c74eef731f75714 Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Fri, 17 Mar 2017 18:10:27 +0100 Subject: [PATCH] Big chunk of readline classes renaming to not collide with terminal API --- .../org/aesh/readline/AeshConsoleBuffer.java | 2 +- .../org/aesh/readline/InputProcessor.java | 2 +- .../main/java/org/aesh/readline/Prompt.java | 4 ++-- .../main/java/org/aesh/readline/Readline.java | 6 +++--- .../aesh/readline/action/ActionDecoder.java | 2 +- .../readline/action/mappings/Complete.java | 2 +- .../action/mappings/SearchHistory.java | 2 +- .../completion/CompleteOperation.java | 2 +- .../completion/CompleteOperationImpl.java | 2 +- .../completion/CompletionHandler.java | 2 +- .../org/aesh/readline/editing/EditMode.java | 2 +- .../readline/editing/EditModeBuilder.java | 2 +- .../java/org/aesh/readline/editing/Emacs.java | 2 +- .../java/org/aesh/readline/editing/Vi.java | 2 +- .../org/aesh/{ => readline}/terminal/Key.java | 4 ++-- .../terminal/TerminalBuilder.java | 21 ++++++++++--------- .../terminal/formatting/CharacterType.java | 2 +- .../terminal/formatting/Color.java | 2 +- .../formatting/TerminalCharacter.java | 2 +- .../terminal/formatting/TerminalColor.java | 2 +- .../terminal/formatting/TerminalString.java | 2 +- .../formatting/TerminalTextStyle.java | 2 +- .../terminal/impl/AbstractPosixTerminal.java | 2 +- .../terminal/impl/AbstractTerminal.java | 6 +++--- .../impl/AbstractWindowsTerminal.java | 8 +++---- .../terminal/impl/CygwinPty.java | 6 +++--- .../{ => readline}/terminal/impl/ExecPty.java | 6 +++--- .../terminal/impl/ExternalTerminal.java | 2 +- .../terminal/impl/LineDisciplineTerminal.java | 4 ++-- .../terminal/impl/NativeSignalHandler.java | 2 +- .../terminal/impl/PosixSysTerminal.java | 6 +++--- .../{ => readline}/terminal/impl/Pty.java | 2 +- .../terminal/impl/SignalHandlers.java | 2 +- .../terminal/impl/WinExternalTerminal.java | 2 +- .../terminal/impl/WinSysTerminal.java | 2 +- .../{ => readline}/terminal/utils/Curses.java | 2 +- .../terminal/utils/ExecHelper.java | 2 +- .../terminal/utils/InfoCmp.java | 2 +- .../terminal/utils/InfoCmpHelper.java | 2 +- .../terminal/utils/LinePipedInputStream.java | 2 +- .../terminal/utils/OSUtils.java | 2 +- .../terminal/utils/ShutdownHooks.java | 2 +- .../terminal/utils/Signals.java | 2 +- .../aesh/{ => readline}/tty/Connection.java | 2 +- .../tty/terminal/TerminalConnection.java | 6 +++--- .../src/main/java/org/aesh/util/ANSI.java | 2 +- .../src/main/java/org/aesh/util/Config.java | 2 +- .../src/main/java/org/aesh/util/Parser.java | 2 +- .../terminal/utils/ansi_caps.src | 0 .../terminal/utils/windows_caps.src | 0 .../terminal/utils/xterm-256color_caps.src | 0 .../terminal/utils/xterm_caps.src | 0 .../test/java/org/aesh/parser/ParserTest.java | 2 +- .../aesh/readline/CompletionReadlineTest.java | 4 ++-- .../org/aesh/readline/ConsoleBufferTest.java | 2 +- .../aesh/readline/MaskingReadlineTest.java | 4 ++-- .../aesh/readline/ParsingReadlineTest.java | 2 +- .../org/aesh/readline/PasteReadlineTest.java | 2 +- .../java/org/aesh/readline/ReadlineTest.java | 4 ++-- .../java/org/aesh/readline/TestTerminal.java | 4 ++-- .../org/aesh/readline/ThreadSafetyTest.java | 2 +- .../readline/alias/ReadlineAliasTest.java | 2 +- .../aesh/readline/editing/EmacsModeTest.java | 4 ++-- .../aesh/readline/editing/KeyMapperTest.java | 2 +- .../org/aesh/readline/editing/ViModeTest.java | 4 ++-- .../readline/example/SimpleTestExample.java | 2 +- .../aesh/readline/history/HistoryTest.java | 4 ++-- .../formatting/TerminalCharacterTest.java | 2 +- .../formatting/TerminalColorTest.java | 2 +- .../terminal/impl/ExecPtyTest.java | 2 +- .../terminal/utils/CursesTest.java | 2 +- .../terminal/utils/InfoCmpTest.java | 2 +- .../utils/LinePipedInputStreamTest.java | 2 +- .../{ => readline}/tty/TestConnection.java | 4 ++-- .../tty/TestTerminalConnection.java | 4 ++-- .../test/java/org/aesh/terminal/KeyTest.java | 1 + 76 files changed, 109 insertions(+), 107 deletions(-) rename readline/src/main/java/org/aesh/{ => readline}/terminal/Key.java (99%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/TerminalBuilder.java (92%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/formatting/CharacterType.java (96%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/formatting/Color.java (97%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/formatting/TerminalCharacter.java (98%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/formatting/TerminalColor.java (99%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/formatting/TerminalString.java (99%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/formatting/TerminalTextStyle.java (99%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/impl/AbstractPosixTerminal.java (98%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/impl/AbstractTerminal.java (97%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/impl/AbstractWindowsTerminal.java (98%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/impl/CygwinPty.java (98%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/impl/ExecPty.java (98%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/impl/ExternalTerminal.java (98%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/impl/LineDisciplineTerminal.java (98%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/impl/NativeSignalHandler.java (96%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/impl/PosixSysTerminal.java (94%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/impl/Pty.java (97%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/impl/SignalHandlers.java (91%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/impl/WinExternalTerminal.java (97%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/impl/WinSysTerminal.java (99%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/utils/Curses.java (99%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/utils/ExecHelper.java (98%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/utils/InfoCmp.java (99%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/utils/InfoCmpHelper.java (98%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/utils/LinePipedInputStream.java (98%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/utils/OSUtils.java (98%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/utils/ShutdownHooks.java (98%) rename readline/src/main/java/org/aesh/{ => readline}/terminal/utils/Signals.java (99%) rename readline/src/main/java/org/aesh/{ => readline}/tty/Connection.java (99%) rename readline/src/main/java/org/aesh/{ => readline}/tty/terminal/TerminalConnection.java (98%) rename readline/src/main/resources/org/aesh/{ => readline}/terminal/utils/ansi_caps.src (100%) rename readline/src/main/resources/org/aesh/{ => readline}/terminal/utils/windows_caps.src (100%) rename readline/src/main/resources/org/aesh/{ => readline}/terminal/utils/xterm-256color_caps.src (100%) rename readline/src/main/resources/org/aesh/{ => readline}/terminal/utils/xterm_caps.src (100%) rename readline/src/test/java/org/aesh/{ => readline}/terminal/formatting/TerminalCharacterTest.java (98%) rename readline/src/test/java/org/aesh/{ => readline}/terminal/formatting/TerminalColorTest.java (96%) rename readline/src/test/java/org/aesh/{ => readline}/terminal/impl/ExecPtyTest.java (99%) rename readline/src/test/java/org/aesh/{ => readline}/terminal/utils/CursesTest.java (97%) rename readline/src/test/java/org/aesh/{ => readline}/terminal/utils/InfoCmpTest.java (98%) rename readline/src/test/java/org/aesh/{ => readline}/terminal/utils/LinePipedInputStreamTest.java (98%) rename readline/src/test/java/org/aesh/{ => readline}/tty/TestConnection.java (99%) rename readline/src/test/java/org/aesh/{ => readline}/tty/TestTerminalConnection.java (98%) diff --git a/readline/src/main/java/org/aesh/readline/AeshConsoleBuffer.java b/readline/src/main/java/org/aesh/readline/AeshConsoleBuffer.java index 1d44b059..fde98e6f 100644 --- a/readline/src/main/java/org/aesh/readline/AeshConsoleBuffer.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/readline/InputProcessor.java b/readline/src/main/java/org/aesh/readline/InputProcessor.java index dca9c4ae..8a9da99c 100644 --- a/readline/src/main/java/org/aesh/readline/InputProcessor.java +++ b/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. diff --git a/readline/src/main/java/org/aesh/readline/Prompt.java b/readline/src/main/java/org/aesh/readline/Prompt.java index d5aabb85..682d53b2 100644 --- a/readline/src/main/java/org/aesh/readline/Prompt.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/readline/Readline.java b/readline/src/main/java/org/aesh/readline/Readline.java index 851ab6f3..aee8052a 100644 --- a/readline/src/main/java/org/aesh/readline/Readline.java +++ b/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. diff --git a/readline/src/main/java/org/aesh/readline/action/ActionDecoder.java b/readline/src/main/java/org/aesh/readline/action/ActionDecoder.java index c61f3f73..4348c16a 100644 --- a/readline/src/main/java/org/aesh/readline/action/ActionDecoder.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/readline/action/mappings/Complete.java b/readline/src/main/java/org/aesh/readline/action/mappings/Complete.java index 792315da..e1ffeef1 100644 --- a/readline/src/main/java/org/aesh/readline/action/mappings/Complete.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/readline/action/mappings/SearchHistory.java b/readline/src/main/java/org/aesh/readline/action/mappings/SearchHistory.java index ad58eecd..0687b76a 100644 --- a/readline/src/main/java/org/aesh/readline/action/mappings/SearchHistory.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/readline/completion/CompleteOperation.java b/readline/src/main/java/org/aesh/readline/completion/CompleteOperation.java index 4359d9fd..728aae74 100644 --- a/readline/src/main/java/org/aesh/readline/completion/CompleteOperation.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/readline/completion/CompleteOperationImpl.java b/readline/src/main/java/org/aesh/readline/completion/CompleteOperationImpl.java index 7b00155b..dc0808b7 100644 --- a/readline/src/main/java/org/aesh/readline/completion/CompleteOperationImpl.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/readline/completion/CompletionHandler.java b/readline/src/main/java/org/aesh/readline/completion/CompletionHandler.java index fd861b5b..7b5f4e85 100644 --- a/readline/src/main/java/org/aesh/readline/completion/CompletionHandler.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/readline/editing/EditMode.java b/readline/src/main/java/org/aesh/readline/editing/EditMode.java index 19299338..963ab291 100644 --- a/readline/src/main/java/org/aesh/readline/editing/EditMode.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/readline/editing/EditModeBuilder.java b/readline/src/main/java/org/aesh/readline/editing/EditModeBuilder.java index cee30858..d2cad51e 100644 --- a/readline/src/main/java/org/aesh/readline/editing/EditModeBuilder.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/readline/editing/Emacs.java b/readline/src/main/java/org/aesh/readline/editing/Emacs.java index d0aa26cc..1d2fb14d 100644 --- a/readline/src/main/java/org/aesh/readline/editing/Emacs.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/readline/editing/Vi.java b/readline/src/main/java/org/aesh/readline/editing/Vi.java index e2c41d77..17324965 100644 --- a/readline/src/main/java/org/aesh/readline/editing/Vi.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/Key.java b/readline/src/main/java/org/aesh/readline/terminal/Key.java similarity index 99% rename from readline/src/main/java/org/aesh/terminal/Key.java rename to readline/src/main/java/org/aesh/readline/terminal/Key.java index 68a1f042..0adf8ca7 100644 --- a/readline/src/main/java/org/aesh/terminal/Key.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/TerminalBuilder.java b/readline/src/main/java/org/aesh/readline/terminal/TerminalBuilder.java similarity index 92% rename from readline/src/main/java/org/aesh/terminal/TerminalBuilder.java rename to readline/src/main/java/org/aesh/readline/terminal/TerminalBuilder.java index 332a8fc6..280c4edf 100644 --- a/readline/src/main/java/org/aesh/terminal/TerminalBuilder.java +++ b/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 { diff --git a/readline/src/main/java/org/aesh/terminal/formatting/CharacterType.java b/readline/src/main/java/org/aesh/readline/terminal/formatting/CharacterType.java similarity index 96% rename from readline/src/main/java/org/aesh/terminal/formatting/CharacterType.java rename to readline/src/main/java/org/aesh/readline/terminal/formatting/CharacterType.java index 3b401d25..bcae068e 100644 --- a/readline/src/main/java/org/aesh/terminal/formatting/CharacterType.java +++ b/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 diff --git a/readline/src/main/java/org/aesh/terminal/formatting/Color.java b/readline/src/main/java/org/aesh/readline/terminal/formatting/Color.java similarity index 97% rename from readline/src/main/java/org/aesh/terminal/formatting/Color.java rename to readline/src/main/java/org/aesh/readline/terminal/formatting/Color.java index 7076b513..0bb578b0 100644 --- a/readline/src/main/java/org/aesh/terminal/formatting/Color.java +++ b/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 Ståle W. Pedersen diff --git a/readline/src/main/java/org/aesh/terminal/formatting/TerminalCharacter.java b/readline/src/main/java/org/aesh/readline/terminal/formatting/TerminalCharacter.java similarity index 98% rename from readline/src/main/java/org/aesh/terminal/formatting/TerminalCharacter.java rename to readline/src/main/java/org/aesh/readline/terminal/formatting/TerminalCharacter.java index 9fc2b297..2b6fb1d5 100644 --- a/readline/src/main/java/org/aesh/terminal/formatting/TerminalCharacter.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/formatting/TerminalColor.java b/readline/src/main/java/org/aesh/readline/terminal/formatting/TerminalColor.java similarity index 99% rename from readline/src/main/java/org/aesh/terminal/formatting/TerminalColor.java rename to readline/src/main/java/org/aesh/readline/terminal/formatting/TerminalColor.java index ee718e09..6d8d5cd3 100644 --- a/readline/src/main/java/org/aesh/terminal/formatting/TerminalColor.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/formatting/TerminalString.java b/readline/src/main/java/org/aesh/readline/terminal/formatting/TerminalString.java similarity index 99% rename from readline/src/main/java/org/aesh/terminal/formatting/TerminalString.java rename to readline/src/main/java/org/aesh/readline/terminal/formatting/TerminalString.java index f0244f43..5e89b8be 100644 --- a/readline/src/main/java/org/aesh/terminal/formatting/TerminalString.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/formatting/TerminalTextStyle.java b/readline/src/main/java/org/aesh/readline/terminal/formatting/TerminalTextStyle.java similarity index 99% rename from readline/src/main/java/org/aesh/terminal/formatting/TerminalTextStyle.java rename to readline/src/main/java/org/aesh/readline/terminal/formatting/TerminalTextStyle.java index e450136f..8812b62f 100644 --- a/readline/src/main/java/org/aesh/terminal/formatting/TerminalTextStyle.java +++ b/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. diff --git a/readline/src/main/java/org/aesh/terminal/impl/AbstractPosixTerminal.java b/readline/src/main/java/org/aesh/readline/terminal/impl/AbstractPosixTerminal.java similarity index 98% rename from readline/src/main/java/org/aesh/terminal/impl/AbstractPosixTerminal.java rename to readline/src/main/java/org/aesh/readline/terminal/impl/AbstractPosixTerminal.java index 537c70b9..a389aaf9 100644 --- a/readline/src/main/java/org/aesh/terminal/impl/AbstractPosixTerminal.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/impl/AbstractTerminal.java b/readline/src/main/java/org/aesh/readline/terminal/impl/AbstractTerminal.java similarity index 97% rename from readline/src/main/java/org/aesh/terminal/impl/AbstractTerminal.java rename to readline/src/main/java/org/aesh/readline/terminal/impl/AbstractTerminal.java index 4f4709b2..64bd2380 100644 --- a/readline/src/main/java/org/aesh/terminal/impl/AbstractTerminal.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/impl/AbstractWindowsTerminal.java b/readline/src/main/java/org/aesh/readline/terminal/impl/AbstractWindowsTerminal.java similarity index 98% rename from readline/src/main/java/org/aesh/terminal/impl/AbstractWindowsTerminal.java rename to readline/src/main/java/org/aesh/readline/terminal/impl/AbstractWindowsTerminal.java index 9a5d951e..efec4501 100644 --- a/readline/src/main/java/org/aesh/terminal/impl/AbstractWindowsTerminal.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/impl/CygwinPty.java b/readline/src/main/java/org/aesh/readline/terminal/impl/CygwinPty.java similarity index 98% rename from readline/src/main/java/org/aesh/terminal/impl/CygwinPty.java rename to readline/src/main/java/org/aesh/readline/terminal/impl/CygwinPty.java index f6a1467e..18118960 100644 --- a/readline/src/main/java/org/aesh/terminal/impl/CygwinPty.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/impl/ExecPty.java b/readline/src/main/java/org/aesh/readline/terminal/impl/ExecPty.java similarity index 98% rename from readline/src/main/java/org/aesh/terminal/impl/ExecPty.java rename to readline/src/main/java/org/aesh/readline/terminal/impl/ExecPty.java index dda9ef33..57916911 100644 --- a/readline/src/main/java/org/aesh/terminal/impl/ExecPty.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/impl/ExternalTerminal.java b/readline/src/main/java/org/aesh/readline/terminal/impl/ExternalTerminal.java similarity index 98% rename from readline/src/main/java/org/aesh/terminal/impl/ExternalTerminal.java rename to readline/src/main/java/org/aesh/readline/terminal/impl/ExternalTerminal.java index 2d5602be..5a7669de 100644 --- a/readline/src/main/java/org/aesh/terminal/impl/ExternalTerminal.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/impl/LineDisciplineTerminal.java b/readline/src/main/java/org/aesh/readline/terminal/impl/LineDisciplineTerminal.java similarity index 98% rename from readline/src/main/java/org/aesh/terminal/impl/LineDisciplineTerminal.java rename to readline/src/main/java/org/aesh/readline/terminal/impl/LineDisciplineTerminal.java index 972e8dbb..b88908c1 100644 --- a/readline/src/main/java/org/aesh/terminal/impl/LineDisciplineTerminal.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/impl/NativeSignalHandler.java b/readline/src/main/java/org/aesh/readline/terminal/impl/NativeSignalHandler.java similarity index 96% rename from readline/src/main/java/org/aesh/terminal/impl/NativeSignalHandler.java rename to readline/src/main/java/org/aesh/readline/terminal/impl/NativeSignalHandler.java index 3dcaedfe..8ea59ca9 100644 --- a/readline/src/main/java/org/aesh/terminal/impl/NativeSignalHandler.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/impl/PosixSysTerminal.java b/readline/src/main/java/org/aesh/readline/terminal/impl/PosixSysTerminal.java similarity index 94% rename from readline/src/main/java/org/aesh/terminal/impl/PosixSysTerminal.java rename to readline/src/main/java/org/aesh/readline/terminal/impl/PosixSysTerminal.java index deb6e638..210bc196 100644 --- a/readline/src/main/java/org/aesh/terminal/impl/PosixSysTerminal.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/impl/Pty.java b/readline/src/main/java/org/aesh/readline/terminal/impl/Pty.java similarity index 97% rename from readline/src/main/java/org/aesh/terminal/impl/Pty.java rename to readline/src/main/java/org/aesh/readline/terminal/impl/Pty.java index ff483848..72c76101 100644 --- a/readline/src/main/java/org/aesh/terminal/impl/Pty.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/impl/SignalHandlers.java b/readline/src/main/java/org/aesh/readline/terminal/impl/SignalHandlers.java similarity index 91% rename from readline/src/main/java/org/aesh/terminal/impl/SignalHandlers.java rename to readline/src/main/java/org/aesh/readline/terminal/impl/SignalHandlers.java index 1a7e447a..1afe7f91 100644 --- a/readline/src/main/java/org/aesh/terminal/impl/SignalHandlers.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/impl/WinExternalTerminal.java b/readline/src/main/java/org/aesh/readline/terminal/impl/WinExternalTerminal.java similarity index 97% rename from readline/src/main/java/org/aesh/terminal/impl/WinExternalTerminal.java rename to readline/src/main/java/org/aesh/readline/terminal/impl/WinExternalTerminal.java index 54540c12..b8e61ec3 100644 --- a/readline/src/main/java/org/aesh/terminal/impl/WinExternalTerminal.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/impl/WinSysTerminal.java b/readline/src/main/java/org/aesh/readline/terminal/impl/WinSysTerminal.java similarity index 99% rename from readline/src/main/java/org/aesh/terminal/impl/WinSysTerminal.java rename to readline/src/main/java/org/aesh/readline/terminal/impl/WinSysTerminal.java index 32c1f031..ffe8587e 100644 --- a/readline/src/main/java/org/aesh/terminal/impl/WinSysTerminal.java +++ b/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; diff --git a/readline/src/main/java/org/aesh/terminal/utils/Curses.java b/readline/src/main/java/org/aesh/readline/terminal/utils/Curses.java similarity index 99% rename from readline/src/main/java/org/aesh/terminal/utils/Curses.java rename to readline/src/main/java/org/aesh/readline/terminal/utils/Curses.java index a22ceba8..c1eb3439 100644 --- a/readline/src/main/java/org/aesh/terminal/utils/Curses.java +++ b/readline/src/main/java/org/aesh/readline/terminal/utils/Curses.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.terminal.utils; +package org.aesh.readline.terminal.utils; import java.io.IOException; import java.io.Writer; diff --git a/readline/src/main/java/org/aesh/terminal/utils/ExecHelper.java b/readline/src/main/java/org/aesh/readline/terminal/utils/ExecHelper.java similarity index 98% rename from readline/src/main/java/org/aesh/terminal/utils/ExecHelper.java rename to readline/src/main/java/org/aesh/readline/terminal/utils/ExecHelper.java index a87ddbd9..421a1156 100644 --- a/readline/src/main/java/org/aesh/terminal/utils/ExecHelper.java +++ b/readline/src/main/java/org/aesh/readline/terminal/utils/ExecHelper.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.terminal.utils; +package org.aesh.readline.terminal.utils; import java.io.ByteArrayOutputStream; import java.io.Closeable; diff --git a/readline/src/main/java/org/aesh/terminal/utils/InfoCmp.java b/readline/src/main/java/org/aesh/readline/terminal/utils/InfoCmp.java similarity index 99% rename from readline/src/main/java/org/aesh/terminal/utils/InfoCmp.java rename to readline/src/main/java/org/aesh/readline/terminal/utils/InfoCmp.java index 62bde4c9..409fd130 100644 --- a/readline/src/main/java/org/aesh/terminal/utils/InfoCmp.java +++ b/readline/src/main/java/org/aesh/readline/terminal/utils/InfoCmp.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.terminal.utils; +package org.aesh.readline.terminal.utils; import org.aesh.terminal.tty.Capability; diff --git a/readline/src/main/java/org/aesh/terminal/utils/InfoCmpHelper.java b/readline/src/main/java/org/aesh/readline/terminal/utils/InfoCmpHelper.java similarity index 98% rename from readline/src/main/java/org/aesh/terminal/utils/InfoCmpHelper.java rename to readline/src/main/java/org/aesh/readline/terminal/utils/InfoCmpHelper.java index 7c4512d4..cb7b91d8 100644 --- a/readline/src/main/java/org/aesh/terminal/utils/InfoCmpHelper.java +++ b/readline/src/main/java/org/aesh/readline/terminal/utils/InfoCmpHelper.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.terminal.utils; +package org.aesh.readline.terminal.utils; import org.aesh.terminal.tty.Capability; import org.aesh.util.Config; diff --git a/readline/src/main/java/org/aesh/terminal/utils/LinePipedInputStream.java b/readline/src/main/java/org/aesh/readline/terminal/utils/LinePipedInputStream.java similarity index 98% rename from readline/src/main/java/org/aesh/terminal/utils/LinePipedInputStream.java rename to readline/src/main/java/org/aesh/readline/terminal/utils/LinePipedInputStream.java index b7f9363d..359756ec 100644 --- a/readline/src/main/java/org/aesh/terminal/utils/LinePipedInputStream.java +++ b/readline/src/main/java/org/aesh/readline/terminal/utils/LinePipedInputStream.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.terminal.utils; +package org.aesh.readline.terminal.utils; import java.io.IOException; import java.io.PipedInputStream; diff --git a/readline/src/main/java/org/aesh/terminal/utils/OSUtils.java b/readline/src/main/java/org/aesh/readline/terminal/utils/OSUtils.java similarity index 98% rename from readline/src/main/java/org/aesh/terminal/utils/OSUtils.java rename to readline/src/main/java/org/aesh/readline/terminal/utils/OSUtils.java index 3c3ebe9d..217826fd 100644 --- a/readline/src/main/java/org/aesh/terminal/utils/OSUtils.java +++ b/readline/src/main/java/org/aesh/readline/terminal/utils/OSUtils.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.terminal.utils; +package org.aesh.readline.terminal.utils; import java.io.File; diff --git a/readline/src/main/java/org/aesh/terminal/utils/ShutdownHooks.java b/readline/src/main/java/org/aesh/readline/terminal/utils/ShutdownHooks.java similarity index 98% rename from readline/src/main/java/org/aesh/terminal/utils/ShutdownHooks.java rename to readline/src/main/java/org/aesh/readline/terminal/utils/ShutdownHooks.java index fd66670f..c98a7b2c 100644 --- a/readline/src/main/java/org/aesh/terminal/utils/ShutdownHooks.java +++ b/readline/src/main/java/org/aesh/readline/terminal/utils/ShutdownHooks.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.terminal.utils; +package org.aesh.readline.terminal.utils; import org.aesh.util.LoggerUtil; diff --git a/readline/src/main/java/org/aesh/terminal/utils/Signals.java b/readline/src/main/java/org/aesh/readline/terminal/utils/Signals.java similarity index 99% rename from readline/src/main/java/org/aesh/terminal/utils/Signals.java rename to readline/src/main/java/org/aesh/readline/terminal/utils/Signals.java index 2ffd0b54..e7b97986 100644 --- a/readline/src/main/java/org/aesh/terminal/utils/Signals.java +++ b/readline/src/main/java/org/aesh/readline/terminal/utils/Signals.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.terminal.utils; +package org.aesh.readline.terminal.utils; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; diff --git a/readline/src/main/java/org/aesh/tty/Connection.java b/readline/src/main/java/org/aesh/readline/tty/Connection.java similarity index 99% rename from readline/src/main/java/org/aesh/tty/Connection.java rename to readline/src/main/java/org/aesh/readline/tty/Connection.java index a5d148c9..3161592b 100644 --- a/readline/src/main/java/org/aesh/tty/Connection.java +++ b/readline/src/main/java/org/aesh/readline/tty/Connection.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.tty; +package org.aesh.readline.tty; import org.aesh.terminal.tty.Size; import org.aesh.terminal.tty.Capability; diff --git a/readline/src/main/java/org/aesh/tty/terminal/TerminalConnection.java b/readline/src/main/java/org/aesh/readline/tty/terminal/TerminalConnection.java similarity index 98% rename from readline/src/main/java/org/aesh/tty/terminal/TerminalConnection.java rename to readline/src/main/java/org/aesh/readline/tty/terminal/TerminalConnection.java index 93d8810f..3a6692c7 100644 --- a/readline/src/main/java/org/aesh/tty/terminal/TerminalConnection.java +++ b/readline/src/main/java/org/aesh/readline/tty/terminal/TerminalConnection.java @@ -17,15 +17,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.tty.terminal; +package org.aesh.readline.tty.terminal; import org.aesh.io.Decoder; import org.aesh.io.Encoder; import org.aesh.terminal.Attributes; import org.aesh.terminal.Terminal; -import org.aesh.terminal.TerminalBuilder; +import org.aesh.readline.terminal.TerminalBuilder; import org.aesh.terminal.tty.Capability; -import org.aesh.tty.Connection; +import org.aesh.readline.tty.Connection; import org.aesh.util.LoggerUtil; import java.io.IOException; diff --git a/readline/src/main/java/org/aesh/util/ANSI.java b/readline/src/main/java/org/aesh/util/ANSI.java index 905f37fd..b1d28b3c 100644 --- a/readline/src/main/java/org/aesh/util/ANSI.java +++ b/readline/src/main/java/org/aesh/util/ANSI.java @@ -19,7 +19,7 @@ */ package org.aesh.util; -import org.aesh.terminal.utils.InfoCmpHelper; +import org.aesh.readline.terminal.utils.InfoCmpHelper; import java.util.Arrays; diff --git a/readline/src/main/java/org/aesh/util/Config.java b/readline/src/main/java/org/aesh/util/Config.java index 0c1bb9a8..6b5d62d3 100644 --- a/readline/src/main/java/org/aesh/util/Config.java +++ b/readline/src/main/java/org/aesh/util/Config.java @@ -19,7 +19,7 @@ */ package org.aesh.util; -import org.aesh.terminal.utils.OSUtils; +import org.aesh.readline.terminal.utils.OSUtils; /** * diff --git a/readline/src/main/java/org/aesh/util/Parser.java b/readline/src/main/java/org/aesh/util/Parser.java index c1e61ee9..4c5aca8f 100644 --- a/readline/src/main/java/org/aesh/util/Parser.java +++ b/readline/src/main/java/org/aesh/util/Parser.java @@ -20,7 +20,7 @@ package org.aesh.util; import org.aesh.readline.completion.CompleteOperation; -import org.aesh.terminal.formatting.TerminalString; +import org.aesh.readline.terminal.formatting.TerminalString; import java.util.ArrayList; import java.util.Arrays; diff --git a/readline/src/main/resources/org/aesh/terminal/utils/ansi_caps.src b/readline/src/main/resources/org/aesh/readline/terminal/utils/ansi_caps.src similarity index 100% rename from readline/src/main/resources/org/aesh/terminal/utils/ansi_caps.src rename to readline/src/main/resources/org/aesh/readline/terminal/utils/ansi_caps.src diff --git a/readline/src/main/resources/org/aesh/terminal/utils/windows_caps.src b/readline/src/main/resources/org/aesh/readline/terminal/utils/windows_caps.src similarity index 100% rename from readline/src/main/resources/org/aesh/terminal/utils/windows_caps.src rename to readline/src/main/resources/org/aesh/readline/terminal/utils/windows_caps.src diff --git a/readline/src/main/resources/org/aesh/terminal/utils/xterm-256color_caps.src b/readline/src/main/resources/org/aesh/readline/terminal/utils/xterm-256color_caps.src similarity index 100% rename from readline/src/main/resources/org/aesh/terminal/utils/xterm-256color_caps.src rename to readline/src/main/resources/org/aesh/readline/terminal/utils/xterm-256color_caps.src diff --git a/readline/src/main/resources/org/aesh/terminal/utils/xterm_caps.src b/readline/src/main/resources/org/aesh/readline/terminal/utils/xterm_caps.src similarity index 100% rename from readline/src/main/resources/org/aesh/terminal/utils/xterm_caps.src rename to readline/src/main/resources/org/aesh/readline/terminal/utils/xterm_caps.src diff --git a/readline/src/test/java/org/aesh/parser/ParserTest.java b/readline/src/test/java/org/aesh/parser/ParserTest.java index 95e8e1bd..3144eb0e 100644 --- a/readline/src/test/java/org/aesh/parser/ParserTest.java +++ b/readline/src/test/java/org/aesh/parser/ParserTest.java @@ -19,7 +19,7 @@ */ package org.aesh.parser; -import org.aesh.terminal.formatting.TerminalString; +import org.aesh.readline.terminal.formatting.TerminalString; import org.aesh.util.ANSI; import org.aesh.util.Config; import org.aesh.util.Parser; diff --git a/readline/src/test/java/org/aesh/readline/CompletionReadlineTest.java b/readline/src/test/java/org/aesh/readline/CompletionReadlineTest.java index 1ea12122..0ee24e8c 100644 --- a/readline/src/test/java/org/aesh/readline/CompletionReadlineTest.java +++ b/readline/src/test/java/org/aesh/readline/CompletionReadlineTest.java @@ -20,8 +20,8 @@ package org.aesh.readline; import org.aesh.readline.completion.Completion; -import org.aesh.terminal.Key; -import org.aesh.tty.TestConnection; +import org.aesh.readline.terminal.Key; +import org.aesh.readline.tty.TestConnection; import org.aesh.util.Config; import org.junit.Test; diff --git a/readline/src/test/java/org/aesh/readline/ConsoleBufferTest.java b/readline/src/test/java/org/aesh/readline/ConsoleBufferTest.java index 45754884..4cb60565 100644 --- a/readline/src/test/java/org/aesh/readline/ConsoleBufferTest.java +++ b/readline/src/test/java/org/aesh/readline/ConsoleBufferTest.java @@ -24,7 +24,7 @@ import org.aesh.readline.editing.EditModeBuilder; import org.aesh.readline.history.InMemoryHistory; import org.aesh.terminal.tty.Capability; -import org.aesh.tty.Connection; +import org.aesh.readline.tty.Connection; import org.junit.Test; import java.io.IOException; diff --git a/readline/src/test/java/org/aesh/readline/MaskingReadlineTest.java b/readline/src/test/java/org/aesh/readline/MaskingReadlineTest.java index 7f724169..69edd7f9 100644 --- a/readline/src/test/java/org/aesh/readline/MaskingReadlineTest.java +++ b/readline/src/test/java/org/aesh/readline/MaskingReadlineTest.java @@ -19,8 +19,8 @@ */ package org.aesh.readline; -import org.aesh.terminal.Key; -import org.aesh.tty.TestConnection; +import org.aesh.readline.terminal.Key; +import org.aesh.readline.tty.TestConnection; import org.aesh.util.Parser; import org.junit.Test; diff --git a/readline/src/test/java/org/aesh/readline/ParsingReadlineTest.java b/readline/src/test/java/org/aesh/readline/ParsingReadlineTest.java index 5858235c..5bc18d61 100644 --- a/readline/src/test/java/org/aesh/readline/ParsingReadlineTest.java +++ b/readline/src/test/java/org/aesh/readline/ParsingReadlineTest.java @@ -19,7 +19,7 @@ */ package org.aesh.readline; -import org.aesh.tty.TestConnection; +import org.aesh.readline.tty.TestConnection; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/readline/src/test/java/org/aesh/readline/PasteReadlineTest.java b/readline/src/test/java/org/aesh/readline/PasteReadlineTest.java index ccc7e7de..476a35aa 100644 --- a/readline/src/test/java/org/aesh/readline/PasteReadlineTest.java +++ b/readline/src/test/java/org/aesh/readline/PasteReadlineTest.java @@ -19,7 +19,7 @@ */ package org.aesh.readline; -import org.aesh.tty.TestConnection; +import org.aesh.readline.tty.TestConnection; import org.aesh.util.Config; import org.junit.Test; diff --git a/readline/src/test/java/org/aesh/readline/ReadlineTest.java b/readline/src/test/java/org/aesh/readline/ReadlineTest.java index de0f2404..fe3ad45c 100644 --- a/readline/src/test/java/org/aesh/readline/ReadlineTest.java +++ b/readline/src/test/java/org/aesh/readline/ReadlineTest.java @@ -21,8 +21,8 @@ import org.aesh.readline.completion.Completion; import org.aesh.readline.editing.EditModeBuilder; -import org.aesh.terminal.Key; -import org.aesh.tty.TestConnection; +import org.aesh.readline.terminal.Key; +import org.aesh.readline.tty.TestConnection; import org.aesh.util.Config; import org.junit.Test; diff --git a/readline/src/test/java/org/aesh/readline/TestTerminal.java b/readline/src/test/java/org/aesh/readline/TestTerminal.java index 266602d6..b5296a59 100644 --- a/readline/src/test/java/org/aesh/readline/TestTerminal.java +++ b/readline/src/test/java/org/aesh/readline/TestTerminal.java @@ -20,8 +20,8 @@ package org.aesh.readline; import org.aesh.terminal.Terminal; -import org.aesh.terminal.impl.LineDisciplineTerminal; -import org.aesh.tty.terminal.TerminalConnection; +import org.aesh.readline.terminal.impl.LineDisciplineTerminal; +import org.aesh.readline.tty.terminal.TerminalConnection; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/readline/src/test/java/org/aesh/readline/ThreadSafetyTest.java b/readline/src/test/java/org/aesh/readline/ThreadSafetyTest.java index b51682f0..bca23e40 100644 --- a/readline/src/test/java/org/aesh/readline/ThreadSafetyTest.java +++ b/readline/src/test/java/org/aesh/readline/ThreadSafetyTest.java @@ -19,7 +19,7 @@ */ package org.aesh.readline; -import org.aesh.tty.TestConnection; +import org.aesh.readline.tty.TestConnection; import org.aesh.util.Config; import org.junit.Assume; import org.junit.Test; diff --git a/readline/src/test/java/org/aesh/readline/alias/ReadlineAliasTest.java b/readline/src/test/java/org/aesh/readline/alias/ReadlineAliasTest.java index 6646fa2a..bab60332 100644 --- a/readline/src/test/java/org/aesh/readline/alias/ReadlineAliasTest.java +++ b/readline/src/test/java/org/aesh/readline/alias/ReadlineAliasTest.java @@ -22,7 +22,7 @@ import org.aesh.util.Config; import org.aesh.readline.Prompt; import org.aesh.readline.Readline; -import org.aesh.tty.terminal.TerminalConnection; +import org.aesh.readline.tty.terminal.TerminalConnection; import org.junit.Test; import java.io.ByteArrayOutputStream; diff --git a/readline/src/test/java/org/aesh/readline/editing/EmacsModeTest.java b/readline/src/test/java/org/aesh/readline/editing/EmacsModeTest.java index 94ebae38..51c54e94 100644 --- a/readline/src/test/java/org/aesh/readline/editing/EmacsModeTest.java +++ b/readline/src/test/java/org/aesh/readline/editing/EmacsModeTest.java @@ -19,8 +19,8 @@ */ package org.aesh.readline.editing; -import org.aesh.terminal.Key; -import org.aesh.tty.TestConnection; +import org.aesh.readline.terminal.Key; +import org.aesh.readline.tty.TestConnection; import org.junit.Test; /** diff --git a/readline/src/test/java/org/aesh/readline/editing/KeyMapperTest.java b/readline/src/test/java/org/aesh/readline/editing/KeyMapperTest.java index afb747c4..7430ac43 100644 --- a/readline/src/test/java/org/aesh/readline/editing/KeyMapperTest.java +++ b/readline/src/test/java/org/aesh/readline/editing/KeyMapperTest.java @@ -27,7 +27,7 @@ import org.aesh.readline.action.mappings.NextHistory; import org.aesh.readline.action.mappings.NoAction; import org.aesh.readline.action.mappings.PrevHistory; -import org.aesh.terminal.Key; +import org.aesh.readline.terminal.Key; import org.aesh.util.Config; import org.junit.Test; diff --git a/readline/src/test/java/org/aesh/readline/editing/ViModeTest.java b/readline/src/test/java/org/aesh/readline/editing/ViModeTest.java index f8e16c99..e09baae6 100644 --- a/readline/src/test/java/org/aesh/readline/editing/ViModeTest.java +++ b/readline/src/test/java/org/aesh/readline/editing/ViModeTest.java @@ -19,8 +19,8 @@ */ package org.aesh.readline.editing; -import org.aesh.terminal.Key; -import org.aesh.tty.TestConnection; +import org.aesh.readline.terminal.Key; +import org.aesh.readline.tty.TestConnection; import org.junit.Test; /** diff --git a/readline/src/test/java/org/aesh/readline/example/SimpleTestExample.java b/readline/src/test/java/org/aesh/readline/example/SimpleTestExample.java index 5b22c882..dadb1238 100644 --- a/readline/src/test/java/org/aesh/readline/example/SimpleTestExample.java +++ b/readline/src/test/java/org/aesh/readline/example/SimpleTestExample.java @@ -21,7 +21,7 @@ import org.aesh.readline.Readline; import org.aesh.readline.ReadlineBuilder; -import org.aesh.tty.terminal.TerminalConnection; +import org.aesh.readline.tty.terminal.TerminalConnection; import java.io.IOException; diff --git a/readline/src/test/java/org/aesh/readline/history/HistoryTest.java b/readline/src/test/java/org/aesh/readline/history/HistoryTest.java index 60c10b41..2edb3311 100644 --- a/readline/src/test/java/org/aesh/readline/history/HistoryTest.java +++ b/readline/src/test/java/org/aesh/readline/history/HistoryTest.java @@ -19,8 +19,8 @@ */ package org.aesh.readline.history; -import org.aesh.terminal.Key; -import org.aesh.tty.TestConnection; +import org.aesh.readline.terminal.Key; +import org.aesh.readline.tty.TestConnection; import org.aesh.util.Config; import org.aesh.util.FileAccessPermission; import org.aesh.util.Parser; diff --git a/readline/src/test/java/org/aesh/terminal/formatting/TerminalCharacterTest.java b/readline/src/test/java/org/aesh/readline/terminal/formatting/TerminalCharacterTest.java similarity index 98% rename from readline/src/test/java/org/aesh/terminal/formatting/TerminalCharacterTest.java rename to readline/src/test/java/org/aesh/readline/terminal/formatting/TerminalCharacterTest.java index 61ce2781..6fc6f42d 100644 --- a/readline/src/test/java/org/aesh/terminal/formatting/TerminalCharacterTest.java +++ b/readline/src/test/java/org/aesh/readline/terminal/formatting/TerminalCharacterTest.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.junit.Test; diff --git a/readline/src/test/java/org/aesh/terminal/formatting/TerminalColorTest.java b/readline/src/test/java/org/aesh/readline/terminal/formatting/TerminalColorTest.java similarity index 96% rename from readline/src/test/java/org/aesh/terminal/formatting/TerminalColorTest.java rename to readline/src/test/java/org/aesh/readline/terminal/formatting/TerminalColorTest.java index 569d8235..34f4daff 100644 --- a/readline/src/test/java/org/aesh/terminal/formatting/TerminalColorTest.java +++ b/readline/src/test/java/org/aesh/readline/terminal/formatting/TerminalColorTest.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.junit.Test; diff --git a/readline/src/test/java/org/aesh/terminal/impl/ExecPtyTest.java b/readline/src/test/java/org/aesh/readline/terminal/impl/ExecPtyTest.java similarity index 99% rename from readline/src/test/java/org/aesh/terminal/impl/ExecPtyTest.java rename to readline/src/test/java/org/aesh/readline/terminal/impl/ExecPtyTest.java index 9a68603d..b9c08935 100644 --- a/readline/src/test/java/org/aesh/terminal/impl/ExecPtyTest.java +++ b/readline/src/test/java/org/aesh/readline/terminal/impl/ExecPtyTest.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; import org.aesh.terminal.Attributes.ControlChar; diff --git a/readline/src/test/java/org/aesh/terminal/utils/CursesTest.java b/readline/src/test/java/org/aesh/readline/terminal/utils/CursesTest.java similarity index 97% rename from readline/src/test/java/org/aesh/terminal/utils/CursesTest.java rename to readline/src/test/java/org/aesh/readline/terminal/utils/CursesTest.java index 80ef1e33..dc50a551 100644 --- a/readline/src/test/java/org/aesh/terminal/utils/CursesTest.java +++ b/readline/src/test/java/org/aesh/readline/terminal/utils/CursesTest.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.terminal.utils; +package org.aesh.readline.terminal.utils; import org.junit.Test; diff --git a/readline/src/test/java/org/aesh/terminal/utils/InfoCmpTest.java b/readline/src/test/java/org/aesh/readline/terminal/utils/InfoCmpTest.java similarity index 98% rename from readline/src/test/java/org/aesh/terminal/utils/InfoCmpTest.java rename to readline/src/test/java/org/aesh/readline/terminal/utils/InfoCmpTest.java index 7c7311cb..857384ed 100644 --- a/readline/src/test/java/org/aesh/terminal/utils/InfoCmpTest.java +++ b/readline/src/test/java/org/aesh/readline/terminal/utils/InfoCmpTest.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.terminal.utils; +package org.aesh.readline.terminal.utils; import org.aesh.terminal.tty.Capability; import org.aesh.util.Config; diff --git a/readline/src/test/java/org/aesh/terminal/utils/LinePipedInputStreamTest.java b/readline/src/test/java/org/aesh/readline/terminal/utils/LinePipedInputStreamTest.java similarity index 98% rename from readline/src/test/java/org/aesh/terminal/utils/LinePipedInputStreamTest.java rename to readline/src/test/java/org/aesh/readline/terminal/utils/LinePipedInputStreamTest.java index 298741a5..033455f3 100644 --- a/readline/src/test/java/org/aesh/terminal/utils/LinePipedInputStreamTest.java +++ b/readline/src/test/java/org/aesh/readline/terminal/utils/LinePipedInputStreamTest.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.terminal.utils; +package org.aesh.readline.terminal.utils; import org.aesh.util.Config; import org.junit.Assume; diff --git a/readline/src/test/java/org/aesh/tty/TestConnection.java b/readline/src/test/java/org/aesh/readline/tty/TestConnection.java similarity index 99% rename from readline/src/test/java/org/aesh/tty/TestConnection.java rename to readline/src/test/java/org/aesh/readline/tty/TestConnection.java index ddc3bcbb..83b2d7f9 100644 --- a/readline/src/test/java/org/aesh/tty/TestConnection.java +++ b/readline/src/test/java/org/aesh/readline/tty/TestConnection.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.tty; +package org.aesh.readline.tty; import org.aesh.terminal.tty.Size; import org.aesh.terminal.tty.Capability; @@ -27,7 +27,7 @@ import org.aesh.readline.completion.Completion; import org.aesh.readline.editing.EditMode; import org.aesh.readline.editing.EditModeBuilder; -import org.aesh.terminal.Key; +import org.aesh.readline.terminal.Key; import org.aesh.util.Parser; import java.nio.charset.Charset; diff --git a/readline/src/test/java/org/aesh/tty/TestTerminalConnection.java b/readline/src/test/java/org/aesh/readline/tty/TestTerminalConnection.java similarity index 98% rename from readline/src/test/java/org/aesh/tty/TestTerminalConnection.java rename to readline/src/test/java/org/aesh/readline/tty/TestTerminalConnection.java index cf466df3..d1e4d153 100644 --- a/readline/src/test/java/org/aesh/tty/TestTerminalConnection.java +++ b/readline/src/test/java/org/aesh/readline/tty/TestTerminalConnection.java @@ -17,13 +17,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.aesh.tty; +package org.aesh.readline.tty; import org.aesh.util.Config; import org.aesh.readline.Prompt; import org.aesh.readline.Readline; import org.aesh.readline.TestTerminal; -import org.aesh.tty.terminal.TerminalConnection; +import org.aesh.readline.tty.terminal.TerminalConnection; import org.junit.Assert; import org.junit.Test; diff --git a/readline/src/test/java/org/aesh/terminal/KeyTest.java b/readline/src/test/java/org/aesh/terminal/KeyTest.java index d642c78d..934e566c 100644 --- a/readline/src/test/java/org/aesh/terminal/KeyTest.java +++ b/readline/src/test/java/org/aesh/terminal/KeyTest.java @@ -19,6 +19,7 @@ */ package org.aesh.terminal; +import org.aesh.readline.terminal.Key; import org.aesh.readline.action.mappings.ActionMapper; import org.aesh.util.Config; import org.aesh.readline.action.Action;