# HG changeset patch
# User Nobuyasu Oshiro  <dimolto@cr.ie.u-ryukyu.ac.jp>
# Date 1316636178 -32400
# Node ID 405ead268439ed9db8f7549237f76843695ad1d3
# Parent  d89e03d99b7f19ed59fadd0303d38ec9ad373cb3# Parent  d3e806372657f6501106053845e1a81b1e774a9c
merge 81

diff -r d89e03d99b7f -r 405ead268439 src/myVncClient/CuiMyVncClient.java
--- a/src/myVncClient/CuiMyVncClient.java	Thu Sep 22 05:14:49 2011 +0900
+++ b/src/myVncClient/CuiMyVncClient.java	Thu Sep 22 05:16:18 2011 +0900
@@ -1013,7 +1013,7 @@
 				echoValue = new EchoClient(pHost, this, echoPort);
 				echoValue.openport();
 
-				echoValue = echoValue.hostn("1");
+				echoValue = echoValue.requestHostName("1");
 			} else {
 				echoValue = new EchoClient();
 				echoValue = echoValue.Interruption(clientSocket);
diff -r d89e03d99b7f -r 405ead268439 src/myVncClient/EchoClient.java
--- a/src/myVncClient/EchoClient.java	Thu Sep 22 05:14:49 2011 +0900
+++ b/src/myVncClient/EchoClient.java	Thu Sep 22 05:16:18 2011 +0900
@@ -110,7 +110,7 @@
 	 *            select connect port 
 	 * @return
 	 */
-	EchoClient hostn(String args) {
+	EchoClient requestHostName(String args) {
 		// サーバーにメッセージを送る
 		if (echoSocket != null && os != null && is != null) {
 			try {
diff -r d89e03d99b7f -r 405ead268439 src/myVncClient/MyVncClient.java
--- a/src/myVncClient/MyVncClient.java	Thu Sep 22 05:14:49 2011 +0900
+++ b/src/myVncClient/MyVncClient.java	Thu Sep 22 05:16:18 2011 +0900
@@ -1152,7 +1152,7 @@
 				echoValue = new EchoClient(pHost, this, echoPort);
 				echoValue.openport();
 
-				echoValue = echoValue.hostn("1");
+				echoValue = echoValue.requestHostName("1");
 			} else {
 				echoValue = new EchoClient();
 				echoValue = echoValue.Interruption(clientSocket);