# HG changeset patch
# User oc
# Date 1403596169 -32400
# Node ID f176bffcdc4a48e6fe7f2a77a2427ff74b7a5a1b
# Parent  b62a16548800b4ccd3272b962e728e3150c30395
add showTreeNode option.

diff -r b62a16548800 -r f176bffcdc4a src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Tue Jun 24 09:35:45 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Tue Jun 24 16:49:29 2014 +0900
@@ -44,7 +44,6 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
 import java.util.logging.Logger;
 
 import jp.ac.u_ryukyu.treevnc.MyRfbProto;
diff -r b62a16548800 -r f176bffcdc4a src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java	Tue Jun 24 09:35:45 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java	Tue Jun 24 16:49:29 2014 +0900
@@ -602,7 +602,7 @@
         treeManager = clients;
     }
     
-    public TreeManagement getTreeManger() {
+    public TreeManagement getTreeManager() {
         return treeManager;
     }
 
diff -r b62a16548800 -r f176bffcdc4a src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java	Tue Jun 24 09:35:45 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java	Tue Jun 24 16:49:29 2014 +0900
@@ -77,7 +77,7 @@
      * @param myHostName 
      */
     void handleWhereToConnect(int port, String hostname, String myHostName) {
-        rfb.getTreeManger().decideWhereToConnect(hostname,port,myHostName);
+        rfb.getTreeManager().decideWhereToConnect(hostname,port,myHostName);
     }
 
     /**
@@ -121,7 +121,7 @@
      * @param hostname
      */
     private void handleLostParent(int port, String hostname) {
-        rfb.getTreeManger().fixLostParent(hostname,port);
+        rfb.getTreeManager().fixLostParent(hostname,port);
     }
     
     public TreeCommand getCommand () {
diff -r b62a16548800 -r f176bffcdc4a src/main/java/jp/ac/u_ryukyu/treevnc/server/MyRfbProtoProxy.java
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/MyRfbProtoProxy.java	Tue Jun 24 09:35:45 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/MyRfbProtoProxy.java	Tue Jun 24 16:49:29 2014 +0900
@@ -11,24 +11,21 @@
 import jp.ac.u_ryukyu.treevnc.MyRfbProto;
 
 public class MyRfbProtoProxy extends MyRfbProto {
+
 	/**
 	 * CheckMillis is one of new msgType for RFB 3.855 and 3.856.
 	 */
 	final static byte SpeedCheckMillis = 4;
-
 	// Secyrity type of OS X
 	final static int SecTypeReqAccess = 32;
-
 	// Supported authentication types
 	final static int AuthAccess = 32;
-
 	boolean printStatusFlag = false;
 	long startCheckTime;
-
 	private LinkedList<Socket> cliList;
-
 	public RequestScreenThread rThread;
 	private Thread requestThread;
+	public boolean showTreeNode = false;
 	
 	public MyRfbProtoProxy() {
 		rThread = new RequestScreenThread(this);
@@ -105,6 +102,10 @@
             String myHostName) {
     }
 
+	public void setShowTree(boolean showTree) {
+		showTreeNode  = showTree;
+	}
+
 
 }
 
diff -r b62a16548800 -r f176bffcdc4a src/main/java/jp/ac/u_ryukyu/treevnc/server/TreeManagement.java
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/TreeManagement.java	Tue Jun 24 09:35:45 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/TreeManagement.java	Tue Jun 24 16:49:29 2014 +0900
@@ -7,11 +7,15 @@
 import jp.ac.u_ryukyu.treevnc.client.TreeVncProtocol;
 
 public class TreeManagement {
+
 	private LinkedList<TreeVNCNode> nodeList = new LinkedList<TreeVNCNode>();
 	boolean runflag = false;
 	private final int treebranch = 2;
-	public TreeManagement(String hostName, int vncport) {
+	private boolean showTreeNode = false;
+
+	public TreeManagement(String hostName, int vncport, boolean showTree) {
 		TreeVNCNode me = new TreeVNCNode(hostName, vncport,"localhost");
+		showTreeNode = showTree;
 		me.setTreeNum(0);
 		nodeList.add(me);
 	}
@@ -84,7 +88,6 @@
         lostNodeConnection(deadParent);
         // if lostParentNode is the last one, we don't need reconnection
         // Thread.sleep(intv_time);
-        showTreeNode();
     }
 
     /**
@@ -103,6 +106,10 @@
                 connectTo(newparent, child);
             }
         }
+        
+        if (showTreeNode) {
+        	showTreeNode();
+        }
     }
 
 
@@ -138,7 +145,6 @@
         TreeVNCNode node = new TreeVNCNode(hostname,port,localhostname);
         node.setTreeNum(nodeList.size());
         nodeList.add(node);
-        showTreeNode();
 	    if (nodeList.size() >= treebranch + 1) {
 		    TreeVNCNode parent = getParentNode(node.getTreeNum());
 		    checkParameter(parent.getTreeNum(), nodeList.size(), isLeader(node));
@@ -147,6 +153,9 @@
 		    // connect to me
 			connectTo(nodeList.getFirst(), node);
 		}
+	    if (showTreeNode) {
+	    	showTreeNode();
+	    }
 	}
 	
 	/**
@@ -166,6 +175,7 @@
         	}
 
         }
+        System.out.println();
 	}
 
 	public LinkedList<TreeVNCNode> getList() {
diff -r b62a16548800 -r f176bffcdc4a src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java	Tue Jun 24 09:35:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java	Tue Jun 24 16:49:29 2014 +0900
@@ -257,7 +257,7 @@
     }
 
     @Override
-    public void proxyStart(String[] args, int width, int height) {
+    public void proxyStart(String[] args, int width, int height, boolean showTree) {
         
     }
 
diff -r b62a16548800 -r f176bffcdc4a src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java	Tue Jun 24 09:35:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java	Tue Jun 24 16:49:29 2014 +0900
@@ -20,21 +20,21 @@
 	private void vncStart(String[] args) {
 	    modeSelect(args);
 	    VncProxyService vps = null;
-        if (treeProxy && !viewer) {
-	        vps = new VncProxyService();
-	        vps.setNoConnection(noConnection);
-	        vps.proxyStart(args,width,height);
-	        vps.getRfb().setHasViewer(false);
-            if (!permitChangeScreen ) vps.getRfb().setPermitChangeScreen(false);
-            vps.getRfb().getAcceptThread().waitForShutdown();
-	        return;
+	    if (treeProxy && !viewer) {
+	    	vps = new VncProxyService();
+	    	vps.setNoConnection(noConnection);
+	    	vps.proxyStart(args,width,height, showTree);
+	    	vps.getRfb().setHasViewer(false);
+	    	if (!permitChangeScreen ) vps.getRfb().setPermitChangeScreen(false);
+	    	vps.getRfb().getAcceptThread().waitForShutdown();
+	    	return;
 	    }
 	    ViewerInterface v;
 	    if (viewer) {
 	        v = cui ? new CuiViewer() : new Viewer();
 	        if (treeProxy) {
 	            v.setNoConnection(noConnection);
-                v.proxyStart(args,width,height);
+                v.proxyStart(args,width,height, showTree);
                 v.getRfb().setHasViewer(true);
 	            if (!permitChangeScreen ) v.getRfb().setPermitChangeScreen(false);
 	            v.getRfb().getAcceptThread().waitForShutdown();
@@ -42,6 +42,7 @@
                 v.startTreeViewer(hostName,cui);
 	        }
 	    }
+
 	}
 
 	private void modeSelect(String[] args) {
diff -r b62a16548800 -r f176bffcdc4a src/viewer_swing/java/com/glavsoft/viewer/Viewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Tue Jun 24 09:35:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Tue Jun 24 16:49:29 2014 +0900
@@ -71,6 +71,7 @@
 	private boolean noConnection;
     public int vncport = ConnectionParams.DEFAULT_RFB_PORT;
     private int fbWidth;
+	private boolean showTree = false;
 
     public static void main(String[] args) {
 		Parser parser = new Parser();
@@ -359,12 +360,12 @@
         myRfb.createConnectionAndStart(this);
     }
 
-    public void proxyStart(String[] argv, int width, int height) {
-        fbWidth = width;
-        proxyStart(argv);
+    public void proxyStart(String[] argv, int width, int height, boolean showTree) {
+    	fbWidth = width;
+    	proxyStart(argv, showTree);
     }
 
-    public void proxyStart(String[] argv) {
+    public void proxyStart(String[] argv, boolean showTree) {
         // input into arguments Decision
         Parser parser = new Parser();
         ParametersHandler.completeParserOptions(parser);
@@ -377,7 +378,8 @@
         String hostname = "localhost";
         MyRfbProtoProxy rfb = new MyRfbProtoProxy();
         myRfb = rfb;
-        rfb.setTreeManager(new TreeManagement(hostname, ConnectionParams.DEFAULT_VNC_ROOT));
+        rfb.setShowTree(showTree);
+        rfb.setTreeManager(new TreeManagement(hostname, ConnectionParams.DEFAULT_VNC_ROOT, rfb.showTreeNode));
         rfb.setViewer(this);
         rfb.setCuiVersion(false);
         rfb.setHasViewer(true);
@@ -391,7 +393,7 @@
     }
 
     public void initRoot(MyRfbProto myRfbProto, String hostName) {
-        myRfbProto.setTreeManager(new TreeManagement(hostName, ConnectionParams.DEFAULT_VNC_ROOT));
+        myRfbProto.setTreeManager(new TreeManagement(hostName, ConnectionParams.DEFAULT_VNC_ROOT, showTree));
         setIsTreeVNC(true);
         connectionParams.setConnectionParam(hostName, vncport);
         isApplet = true;
@@ -399,4 +401,5 @@
         myRfbProto.setReconnecting(true);
         run();
     }
+
 }
diff -r b62a16548800 -r f176bffcdc4a src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java	Tue Jun 24 09:35:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java	Tue Jun 24 16:49:29 2014 +0900
@@ -29,7 +29,7 @@
 
     public void inhelitClients(ViewerInterface vncProxyService, String hostName);
 
-    public void proxyStart(String[] args, int width, int height);
+    public void proxyStart(String[] args, int width, int height, boolean showTree);
 
     public void setNoConnection(boolean noConnection);
 
diff -r b62a16548800 -r f176bffcdc4a src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java	Tue Jun 24 09:35:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java	Tue Jun 24 16:49:29 2014 +0900
@@ -26,9 +26,7 @@
 
 import com.glavsoft.exceptions.*;
 import com.glavsoft.rfb.IPasswordRetriever;
-import com.glavsoft.rfb.IRepaintController;
 import com.glavsoft.rfb.IRfbSessionListener;
-import com.glavsoft.rfb.protocol.NullRepaintController;
 import com.glavsoft.rfb.protocol.Protocol;
 import com.glavsoft.rfb.protocol.ProtocolSettings;
 import com.glavsoft.transport.Reader;
diff -r b62a16548800 -r f176bffcdc4a src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Tue Jun 24 09:35:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Tue Jun 24 16:49:29 2014 +0900
@@ -44,8 +44,6 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import java.io.IOException;
-import java.net.UnknownHostException;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.Executors;