Mercurial > hg > Members > riono > TreeVNC_ja_comment

changeset 154:c3158d9e2c0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fix
author oc
date Fri, 13 Jun 2014 18:16:27 +0900
parents e68dfd1972ac
children 1c95bd5bebcf
files src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java	Fri Jun 13 18:04:42 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java	Fri Jun 13 18:16:27 2014 +0900
@@ -66,10 +66,10 @@
 			System.exit(0);
 		}
 		VncProxyService vps = new VncProxyService();
-		vps.initProxy1("localhost");
+		vps.initRoot("localhost");
 	}
 
-	private void initProxy1(String hostName) {
+	private void initRoot(String hostName) {
 		myRfb = new MyRfbProtoProxy();
 		myRfb.setVncProxy(this);
 		clients = new TreeManagement(hostName, vncport,myRfb);
@@ -128,7 +128,7 @@
 			printUsage(parser.optionsUsage());
 			System.exit(0);
 		}
-		initProxy1("localhost");
+		initRoot("localhost");
 	}
 
 	@Override
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java	Fri Jun 13 18:04:42 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java	Fri Jun 13 18:16:27 2014 +0900
@@ -120,9 +120,8 @@
             	viewerWindow = viewerWindowFactory.createViewerWindow(workingProtocol, rfbSettings, uiSettings, connectionString, presenter);
             if(myRfb.isRoot())
             	workingProtocol.startNormalHandling(this, viewerWindow.getSurface(), clipboardController, myRfb);
-            else if(myRfb instanceof MyRfbProtoClient) {
+            else if(!myRfb.isRoot()) {
 				myRfb.setProtocolContext(workingProtocol);
-				myRfb.notProxy();
 				if(!myRfb.getCuiVersion())
 					workingProtocol.startTreeClientHandling(this, viewerWindow.getSurface(), clipboardController,myRfb);
 				else