# HG changeset patch
# User Yu Taninari <e085734@ie.u-ryukyu.ac.jp>
# Date 1311843579 -32400
# Node ID 347c153f74c7d20db4640ee53f2198990a2c50a3
# Parent  6e703f1000e75b680913234e04fe551130ccc96f# Parent  bf5ac06df67545418576543d7f7ddf05e8f6b04f
merge

diff -r 6e703f1000e7 -r 347c153f74c7 bin/myVncProxy/acceptClient.class
Binary file bin/myVncProxy/acceptClient.class has changed
diff -r 6e703f1000e7 -r 347c153f74c7 bin/myVncProxy/acceptThread.class
Binary file bin/myVncProxy/acceptThread.class has changed
diff -r 6e703f1000e7 -r 347c153f74c7 bin/myVncProxy/sock.class
Binary file bin/myVncProxy/sock.class has changed
diff -r 6e703f1000e7 -r 347c153f74c7 src/myVncProxy/AcceptThread.java
--- a/src/myVncProxy/AcceptThread.java	Thu Jul 28 17:52:48 2011 +0900
+++ b/src/myVncProxy/AcceptThread.java	Thu Jul 28 17:59:39 2011 +0900
@@ -1,31 +1,30 @@
 package myVncProxy;
-import java.net.ServerSocket;
 import java.net.Socket;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
 public class AcceptThread implements Runnable {
-	MyRfbProto rfb;
-	byte[] imageBytes;
+        MyRfbProto rfb;
+        byte[] imageBytes;
+
+        AcceptThread(MyRfbProto _rfb) {
+                rfb = _rfb;
+        }
 
-	AcceptThread(MyRfbProto _rfb ) {
-		rfb = _rfb;
-	}
-	public void run() {
-		rfb.selectPort();
-		while (true) {
-			try {
-				Socket newCli = rfb.accept();
-				
-				OutputStream os = newCli.getOutputStream();
-				InputStream is = newCli.getInputStream();
-				rfb.newClient(this, newCli, os, is);
-				} catch (IOException e) {
-				e.printStackTrace();
-				System.out.println(e);
-			}
-		}
-	}
+        public void run() {
+                rfb.selectPort();
+                while (true) {
+                        try {
+                                Socket newCli = rfb.accept();
+
+                                OutputStream os = newCli.getOutputStream();
+                                InputStream is = newCli.getInputStream();
+                                rfb.newClient(this, newCli, os, is);
+                        } catch (IOException e) {
+                                e.printStackTrace();
+                                System.out.println(e);
+                        }
+                }
+        }
 }
-
diff -r 6e703f1000e7 -r 347c153f74c7 src/myVncProxy/MyRfbProto.java
diff -r 6e703f1000e7 -r 347c153f74c7 src/myVncProxy/RfbProto.java
--- a/src/myVncProxy/RfbProto.java	Thu Jul 28 17:52:48 2011 +0900
+++ b/src/myVncProxy/RfbProto.java	Thu Jul 28 17:59:39 2011 +0900
@@ -78,7 +78,7 @@
 
 	// Supported encodings and pseudo-encodings
 	final static int EncodingRaw = 0, EncodingCopyRect = 1, EncodingRRE = 2,
-			EncodingCoRRE = 4, EncodingHextile = 5, EncodingZlib = 6,
+ 			EncodingCoRRE = 4, EncodingHextile = 5, EncodingZlib = 6,
 			EncodingTight = 7, EncodingZRLE = 16,
 			EncodingCompressLevel0 = 0xFFFFFF00,
 			EncodingQualityLevel0 = 0xFFFFFFE0, EncodingXCursor = 0xFFFFFF10,
diff -r 6e703f1000e7 -r 347c153f74c7 src/myVncProxy/VncProxyService.java