Mercurial > hg > Members > riono > TreeVNC_ja_comment

changeset 158:7ffb3fc44105

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fix
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Fri, 13 Jun 2014 23:17:25 +0900
parents 7cea8789387b
children 1c9f6acdfeb2
files src/main/java/jp/ac/u_ryukyu/treevnc/client/MyRfbProtoClient.java src/main/java/jp/ac/u_ryukyu/treevnc/client/TreeVncProtocol.java src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java
diffstat 3 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/client/MyRfbProtoClient.java	Fri Jun 13 23:12:28 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/client/MyRfbProtoClient.java	Fri Jun 13 23:17:25 2014 +0900
@@ -7,7 +7,6 @@
 import jp.ac.u_ryukyu.treevnc.MyRfbProto;
 
 import com.glavsoft.exceptions.TransportException;
-import com.glavsoft.rfb.protocol.ProtocolContext;
 import com.glavsoft.transport.Reader;
 
 public class MyRfbProtoClient extends MyRfbProto {
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/client/TreeVncProtocol.java	Fri Jun 13 23:12:28 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/client/TreeVncProtocol.java	Fri Jun 13 23:17:25 2014 +0900
@@ -5,8 +5,6 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import javax.swing.SwingUtilities;
-
 import com.glavsoft.rfb.protocol.ProtocolContext;
 import com.glavsoft.viewer.ViewerInterface;
 
--- a/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java	Fri Jun 13 23:12:28 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java	Fri Jun 13 23:17:25 2014 +0900
@@ -17,13 +17,14 @@
 	}
 
 	private void vncStart(String[] args) {
+        Thread root = null;
 	    modeSelect(args);
 	    if (treeProxy) {
-	        VncProxyService vps = new VncProxyService();
+	        final VncProxyService vps = new VncProxyService();
 	        vps.setNoConnection(noConnection);
 	        vps.proxyStart(args,width,height);
 	        if (!permitChangeScreen ) vps.getRfb().setPermitChangeScreen(false);
-	        Thread root = new Thread(new Runnable() {
+	        root = new Thread(new Runnable() {
                 @Override
                 public void run() {
                     vps.getAcceptThread().commandMainLoop();             
@@ -39,6 +40,11 @@
 	            v.startTreeViewer();
 	        }
 	    }
+	    if (root!=null)
+            try {
+                root.join();
+            } catch (InterruptedException e) {
+            }
 	}
 
 	private void modeSelect(String[] args) {