# HG changeset patch
# User one
# Date 1311330078 -32400
# Node ID 5867cac7efb0d80d7468ca26ac4e48288481c4dc
# Parent  c07bec8c86171a98441c7ff183ac6723311360d2
active program

diff -r c07bec8c8617 -r 5867cac7efb0 src/myVncClient/EchoClient.java
--- a/src/myVncClient/EchoClient.java	Thu Jul 21 23:53:48 2011 +0900
+++ b/src/myVncClient/EchoClient.java	Fri Jul 22 19:21:18 2011 +0900
@@ -15,19 +15,13 @@
 	String parent;// 親の番号
 	String treenum;// 自分の番号
 	String leaderflag;// リーダフラグ
-	
-	String line;
-	BufferedReader lostis = null;//あとで修正する
-	PrintStream lostos;//あとで修正する
 	Socket clientSocket = null;
-	ServerSocket echoServer = null;
-
 	
 	
 
 	// WaitReplyに自分自身を渡している
 	public EchoClient() {
-		waitReply = new WaitReply("0");
+	
 	}
 
 	// VncViewerから引数をもらってきてproxy役を認識する
@@ -79,7 +73,7 @@
 	 *            select at first connection or other
 	 * @return
 	 */
-	void hostn(String args) {
+	EchoClient hostn(String args) {
 		// サーバーにメッセージを送る
 		if (echoSocket != null && os != null && is != null) {
 			try {
@@ -121,7 +115,7 @@
 			waitReply.start();
 
 		}
-		return ;
+		return this;
 	}
 
 	
@@ -217,6 +211,8 @@
 
 	void Interruption(Socket _clientSocket) {
 		clientSocket = _clientSocket;
+		BufferedReader lostis = null;//あとで修正する
+		PrintStream lostos;//あとで修正する
 
 		try {
 			lostis = new BufferedReader(new InputStreamReader(
diff -r c07bec8c8617 -r 5867cac7efb0 src/myVncClient/MyVncClient.java
--- a/src/myVncClient/MyVncClient.java	Thu Jul 21 23:53:48 2011 +0900
+++ b/src/myVncClient/MyVncClient.java	Fri Jul 22 19:21:18 2011 +0900
@@ -19,7 +19,6 @@
 	boolean inSeparateFrame = false;
 	Socket clientSocket = null;
 	String parent, treenum;
-//	Revalue value; // include information trenumber, parentstnumber,etc
 	private String leaderflag;
 
 
@@ -28,9 +27,13 @@
 	// It simply runs the applet inside a newly-created frame.
 	//
 
+	public static void main(String[] argv){
+		MyVncClient v = new MyVncClient();
+		v.runClient(argv);
+	}
 
-	private void runClient(EchoClient echoClient) {
-
+	private void runClient(String[] argv) {
+		mainArgs = argv;
 		inAnApplet = false;
 		inSeparateFrame = true;
 
@@ -124,7 +127,6 @@
 			Random rnd = new Random();
 			long ran = rnd.nextInt(5000) + 5000;
 			System.out.println(ran);
-			boolean runflag = false;
 			while (true) {
 				try {
 					Thread.sleep(ran);
@@ -135,8 +137,8 @@
 				echo = new EchoClient();
 				echo.openport();
 				echo.losthost();
-				if(runflag==true){
-					echo.runflag=true;
+				if(echo.runflag==true){
+					echo.runflag=false;
 					break;
 				}
 			}
@@ -708,7 +710,7 @@
 				echo = new EchoClient(pHost);
 				echo.openport();
 				
-				echo.hostn("1");
+				value = echo.hostn("1");
 			} else {
 				echo = new EchoClient();
 				echo.Interruption(clientSocket);
@@ -1053,7 +1055,6 @@
 	}
 
 	public static void main(Socket _clientSocket) {
-		// TODO Auto-generated method stub
 		MyVncClient v = new MyVncClient();
 		v.clientSocket = _clientSocket;
 		// v.mainArgs = argv;
@@ -1066,7 +1067,6 @@
 	}
 
 	public static void main(EchoClient value) {
-		// TODO Auto-generated method stub
 		MyVncClient v = new MyVncClient();
 		v.inAnApplet = false;
 		v.inSeparateFrame = true;