# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1402621751 -32400
# Node ID 8d01028906c4ec442a7363773423b121a75a0f62
# Parent  703db66138b5f54ec5e2a6ae702fde55488a06aa
on going ...

diff -r 703db66138b5 -r 8d01028906c4 src/main/java/jp/ac/u_ryukyu/treevnc/client/TreeVncProtocol.java
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/client/TreeVncProtocol.java	Fri Jun 13 07:12:52 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/client/TreeVncProtocol.java	Fri Jun 13 10:09:11 2014 +0900
@@ -5,6 +5,8 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import javax.swing.SwingUtilities;
+
 import com.glavsoft.rfb.protocol.ProtocolContext;
 import com.glavsoft.viewer.ViewerImpl;
 
diff -r 703db66138b5 -r 8d01028906c4 src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java	Fri Jun 13 07:12:52 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java	Fri Jun 13 10:09:11 2014 +0900
@@ -210,7 +210,7 @@
 		myRfb.setTerminationType(b);
 	}
 
-	public void startViewer() {
+	public void startTreeViewer() {
 		CuiViewer viewer = new CuiViewer();
 		MyRfbProtoClient rfb = new MyRfbProtoClient();
 		CreateConnectionParam cp = new CreateConnectionParam(rfb);
@@ -225,7 +225,7 @@
 		SwingUtilities.invokeLater(viewer);
 	}
 
-	public void startViewer(String hostName, boolean cui) {
+	public void startTreeViewer(String hostName, boolean cui) {
 		CuiViewer viewer = new CuiViewer();
 		viewer.cuiVersion = cui;
 		MyRfbProtoClient rfb = new MyRfbProtoClient();
diff -r 703db66138b5 -r 8d01028906c4 src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java	Fri Jun 13 07:12:52 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java	Fri Jun 13 10:09:11 2014 +0900
@@ -28,9 +28,9 @@
 	    if (viewer) {
 	        v = cui ? new CuiViewer() : new Viewer();
 	        if(hostName!=null) {
-	            v.startViewer(hostName,true);
+	            v.startTreeViewer(hostName,true);
 	        } else {
-	            v.startViewer();
+	            v.startTreeViewer();
 	        }
 	    }
 	}
diff -r 703db66138b5 -r 8d01028906c4 src/viewer_swing/java/com/glavsoft/viewer/Viewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Fri Jun 13 07:12:52 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Fri Jun 13 10:09:11 2014 +0900
@@ -285,7 +285,7 @@
 	/**
 	 * starter for TreeVNC
 	 */
-	public void startViewer() {
+	public void startTreeViewer() {
 		MyRfbProtoClient rfb = new MyRfbProtoClient();
 		CreateConnectionParam cp = new CreateConnectionParam(rfb);
 		cp.runAcceptThread();
@@ -293,18 +293,18 @@
             cp.findTreeVncRoot();
         } catch (InterruptedException e) {
         }
-		cp.createConnectionParam(this);
 		isTreeVNC = true;
-		rfb.setViewer(this);
 		myRfb =  rfb;
         settings.setViewOnly(true); // too avoid unnecessary upward traffic
-		SwingUtilities.invokeLater(this);
+        cp.createConnectionParam(this);
+        rfb.setViewer(this);
+        SwingUtilities.invokeLater(this);
 	}
 	
 	/**
 	 * start view with specific TreeVNC root
 	 */
-	public void startViewer(String hostName,boolean cui) {
+	public void startTreeViewer(String hostName,boolean cui) {
 		MyRfbProtoClient rfb = new MyRfbProtoClient();
 		rfb.setCuiVersion(cui);
 		CreateConnectionParam cp = new CreateConnectionParam(rfb);
@@ -315,7 +315,7 @@
 		rfb.setViewer(this);
 		myRfb =  rfb;
         settings.setViewOnly(true); // too avoid unnecessary upward traffic
-		SwingUtilities.invokeLater(this);
+        SwingUtilities.invokeLater(this);
 	}
 	
 	
diff -r 703db66138b5 -r 8d01028906c4 src/viewer_swing/java/com/glavsoft/viewer/ViewerImpl.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/ViewerImpl.java	Fri Jun 13 07:12:52 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/ViewerImpl.java	Fri Jun 13 10:09:11 2014 +0900
@@ -4,7 +4,7 @@
 
 import jp.ac.u_ryukyu.treevnc.MyRfbProto;
 
-public interface ViewerImpl {
+public interface ViewerImpl extends Runnable {
 
 	public boolean getCuiVersion();
 
@@ -24,9 +24,9 @@
 
 	public void setCuiVersion(boolean flag);
 
-    public void startViewer(String hostName, boolean b);
+    public void startTreeViewer(String hostName, boolean b);
 
-    public void startViewer();
+    public void startTreeViewer();
 
 	public void createRootSelectionPanel();
 }