Mercurial > hg > Members > riono > TreeVNC_ja_comment

comparison src/viewer_swing/java/com/glavsoft/viewer/Viewer.java @ 395:704ac9e79e25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Call startVNCConnectionWithSocket for directedServerChangeReqeust
author innparusu
date Tue, 29 Sep 2015 18:46:45 +0900
parents 7d55adebcacb
children 28d67bbfa9f1
comparison
equal deleted inserted replaced
394:a8610fab6861 395:704ac9e79e25
221 final boolean hasJsch = checkJsch(); 221 final boolean hasJsch = checkJsch();
222 final boolean allowInteractive = allowAppletInteractiveConnections || ! isApplet; 222 final boolean allowInteractive = allowAppletInteractiveConnections || ! isApplet;
223 connectionPresenter = new ConnectionPresenter(hasJsch, allowInteractive); 223 connectionPresenter = new ConnectionPresenter(hasJsch, allowInteractive);
224 connectionPresenter.setNoConnection(noConnection); 224 connectionPresenter.setNoConnection(noConnection);
225 connectionPresenter.addModel("ConnectionParamsModel", connectionParams); 225 connectionPresenter.addModel("ConnectionParamsModel", connectionParams);
226 connectionPresenter.startVNCConnection(this, false); 226 connectionPresenter.startVNCConnection(this, false, null, null);
227 } 227 }
228 228
229 @Override 229 @Override
230 public ConnectionPresenter getConnectionPresenter() { 230 public ConnectionPresenter getConnectionPresenter() {
231 return connectionPresenter; 231 return connectionPresenter;
325 this.setNoConnection(false); 325 this.setNoConnection(false);
326 final Viewer v = this; 326 final Viewer v = this;
327 new Thread(new Runnable() { 327 new Thread(new Runnable() {
328 @Override 328 @Override
329 public void run() { 329 public void run() {
330 connectionPresenter.startVNCConnection(v, false); 330 connectionPresenter.startVNCConnection(v, false, null, null);
331 } 331 }
332 }, "ServerChangeThread").start(); 332 }, "ServerChangeThread").start();
333 } 333 }
334 334
335 public void changeToDirectConnectedServer(String hostName, Reader is, Writer os) { 335 public void changeToDirectConnectedServer(String hostName, Reader is, Writer os) {
336 final ConnectionPresenter connectionPresenter = createNewConnectionPresenter(hostName, (short)-1); 336 final ConnectionPresenter connectionPresenter = createNewConnectionPresenter(hostName, (short)-1);
337 connectionPresenter.startVNCConnection(this, true); 337 connectionPresenter.startVNCConnection(this, true, is, os);
338 }; 338 };
339 339
340 private ConnectionPresenter createNewConnectionPresenter(String hostName, short newVNCServerId) { 340 private ConnectionPresenter createNewConnectionPresenter(String hostName, short newVNCServerId) {
341 final boolean hasJsch = checkJsch(); 341 final boolean hasJsch = checkJsch();
342 final boolean allowInteractive = allowAppletInteractiveConnections || ! isApplet; 342 final boolean allowInteractive = allowAppletInteractiveConnections || ! isApplet;