You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/09/27 06:01:51 UTC
karaf git commit: [KARAF-5359] Upgrade to JLine 3.5.1
Repository: karaf
Updated Branches:
refs/heads/master 262e9cb17 -> 82280215c
[KARAF-5359] Upgrade to JLine 3.5.1
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/82280215
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/82280215
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/82280215
Branch: refs/heads/master
Commit: 82280215c1fab0c4fd1a8aba211bc73b690e73e6
Parents: 262e9cb
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Sep 27 08:01:46 2017 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Wed Sep 27 08:01:46 2017 +0200
----------------------------------------------------------------------
.../org/apache/karaf/shell/impl/console/JLineTerminal.java | 6 ++++++
.../src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java | 3 ++-
.../java/org/apache/karaf/webconsole/gogo/WebTerminal.java | 3 ++-
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/82280215/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 ef6fba2..113f091 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
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
+import java.nio.charset.Charset;
import java.util.EnumSet;
import java.util.Objects;
import java.util.Set;
@@ -134,6 +135,11 @@ public class JLineTerminal implements Terminal, org.jline.terminal.Terminal {
}
@Override
+ public Charset encoding() {
+ return terminal.encoding();
+ }
+
+ @Override
public InputStream input() {
return terminal.input();
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/82280215/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java
----------------------------------------------------------------------
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java
index 6731243..2147a16 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java
@@ -21,6 +21,7 @@ package org.apache.karaf.shell.ssh;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.EnumSet;
import java.util.Map;
@@ -44,7 +45,7 @@ public class SshTerminal extends ExternalTerminal implements Terminal {
environment.getEnv().get(Environment.ENV_TERM),
input,
output,
- "UTF-8");
+ StandardCharsets.UTF_8);
this.environment = environment;
this.environment.addSignalListener(this::handleSignal);
for (Map.Entry<PtyMode, Integer> e : environment.getPtyModes().entrySet()) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/82280215/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java
----------------------------------------------------------------------
diff --git a/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java b/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java
index c916c0b..12c5005 100644
--- a/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java
+++ b/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java
@@ -19,6 +19,7 @@ package org.apache.karaf.webconsole.gogo;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+ import java.nio.charset.StandardCharsets;
import java.util.EnumSet;
import org.apache.karaf.shell.api.console.SignalListener;
@@ -28,7 +29,7 @@ package org.apache.karaf.webconsole.gogo;
public class WebTerminal extends ExternalTerminal implements Terminal {
public WebTerminal(int width, int height, InputStream input, OutputStream output) throws IOException {
- super("Karaf Web Terminal", "ansi", input, output, "UTF-8");
+ super("Karaf Web Terminal", "ansi", input, output, StandardCharsets.UTF_8);
size.setColumns(width);
size.setRows(height);
}