Refactoring

hsshss · Oct 25, 2020 · 027abd7 · 027abd7
1 parent 9bfdca2
commit 027abd7
Show file tree

Hide file tree

Showing 5 changed files with 451 additions and 502 deletions.
diff --git a/src/net/nbug/hexprobe/server/telnet/EasyTelnetServer.java b/src/net/nbug/hexprobe/server/telnet/EasyTelnetServer.java
@@ -1,8 +1,11 @@
 package net.nbug.hexprobe.server.telnet;
 
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.nio.charset.Charset;
 
 /**
  * EasyTelnetServer
@@ -98,7 +101,11 @@ public ClientWorker(Socket sock) {
         @Override
         public void run() {
             try {
-                TelnetTerminal telnet = new TelnetTerminal(sock.getOutputStream(), sock.getInputStream());
+                TelnetTerminal telnet =
+                    new TelnetTerminal(
+                        new DataOutputStream(sock.getOutputStream()),
+                        new DataInputStream(sock.getInputStream()),
+                        Charset.forName("UTF-8"));
                 if (prompt != null) {
                     telnet.setPrompt(prompt);
                 }

diff --git a/src/net/nbug/hexprobe/server/telnet/EasyTerminal.java b/src/net/nbug/hexprobe/server/telnet/EasyTerminal.java
@@ -22,6 +22,7 @@ public interface EasyTerminal {
     void close() throws IOException;
     InputStream getInputStream();
     Charset getEncoding();
+    void setPrompt(String prompt);
     boolean isEcho();
     void setEcho(boolean enable);
     boolean isLogMode();

diff --git a/src/net/nbug/hexprobe/server/telnet/OnClearScreenListener.java b/src/net/nbug/hexprobe/server/telnet/OnClearScreenListener.java