Repository: karaf Updated Branches: refs/heads/master 78d371227 -> 0d9368a86
[KARAF-4862] Upgrade to jline 3.1.0 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0d9368a8 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0d9368a8 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0d9368a8 Branch: refs/heads/master Commit: 0d9368a86dccec9f07caf9f600d22df9baa86d33 Parents: 203cfd8 Author: Guillaume Nodet <[email protected]> Authored: Mon Nov 28 13:44:25 2016 +0100 Committer: Guillaume Nodet <[email protected]> Committed: Mon Nov 28 13:44:43 2016 +0100 ---------------------------------------------------------------------- pom.xml | 2 +- .../karaf/shell/impl/console/JLineTerminal.java | 23 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/0d9368a8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2e86cf2..7e26dfc 100644 --- a/pom.xml +++ b/pom.xml @@ -252,7 +252,7 @@ <hibernate.validator.version>5.3.3.Final</hibernate.validator.version> <jansi.version>1.14</jansi.version> <javassist.version>3.9.0.GA</javassist.version> - <jline.version>3.0.1</jline.version> + <jline.version>3.1.0</jline.version> <jsw.version>3.2.3</jsw.version> <log4j.version>1.2.17</log4j.version> <maven.version>2.0.9</maven.version> http://git-wip-us.apache.org/repos/asf/karaf/blob/0d9368a8/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java ---------------------------------------------------------------------- diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java index c45ba34..dc55c4b 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java @@ -27,10 +27,13 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArraySet; +import java.util.function.IntConsumer; import org.apache.karaf.shell.api.console.SignalListener; import org.apache.karaf.shell.api.console.Terminal; import org.jline.terminal.Attributes; +import org.jline.terminal.Cursor; +import org.jline.terminal.MouseEvent; import org.jline.terminal.Size; import org.jline.utils.InfoCmp.Capability; import org.jline.utils.NonBlockingReader; @@ -212,6 +215,26 @@ public class JLineTerminal implements Terminal, org.jline.terminal.Terminal { } } + @Override + public Cursor getCursorPosition(IntConsumer discarded) { + return terminal.getCursorPosition(discarded); + } + + @Override + public boolean hasMouseSupport() { + return terminal.hasMouseSupport(); + } + + @Override + public boolean trackMouse(MouseTracking tracking) { + return terminal.trackMouse(tracking); + } + + @Override + public MouseEvent readMouseEvent() { + return terminal.readMouseEvent(); + } + private Signal signal(org.apache.karaf.shell.api.console.Signal sig) { switch (sig) { case INT:
