Mercurial > 510Connectbot
diff src/com/five_ten_sg/connectbot/service/TerminalBridge.java @ 112:77ac18bc1b2f
cleanup java formatting
author | Carl Byington <carl@five-ten-sg.com> |
---|---|
date | Wed, 18 Jun 2014 13:03:01 -0700 |
parents | e1c43d50f9d8 |
children | cb3b9b660b3d |
line wrap: on
line diff
--- a/src/com/five_ten_sg/connectbot/service/TerminalBridge.java Wed Jun 18 13:00:19 2014 -0700 +++ b/src/com/five_ten_sg/connectbot/service/TerminalBridge.java Wed Jun 18 13:03:01 2014 -0700 @@ -176,7 +176,9 @@ this.host = host; this.homeDirectory = homeDirectory; emulation = host.getHostEmulation(); + if ((emulation == null) || (emulation.length() == 0)) emulation = manager.getEmulation(); + // create prompt helper to relay password and hostkey requests up to gui promptHelper = new PromptHelper(this); // create our default paint @@ -217,8 +219,8 @@ transport.setLinks(manager, this, homeDirectory, host, emulation); buffer = transport.getTransportBuffer(); keyListener = transport.getTerminalKeyListener(); + String monitor_init = host.getMonitor(); - String monitor_init = host.getMonitor(); if ((monitor_init != null) && (monitor_init.length() > 0)) { monitor = new TerminalMonitor(manager, buffer, keyListener, parent, monitor_init); } @@ -262,6 +264,7 @@ */ public Charset getCharset() { if (relay != null) return relay.getCharset(); + return keyListener.getCharset(); } @@ -272,6 +275,7 @@ */ public void setCharset(String encoding) { if (relay != null) relay.setCharset(encoding); + keyListener.setCharset(encoding); } @@ -419,6 +423,7 @@ // close the monitor if (monitor != null) monitor.Disconnect(); + monitor = null; } @@ -1385,6 +1390,7 @@ return true; } } + return super.dispatchKeyEvent(event); } };