--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java	Sun Jul 06 10:36:30 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java	Sun Jul 06 12:46:20 2014 +0900
@@ -7,85 +7,85 @@
 
 public class TreeManagement {
 
-	private LinkedList<TreeVNCNode> nodeList = new LinkedList<TreeVNCNode>();
-	boolean runflag = false;
-	private final int treebranch = 2;
-	private boolean showTreeNode = false;
-	private byte[] netmask;
-	private byte[] netaddress;
+    private LinkedList<TreeVNCNode> nodeList = new LinkedList<TreeVNCNode>();
+    boolean runflag = false;
+    private final int treebranch = 2;
+    private boolean showTreeNode = false;
+    private byte[] netmask;
+    private byte[] netaddress;
 
-	public TreeManagement(String hostName, int vncport, boolean showTree) {
-		TreeVNCNode me = new TreeVNCNode(hostName, vncport,"localhost");
-		showTreeNode = showTree;
-		me.setTreeNum(0);
-		nodeList.add(me);
-	}
-	
-//
-//	private boolean checkAddress(String line) {
-//		String test[] = line.split("\\.");
-//		int a = Integer.parseInt(test[0]);
-//		int b = Integer.parseInt(test[1]);
-//		if ((192 == a && b == 168) || (172 == a && (b > 15 || b < 32))
-//				|| 10 == a) {
-//			return true;
-//		} else {
-//			return false;
-//		}
-//	}
+    public TreeManagement(String hostName, int vncport, boolean showTree) {
+        TreeVNCNode me = new TreeVNCNode(hostName, vncport,"localhost");
+        showTreeNode = showTree;
+        me.setTreeNum(0);
+        nodeList.add(me);
+    }
+
+    //
+    //	private boolean checkAddress(String line) {
+    //		String test[] = line.split("\\.");
+    //		int a = Integer.parseInt(test[0]);
+    //		int b = Integer.parseInt(test[1]);
+    //		if ((192 == a && b == 168) || (172 == a && (b > 15 || b < 32))
+    //				|| 10 == a) {
+    //			return true;
+    //		} else {
+    //			return false;
+    //		}
+    //	}
 
 
-	/**
-	 * a parent is lost, remove from the list and move last one into here
-	 * @param nodeNum
-	 *            parent value
-	 */
-	private void moveLastNodeToLostNodePosition(int nodeNum) {
-		nodeList.remove(nodeNum);
-		TreeVNCNode node = nodeList.removeLast();
-		node.setTreeNum(nodeNum);
-		nodeList.add(nodeNum, node) ; 
-	}
+    /**
+     * a parent is lost, remove from the list and move last one into here
+     * @param nodeNum
+     *            parent value
+     */
+    private void moveLastNodeToLostNodePosition(int nodeNum) {
+        nodeList.remove(nodeNum);
+        TreeVNCNode node = nodeList.removeLast();
+        node.setTreeNum(nodeNum);
+        nodeList.add(nodeNum, node) ; 
+    }
 
-	private void checkParameter(int parent, int counter, int leaderflag2) {
-		System.out.println("number p =" + parent);
-		System.out.println("number i =" + counter);
-		System.out.println("leaderflag=" + leaderflag2 + "\n");
-	}
+    private void checkParameter(int parent, int counter, int leaderflag2) {
+        System.out.print("number p =" + parent);
+        System.out.print(" number i =" + counter);
+        System.out.println(" leaderflag=" + leaderflag2 + "\n");
+    }
 
-	private TreeVNCNode getParentNode(int nodeNum) {
-		int parentnum = (nodeNum - 1) / treebranch;
+    private TreeVNCNode getParentNode(int nodeNum) {
+        int parentnum = (nodeNum - 1) / treebranch;
         return  nodeList.get(parentnum);
-	}
-	
-	
-	public TreeVNCNode getChildNode(TreeVNCNode newparent, int i) {
-		int child = newparent.getTreeNum() * treebranch + i + 1;
-		if (child >= nodeList.size()) {
-			return(null);
-		} else {
-			return(nodeList.get(child));
-		}
-		
-	}	
-	
-	/**
-	 * A parent is lost, move last node which has no child to the position 
-	 * @param hostname
-	 * @param port
-	 * @param myHostName 
-	 */
+    }
+
+
+    public TreeVNCNode getChildNode(TreeVNCNode newparent, int i) {
+        int child = newparent.getTreeNum() * treebranch + i + 1;
+        if (child >= nodeList.size()) {
+            return(null);
+        } else {
+            return(nodeList.get(child));
+        }
+
+    }	
+
+    /**
+     * A parent is lost, move last node which has no child to the position 
+     * @param hostname
+     * @param port
+     * @param myHostName 
+     */
     public void fixLostParent(String hostname, int port, String myHostName) {
         TreeVNCNode lostParentNode = lookup(nodeList,hostname,port);
         if (lostParentNode == null ) return;   // some thing wrong
         int treeNumber = lostParentNode.getTreeNum();
         TreeVNCNode deadParent = getParentNode(treeNumber);
-    	TreeVNCNode me = nodeList.getFirst();
-    	me.setHostName(myHostName);
+        TreeVNCNode me = nodeList.getFirst();
+        me.setHostName(myHostName);
         if (deadParent.getTreeNum() == 0) {
-        	// if dead root, connect me.
-        	connectTo(me, lostParentNode);
-        	return;
+            // if dead root, connect me.
+            connectTo(me, lostParentNode);
+            return;
         }
         if (getChildNode(deadParent, 0) == null) return;
         moveLastNodeToLostNodePosition(deadParent.getTreeNum());
@@ -99,115 +99,115 @@
      * @param newparent
      */
     private void lostNodeConnection(TreeVNCNode oldParent) {
-    	TreeVNCNode newparent = nodeList.get(oldParent.getTreeNum());
-    	TreeVNCNode grandfather = getParentNode(newparent.getTreeNum());
-    	
-    	connectTo(grandfather, newparent);
-    	
+        TreeVNCNode newparent = nodeList.get(oldParent.getTreeNum());
+        TreeVNCNode grandfather = getParentNode(newparent.getTreeNum());
+
+        connectTo(grandfather, newparent);
+
         for(int i=0; i < treebranch; i++) {
-        	TreeVNCNode child = getChildNode(newparent, i);
+            TreeVNCNode child = getChildNode(newparent, i);
             if (child != null) {
                 connectTo(newparent, child);
             }
         }
-        
+
         if (showTreeNode) {
-        	showTreeNode();
+            showTreeNode();
         }
     }
 
 
 
-	public void connectTo(TreeVNCNode newparent, TreeVNCNode n) {
-		TreeVncProtocol vc1 = new TreeVncProtocol(n.getHostname(),n.getPort());
-		try {
-		    short nodeId = (short) n.getTreeNum();
-			vc1.connectTo(newparent.getHostname(), newparent.getPort(), isLeader(n), nodeId);
-		} catch (IOException e) {
-		    // log
-		}
-	}
+    public void connectTo(TreeVNCNode newparent, TreeVNCNode n) {
+        TreeVncProtocol vc1 = new TreeVncProtocol(n.getHostname(),n.getPort());
+        try {
+            short nodeId = (short) n.getTreeNum();
+            vc1.connectTo(newparent.getHostname(), newparent.getPort(), isLeader(n), nodeId);
+        } catch (IOException e) {
+            // log
+        }
+    }
 
     private int isLeader(TreeVNCNode n) {
         return ( n.getTreeNum() % treebranch == 1) ? 1 : 0;
     }
 
     private TreeVNCNode lookup(LinkedList<TreeVNCNode> list, String hostname, int port) {
-	    for (TreeVNCNode r : list) {
-	        if (r.getHostname().equals(hostname) && r.getPort() == port )
-	                return r;
-	    }
-	    return null;
+        for (TreeVNCNode r : list) {
+            if (r.getHostname().equals(hostname) && r.getPort() == port )
+                return r;
+        }
+        return null;
     }
 
-	/**
-	 * Determine tree topology and send CONNECT_TO command
-	 * @param hostname
-	 * @param port
-	 */
-	public void decideWhereToConnect(String hostname, int port, String localhostname) {
+    /**
+     * Determine tree topology and send CONNECT_TO command
+     * @param hostname
+     * @param port
+     */
+    public void decideWhereToConnect(String hostname, int port, String localhostname) {
         TreeVNCNode node = new TreeVNCNode(hostname,port,localhostname);
         node.setTreeNum(nodeList.size());
         nodeList.add(node);
-	    if (nodeList.size() >= treebranch + 1) {
-		    TreeVNCNode parent = getParentNode(node.getTreeNum());
-		    checkParameter(parent.getTreeNum(), nodeList.size(), isLeader(node));
-		    connectTo(parent, node);
-		} else {
-		    // connect to me
-			TreeVNCNode me = nodeList.getFirst();
-			me.setHostName(localhostname);
-			connectTo(me, node);
-		}
-	    if (showTreeNode) {
-	    	showTreeNode();
-	    }
-	}
-	
-	/**
-	 * show Tree Node.
-	 */
-	public void showTreeNode() {
-		int nl = 0, pow = 2;
+        if (nodeList.size() >= treebranch + 1) {
+            TreeVNCNode parent = getParentNode(node.getTreeNum());
+            checkParameter(parent.getTreeNum(), nodeList.size(), isLeader(node));
+            connectTo(parent, node);
+        } else {
+            // connect to me
+            TreeVNCNode me = nodeList.getFirst();
+            me.setHostName(localhostname);
+            connectTo(me, node);
+        }
+        if (showTreeNode) {
+            showTreeNode();
+        }
+    }
+
+    /**
+     * show Tree Node.
+     */
+    public void showTreeNode() {
+        int nl = 0, pow = 2;
         for (int i=0; i<nodeList.size(); i++) {
-          	TreeVNCNode treeNode = nodeList.get(i);
-        	System.out.print(treeNode.getTreeNum() + ":" + treeNode.getPort() + ":" + treeNode.getHostname());
-        	if (i==nl) {
-        		System.out.println();
-        		nl = nl + pow;
-        		pow = pow * pow;
-        	} else {
-        		System.out.print(" ");
-        	}
+            TreeVNCNode treeNode = nodeList.get(i);
+            System.out.print(treeNode.getTreeNum() + ":" + treeNode.getPort() + ":" + treeNode.getHostname());
+            if (i==nl) {
+                System.out.println();
+                nl = nl + pow;
+                pow = pow * pow;
+            } else {
+                System.out.print(" ");
+            }
 
         }
         System.out.println();
-	}
+    }
 
-	public LinkedList<TreeVNCNode> getList() {
-		return nodeList;
-	}
+    public LinkedList<TreeVNCNode> getList() {
+        return nodeList;
+    }
 
-	public void setList(LinkedList<TreeVNCNode> _ls) {
-		nodeList = _ls;
-	}
+    public void setList(LinkedList<TreeVNCNode> _ls) {
+        nodeList = _ls;
+    }
 
-	public int getTreeBranch() {
-		return treebranch;
-	}
+    public int getTreeBranch() {
+        return treebranch;
+    }
 
-	public void setNetMask(byte[] netmask,byte[] netaddress) {
-		this.netmask = netmask;
-		this.netaddress = netaddress;
-	}
-	
-	public boolean onTheSameNetwork(InetAddress adr ) {
-		byte [] byteadr = adr.getAddress();
-		if (byteadr.length != netmask.length) return false;
-		for(int i=0; i < netmask.length; i++) {
-			if ((netmask[i] & byteadr[i])!=netaddress[i]) return false;
-		}
-		return true;
-	}
+    public void setNetMask(byte[] netmask,byte[] netaddress) {
+        this.netmask = netmask;
+        this.netaddress = netaddress;
+    }
+
+    public boolean onTheSameNetwork(InetAddress adr ) {
+        byte [] byteadr = adr.getAddress();
+        if (byteadr.length != netmask.length) return false;
+        for(int i=0; i < netmask.length; i++) {
+            if ((netmask[i] & byteadr[i])!=netaddress[i]) return false;
+        }
+        return true;
+    }
 
 }
\ No newline at end of file