Skip to content

Migrate interaction tag to JLine 2 API #107

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
garydgregory merged 1 commit into from
Sep 8, 2026
Merged

Migrate interaction tag to JLine 2 API #107

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
19 changes: 12 additions & 7 deletions jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/AskTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import jline.ConsoleReader;
import jline.History;
import jline.SimpleCompletor;
import jline.console.ConsoleReader;
import jline.console.completer.StringsCompleter;
import jline.console.history.History;
import jline.console.history.MemoryHistory;

/**
* Jelly Tag that asks the user a question, and puts his answer into a variable,
Expand All @@ -42,7 +43,7 @@ public class AskTag extends TagSupport {
private static Log logger = LogFactory.getLog(AskTag.class);

/** The history of previous user-inputs.*/
private static History consoleHistory = new History();
private static History consoleHistory = new MemoryHistory();

/** The question to ask to the user. */
private String question;
Expand Down Expand Up @@ -105,15 +106,19 @@ public void doTag(final XMLOutput output) {
consoleReader.setBellEnabled(false);

// add old commands as tab completion history
final List oldCommandsAsList = useHistoryCompletor
? new ArrayList(consoleHistory.getHistoryList()) : new ArrayList(0);
final List<String> oldCommandsAsList = new ArrayList<>();
if (useHistoryCompletor) {
for (final History.Entry entry : consoleHistory) {
oldCommandsAsList.add(entry.value().toString());
}
}
// add predefined commands if given
if (completor != null && !completor.isEmpty()) {
oldCommandsAsList.addAll(completor);
}
final String[] oldCommands = new String[oldCommandsAsList.size()];
oldCommandsAsList.toArray(oldCommands);
consoleReader.addCompletor (new SimpleCompletor (oldCommands));
consoleReader.addCompleter(new StringsCompleter(oldCommands));

// read the input!
input = consoleReader.readLine();
Expand Down