Skip to content

upgraded to aesh-readline 3.0 #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stalep merged 1 commit into from
Feb 4, 2026
Merged

upgraded to aesh-readline 3.0 #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/AeshRuntimeRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.aesh.command.validator.CommandValidatorException;
import org.aesh.command.validator.OptionValidatorException;
import org.aesh.console.ShellImpl;
import org.aesh.readline.tty.terminal.TerminalConnection;
import org.aesh.terminal.tty.TerminalConnection;
import org.aesh.terminal.Connection;

/**
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/CommandRuntime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.aesh.complete.AeshCompleteOperation;
import org.aesh.console.AeshContext;
import org.aesh.command.registry.CommandRegistry;
import org.aesh.readline.util.Parser;
import org.aesh.terminal.utils.Parser;

/**
* An Aesh Command processor.
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/completer/CompleterInvocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import org.aesh.console.AeshContext;
import org.aesh.command.Command;
import org.aesh.readline.terminal.formatting.TerminalString;
import org.aesh.terminal.formatting.TerminalString;

import java.util.Collection;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/export/ExportCompletion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.aesh.parser.LineParser;
import org.aesh.readline.completion.CompleteOperation;
import org.aesh.readline.completion.Completion;
import org.aesh.readline.util.Parser;
import org.aesh.terminal.utils.Parser;

/**
* @author <a href="mailto:stale.pedersen@jboss.org">Ståle W. Pedersen</a>
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/export/ExportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
package org.aesh.command.export;

import org.aesh.readline.util.LoggerUtil;
import org.aesh.terminal.utils.LoggerUtil;
import org.aesh.terminal.utils.Config;

import java.io.BufferedReader;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/impl/Executions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
import org.aesh.parser.ParsedLine;
import org.aesh.console.AeshContext;
import org.aesh.readline.Prompt;
import org.aesh.readline.terminal.formatting.TerminalString;
import org.aesh.terminal.formatting.TerminalString;
import org.aesh.selector.Selector;

import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/impl/completer/CompleterData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.aesh.console.AeshContext;
import org.aesh.command.Command;
import org.aesh.command.completer.CompleterInvocation;
import org.aesh.readline.terminal.formatting.TerminalString;
import org.aesh.terminal.formatting.TerminalString;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/impl/completer/DefaultValueOptionCompleter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import org.aesh.command.completer.CompleterInvocation;
import org.aesh.command.completer.OptionCompleter;
import org.aesh.readline.util.Parser;
import org.aesh.terminal.utils.Parser;

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions aesh/src/main/java/org/aesh/command/impl/internal/ProcessedCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import org.aesh.command.populator.CommandPopulator;
import org.aesh.command.result.ResultHandler;
import org.aesh.command.validator.CommandValidator;
import org.aesh.readline.terminal.formatting.TerminalString;
import org.aesh.readline.util.Parser;
import org.aesh.terminal.formatting.TerminalString;
import org.aesh.terminal.utils.Parser;
import org.aesh.selector.SelectorType;
import org.aesh.terminal.utils.Config;

Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/impl/internal/ProcessedOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.aesh.io.Resource;
import org.aesh.console.AeshContext;
import org.aesh.io.PipelineResource;
import org.aesh.readline.terminal.formatting.TerminalString;
import org.aesh.terminal.formatting.TerminalString;
import org.aesh.selector.SelectorType;
import org.aesh.terminal.utils.ANSI;
import org.aesh.util.PropertiesLookup;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/impl/invocation/AeshCommandInvocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import org.aesh.console.Console;
import org.aesh.console.ReadlineConsole;
import org.aesh.readline.Prompt;
import org.aesh.readline.action.KeyAction;
import org.aesh.terminal.KeyAction;

/**
* @author <a href="mailto:stale.pedersen@jboss.org">Ståle W. Pedersen</a>
Expand Down
6 changes: 3 additions & 3 deletions aesh/src/main/java/org/aesh/command/impl/invocation/DefaultCommandInvocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
import org.aesh.command.validator.CommandValidatorException;
import org.aesh.command.validator.OptionValidatorException;
import org.aesh.readline.Prompt;
import org.aesh.readline.action.KeyAction;
import org.aesh.readline.terminal.Key;
import org.aesh.readline.util.Parser;
import org.aesh.terminal.KeyAction;
import org.aesh.terminal.Key;
import org.aesh.terminal.utils.Parser;
import org.aesh.terminal.tty.Size;
import org.aesh.terminal.utils.ANSI;

Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/impl/operator/OutputDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import java.io.BufferedWriter;
import java.io.IOException;
import org.aesh.readline.util.Parser;
import org.aesh.terminal.utils.Parser;

/**
*
Expand Down
4 changes: 2 additions & 2 deletions aesh/src/main/java/org/aesh/command/impl/parser/AeshCommandLineCompletionParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
import org.aesh.parser.ParsedWord;
import org.aesh.parser.ParserStatus;
import org.aesh.console.AeshContext;
import org.aesh.readline.terminal.formatting.TerminalString;
import org.aesh.readline.util.Parser;
import org.aesh.terminal.formatting.TerminalString;
import org.aesh.terminal.utils.Parser;
import org.aesh.selector.SelectorType;

import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/impl/parser/AeshOptionParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.aesh.command.parser.OptionParser;
import org.aesh.command.parser.OptionParserException;
import org.aesh.parser.ParsedLineIterator;
import org.aesh.readline.util.Parser;
import org.aesh.terminal.utils.Parser;

/**
* @author <a href="mailto:stale.pedersen@jboss.org">Ståle W. Pedersen</a>
Expand Down
4 changes: 2 additions & 2 deletions aesh/src/main/java/org/aesh/command/impl/renderer/NullOptionRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
package org.aesh.command.impl.renderer;

import org.aesh.command.renderer.OptionRenderer;
import org.aesh.readline.terminal.formatting.TerminalColor;
import org.aesh.readline.terminal.formatting.TerminalTextStyle;
import org.aesh.terminal.formatting.TerminalColor;
import org.aesh.terminal.formatting.TerminalTextStyle;

/**
* @author <a href="mailto:stale.pedersen@jboss.org">Ståle W. Pedersen</a>
Expand Down
4 changes: 2 additions & 2 deletions aesh/src/main/java/org/aesh/command/impl/shell/ShellOutputDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import org.aesh.command.impl.operator.OutputDelegate;
import org.aesh.command.shell.Shell;
import org.aesh.readline.Prompt;
import org.aesh.readline.terminal.Key;
import org.aesh.terminal.Key;
import org.aesh.terminal.tty.Size;
import org.aesh.readline.util.Parser;
import org.aesh.terminal.utils.Parser;
import org.aesh.terminal.utils.Config;

import java.util.concurrent.TimeUnit;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/invocation/CommandInvocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import org.aesh.command.CommandException;
import org.aesh.command.CommandNotFoundException;
import org.aesh.readline.Prompt;
import org.aesh.readline.action.KeyAction;
import org.aesh.terminal.KeyAction;

/**
* A CommandInvocation is the value object passed to a Command when it is executed.
Expand Down
6 changes: 3 additions & 3 deletions aesh/src/main/java/org/aesh/command/man/AeshFileDisplayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
import org.aesh.command.shell.Shell;
import org.aesh.command.Command;
import org.aesh.command.invocation.CommandInvocation;
import org.aesh.readline.action.KeyAction;
import org.aesh.readline.terminal.Key;
import org.aesh.terminal.KeyAction;
import org.aesh.terminal.Key;
import org.aesh.terminal.utils.ANSI;
import org.aesh.terminal.utils.Config;
import org.aesh.readline.util.LoggerUtil;
import org.aesh.terminal.utils.LoggerUtil;

import java.io.IOException;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/man/parser/ManParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.aesh.command.man.parser;

import org.aesh.terminal.utils.Config;
import org.aesh.readline.util.Parser;
import org.aesh.terminal.utils.Parser;

import java.util.ArrayList;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/map/MapProcessedCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.aesh.command.populator.CommandPopulator;
import org.aesh.command.result.ResultHandler;
import org.aesh.command.validator.CommandValidator;
import org.aesh.readline.util.Parser;
import org.aesh.terminal.utils.Parser;

import java.util.ArrayList;
import java.util.Collections;
Expand Down
4 changes: 2 additions & 2 deletions aesh/src/main/java/org/aesh/command/renderer/OptionRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/
package org.aesh.command.renderer;

import org.aesh.readline.terminal.formatting.TerminalColor;
import org.aesh.readline.terminal.formatting.TerminalTextStyle;
import org.aesh.terminal.formatting.TerminalColor;
import org.aesh.terminal.formatting.TerminalTextStyle;

/**
* @author <a href="mailto:stale.pedersen@jboss.org">Ståle W. Pedersen</a>
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/settings/SettingsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import org.aesh.readline.alias.AliasManager;
import org.aesh.readline.editing.EditMode;
import org.aesh.terminal.Connection;
import org.aesh.readline.util.LoggerUtil;
import org.aesh.terminal.utils.LoggerUtil;

import java.io.File;
import java.io.InputStream;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/command/shell/Shell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
package org.aesh.command.shell;

import org.aesh.readline.Prompt;
import org.aesh.readline.terminal.Key;
import org.aesh.terminal.Key;
import org.aesh.terminal.tty.Size;

import java.util.concurrent.TimeUnit;
Expand Down
6 changes: 3 additions & 3 deletions aesh/src/main/java/org/aesh/console/PagingSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
import org.aesh.readline.action.ActionDecoder;
import org.aesh.readline.history.History;
import org.aesh.readline.history.InMemoryHistory;
import org.aesh.readline.terminal.Key;
import org.aesh.readline.terminal.impl.WinSysTerminal;
import org.aesh.readline.util.Parser;
import org.aesh.terminal.Key;
import org.aesh.terminal.tty.impl.WinSysTerminal;
import org.aesh.terminal.utils.Parser;
import org.aesh.terminal.Attributes;
import org.aesh.terminal.Connection;
import org.aesh.terminal.tty.Signal;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/console/Process.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.aesh.terminal.utils.Config;
import org.aesh.command.validator.CommandValidatorException;
import org.aesh.terminal.Connection;
import org.aesh.readline.util.LoggerUtil;
import org.aesh.terminal.utils.LoggerUtil;

import java.util.function.Consumer;
import java.util.logging.Level;
Expand Down
4 changes: 2 additions & 2 deletions aesh/src/main/java/org/aesh/console/ReadlineConsole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
import org.aesh.readline.history.FileHistory;
import org.aesh.readline.history.History;
import org.aesh.readline.history.InMemoryHistory;
import org.aesh.readline.tty.terminal.TerminalConnection;
import org.aesh.terminal.tty.TerminalConnection;
import org.aesh.readline.util.FileAccessPermission;
import org.aesh.readline.util.LoggerUtil;
import org.aesh.terminal.utils.LoggerUtil;
import org.aesh.terminal.Attributes;
import org.aesh.terminal.Connection;
import org.aesh.terminal.tty.Signal;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/console/ShellImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.aesh.readline.Prompt;
import org.aesh.readline.Readline;
import org.aesh.readline.action.ActionDecoder;
import org.aesh.readline.terminal.Key;
import org.aesh.terminal.Key;
import org.aesh.terminal.Connection;
import org.aesh.terminal.tty.Capability;
import org.aesh.terminal.tty.Size;
Expand Down
4 changes: 2 additions & 2 deletions aesh/src/main/java/org/aesh/graphics/AeshGraphics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/
package org.aesh.graphics;

import org.aesh.readline.terminal.formatting.TerminalColor;
import org.aesh.readline.terminal.formatting.TerminalTextStyle;
import org.aesh.terminal.formatting.TerminalColor;
import org.aesh.terminal.formatting.TerminalTextStyle;
import org.aesh.terminal.Connection;
import org.aesh.terminal.tty.Capability;
import org.aesh.terminal.tty.Size;
Expand Down
4 changes: 2 additions & 2 deletions aesh/src/main/java/org/aesh/graphics/Graphics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/
package org.aesh.graphics;

import org.aesh.readline.terminal.formatting.TerminalColor;
import org.aesh.readline.terminal.formatting.TerminalTextStyle;
import org.aesh.terminal.formatting.TerminalColor;
import org.aesh.terminal.formatting.TerminalTextStyle;

/**
* Simple Terminal Graphics API
Expand Down
4 changes: 2 additions & 2 deletions aesh/src/main/java/org/aesh/impl/util/FileLister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import org.aesh.command.impl.converter.FileConverter;

import org.aesh.io.Resource;
import org.aesh.readline.util.LoggerUtil;
import org.aesh.readline.util.Parser;
import org.aesh.terminal.utils.LoggerUtil;
import org.aesh.terminal.utils.Parser;
import org.aesh.terminal.utils.Config;

/**
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/selector/MultiSelect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.aesh.selector;

import org.aesh.command.shell.Shell;
import org.aesh.readline.terminal.Key;
import org.aesh.terminal.Key;
import org.aesh.terminal.utils.ANSI;
import org.aesh.terminal.utils.Config;

Expand Down
2 changes: 1 addition & 1 deletion aesh/src/main/java/org/aesh/selector/Selector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import org.aesh.command.shell.Shell;
import org.aesh.readline.Prompt;
import org.aesh.readline.terminal.Key;
import org.aesh.terminal.Key;
import org.aesh.terminal.utils.ANSI;

import java.util.ArrayList;
Expand Down
4 changes: 2 additions & 2 deletions aesh/src/test/java/org/aesh/command/AeshCommandInputTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import org.aesh.command.settings.SettingsBuilder;
import org.aesh.command.validator.ValidatorInvocation;
import org.aesh.console.ReadlineConsole;
import org.aesh.readline.action.KeyAction;
import org.aesh.readline.terminal.Key;
import org.aesh.terminal.KeyAction;
import org.aesh.terminal.Key;
import org.aesh.terminal.utils.Config;
import org.aesh.tty.TestConnection;
import org.junit.Test;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/test/java/org/aesh/command/activator/AeshCommandOptionActivatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.aesh.command.settings.SettingsBuilder;
import org.aesh.command.validator.ValidatorInvocation;
import org.aesh.console.ReadlineConsole;
import org.aesh.readline.terminal.Key;
import org.aesh.terminal.Key;
import org.aesh.tty.TestConnection;
import org.junit.Test;

Expand Down
10 changes: 5 additions & 5 deletions aesh/src/test/java/org/aesh/command/completer/AeshCommandCompletionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
import org.aesh.command.validator.ValidatorInvocation;
import org.aesh.readline.Prompt;
import org.aesh.console.ReadlineConsole;
import org.aesh.readline.terminal.Key;
import org.aesh.readline.terminal.formatting.CharacterType;
import org.aesh.readline.terminal.formatting.Color;
import org.aesh.readline.terminal.formatting.TerminalColor;
import org.aesh.readline.terminal.formatting.TerminalTextStyle;
import org.aesh.terminal.Key;
import org.aesh.terminal.formatting.CharacterType;
import org.aesh.terminal.formatting.Color;
import org.aesh.terminal.formatting.TerminalColor;
import org.aesh.terminal.formatting.TerminalTextStyle;
import org.aesh.terminal.tty.Size;
import org.aesh.tty.TestConnection;
import org.aesh.terminal.utils.Config;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/test/java/org/aesh/command/completer/AeshCommandOperatorCompletionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.aesh.command.validator.ValidatorInvocation;
import org.aesh.io.FileResource;
import org.aesh.console.ReadlineConsole;
import org.aesh.readline.terminal.Key;
import org.aesh.terminal.Key;
import org.aesh.terminal.tty.Size;
import org.aesh.tty.TestConnection;
import org.aesh.terminal.utils.Config;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/test/java/org/aesh/command/completer/CompletionConsoleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

import org.aesh.command.Command;
import org.aesh.console.ReadlineConsole;
import org.aesh.readline.terminal.Key;
import org.aesh.terminal.Key;
import org.aesh.tty.TestConnection;
import org.aesh.terminal.utils.Config;
import org.junit.Test;
Expand Down
2 changes: 1 addition & 1 deletion aesh/src/test/java/org/aesh/command/completer/FileOptionCompleterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.aesh.command.impl.completer.FileOptionCompleter;
import org.aesh.console.AeshContext;
import org.aesh.console.DefaultAeshContext;
import org.aesh.readline.terminal.formatting.TerminalString;
import org.aesh.terminal.formatting.TerminalString;
import org.aesh.terminal.utils.Config;
import org.aesh.io.FileResource;
import org.junit.Test;
Expand Down
Loading