diff src/viewer_swing/java/com/glavsoft/viewer/Viewer.java @ 204:d9d234715853

TreeManager for each interface
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Fri, 27 Jun 2014 21:37:20 +0900
parents 2f6237fea67e
children 2b3eb4a9492f
line wrap: on
line diff
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Fri Jun 27 19:40:46 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Fri Jun 27 21:37:20 2014 +0900
@@ -295,6 +295,7 @@
 		MyRfbProtoClient rfb = new MyRfbProtoClient();
 		rfb.setCuiVersion(cui);
 		rfb.setHasViewer(true);
+        rfb.setViewer(this);
         rfb.createConnectionAndStart(this);
 		CreateConnectionParam cp = new CreateConnectionParam(rfb);
 		if (hostName!=null) {
@@ -309,7 +310,6 @@
 		}
 		cp.sendWhereToConnect(this);
 		isTreeVNC = true;
-		rfb.setViewer(this);
 		myRfb =  rfb;
         settings.setViewOnly(true); // too avoid unnecessary upward traffic
         rfb.getAcceptThread().waitForShutdown();
@@ -357,7 +357,7 @@
         connectionParams.setConnectionParam(hostName, vncport);
         isApplet = true;
         this.setNoConnection(false);
-        if (myRfb.isRoot()) {
+        if (myRfb.isTreeManager()) {
         	setVisible(false);
         }
         run();
@@ -365,6 +365,7 @@
 
     public void proxyStart(String[] argv, int width, int height, boolean showTree) {
     	fbWidth = width;
+    	this.showTree = showTree;
     	proxyStart(argv, showTree);
     }
 
@@ -415,4 +416,9 @@
 		return connectionPresenter.getSocket();
 	}
 
+    @Override
+    public boolean getShowTree() {
+        return showTree;
+    }
+
 }