--- a/src/main/java/jp/ac/u_ryukyu/treevnc/client/WaitReply.java	Wed Sep 12 13:16:47 2012 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/client/WaitReply.java	Tue Sep 18 17:23:19 2012 +0900
@@ -4,15 +4,12 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 
-
 public class WaitReply extends Thread {
-	MyVncClient client;
 	boolean passflag;
+	EchoClient echo;
 	
-
-
-	public WaitReply(String treenum, MyVncClient client) {
-		this.client = client;
+	public WaitReply(String treenum, EchoClient echo) {
+		this.echo = echo;
 	}
 	
 	public boolean checkPath() {
@@ -27,22 +24,14 @@
 			try {
 				echoServer = new ServerSocket(10001);
 				clientSocket = echoServer.accept();
-				
 				if (clientSocket != null) {
-					client.close();
-					/*
+					echo.client.close();
 					passflag = true;
-					client.setClientSocket(clientSocket);
-					client.init();
-					client.setEchoValue(null);
-					client.getParentName();
-					client.start_threads();
-					client.start();
-					*/
-					client.run();
+					echo.client.setSocket(echo.createSocketForClient(clientSocket));
+					// client.init();
+					echo.client.run();
 					echoServer.close();
 				}
-
 			} catch (IOException e) {
 				System.out.println(e);
 			}