comparison src/viewer_swing/java/com/glavsoft/viewer/Viewer.java @ 513:b97fdcd337fe

fix
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Wed, 20 Feb 2019 23:04:41 +0900
parents 16f9b37ef43b
children 887ebd993b3d
comparison
equal deleted inserted replaced
512:16f9b37ef43b 513:b97fdcd337fe
30 import com.glavsoft.viewer.cli.Parser; 30 import com.glavsoft.viewer.cli.Parser;
31 import com.glavsoft.viewer.swing.ConnectionParams; 31 import com.glavsoft.viewer.swing.ConnectionParams;
32 import com.glavsoft.viewer.swing.ParametersHandler; 32 import com.glavsoft.viewer.swing.ParametersHandler;
33 import com.glavsoft.viewer.swing.SwingViewerWindow; 33 import com.glavsoft.viewer.swing.SwingViewerWindow;
34 import jp.ac.u_ryukyu.treevnc.CreateConnectionParam; 34 import jp.ac.u_ryukyu.treevnc.CreateConnectionParam;
35 import jp.ac.u_ryukyu.treevnc.FindRoot;
35 import jp.ac.u_ryukyu.treevnc.TreeRFBProto; 36 import jp.ac.u_ryukyu.treevnc.TreeRFBProto;
36 37
37 import javax.swing.*; 38 import javax.swing.*;
38 import java.awt.*; 39 import java.awt.*;
39 import java.awt.event.WindowEvent; 40 import java.awt.event.WindowEvent;
375 connectionPresenter1.setSingleWidth(width); 376 connectionPresenter1.setSingleWidth(width);
376 connectionPresenter1.setSingleHeight(height); 377 connectionPresenter1.setSingleHeight(height);
377 connectionPresenter1.setRetinaScale(scale); 378 connectionPresenter1.setRetinaScale(scale);
378 connectionPresenter1.setMulticast(connectionPresenter.isUseMulticast()); 379 connectionPresenter1.setMulticast(connectionPresenter.isUseMulticast());
379 // System.out.println("Sarver change accepted from id :" + newVNCServerId); 380 // System.out.println("Sarver change accepted from id :" + newVNCServerId);
380 return connectionPresenter; 381 return connectionPresenter1;
381 } 382 }
382 383
383 /** 384 /**
384 * start TreeVNC viewer 385 * start TreeVNC viewer
385 */ 386 */
392 CreateConnectionParam cp = new CreateConnectionParam(rfb); 393 CreateConnectionParam cp = new CreateConnectionParam(rfb);
393 if (hostName!=null) { 394 if (hostName!=null) {
394 cp.setHostName(hostName); 395 cp.setHostName(hostName);
395 } else { 396 } else {
396 cp.findTreeVncRoot(); 397 cp.findTreeVncRoot();
397
398 // selected "Start Display Mode" or "Start as TreeVNC Root" for start selection panel 398 // selected "Start Display Mode" or "Start as TreeVNC Root" for start selection panel
399 if (cp.isDisplayMode() || cp.isRootMode()) { 399 if (cp.isDisplayMode() || cp.isRootMode()) {
400 myRfb = rfb; 400 myRfb = rfb;
401 myRfb.setIsTreeManager(true); 401 myRfb.setIsTreeManager(true);
402 return; 402 return;
443 if (myRfb.getAcceptThread() == null) { 443 if (myRfb.getAcceptThread() == null) {
444 myRfb.createConnectionAndStart(this); 444 myRfb.createConnectionAndStart(this);
445 } else { 445 } else {
446 myRfb.startTreeRootFindThread(); 446 myRfb.startTreeRootFindThread();
447 } 447 }
448 myRfb.setFindRoot();
448 setIsTreeVNC(true); 449 setIsTreeVNC(true);
449 if (hostName == null) { 450 if (hostName == null) {
450 hostName = "localhost"; 451 hostName = "localhost";
451 } 452 }
452 connectionParams.setConnectionParam(hostName, vncport); 453 connectionParams.setConnectionParam(hostName, vncport);