changeset 115:804b1ce07aa0

remove unnecessary code
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Mon, 26 May 2014 11:06:27 +0900
parents 425c45d0da12
children 16d8f2f7c8e1
files src/main/java/jp/ac/u_ryukyu/treevnc/server/MyRfbProtoProxy.java src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java src/main/java/jp/ac/u_ryukyu/treevnc/server/state/ChangeHost.java
diffstat 3 files changed, 3 insertions(+), 93 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/MyRfbProtoProxy.java	Fri May 23 23:58:14 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/MyRfbProtoProxy.java	Mon May 26 11:06:27 2014 +0900
@@ -462,42 +462,7 @@
 		reader.read(b);
 	}
 
-	void readSecType(Reader is, Writer os) throws TransportException {
-		byte[] b = new byte[1];
-		is.readBytes(b);
-
-		int count = 260;
-		int[] data = { 0, 2, 0, -128, -1, -1, -1, -1, -1, -1, -1, -1, -55, 15,
-				-38, -94, 33, 104, -62, 52, -60, -58, 98, -117, -128, -36, 28,
-				-47, 41, 2, 78, 8, -118, 103, -52, 116, 2, 11, -66, -90, 59,
-				19, -101, 34, 81, 74, 8, 121, -114, 52, 4, -35, -17, -107, 25,
-				-77, -51, 58, 67, 27, 48, 43, 10, 109, -14, 95, 20, 55, 79,
-				-31, 53, 109, 109, 81, -62, 69, -28, -123, -75, 118, 98, 94,
-				126, -58, -12, 76, 66, -23, -90, 55, -19, 107, 11, -1, 92, -74,
-				-12, 6, -73, -19, -18, 56, 107, -5, 90, -119, -97, -91, -82,
-				-97, 36, 17, 124, 75, 31, -26, 73, 40, 102, 81, -20, -26, 83,
-				-127, -1, -1, -1, -1, -1, -1, -1, -1, -111, 73, -29, 30, 57,
-				-67, -75, -77, -49, -50, -99, -76, -80, -80, 14, 65, 57, -105,
-				-103, -54, -102, 3, 39, -44, 39, 35, 118, -84, -64, 37, -117,
-				-21, 89, -31, -68, 70, 5, 122, -92, -119, 9, 121, 63, -112,
-				-60, 122, -46, -69, -36, 92, -103, -92, 74, 92, -73, 87, 120,
-				-8, 116, -47, 111, 20, -41, 110, 122, -3, -94, 14, 42, -51,
-				-59, 48, -54, -125, 117, 60, 77, -52, -31, 98, 32, -2, -102,
-				-15, -29, 58, -14, -106, -116, -32, -86, 50, -32, -16, -3,
-				-123, 87, 88, -118, 10, 120, -107, -37, 125, -110, 59, 87, 93,
-				-24, 124, -99, 18, 78, -13, -49, -34, -24, -27, 1, 114, -67,
-				-98, -56, -3, 85, -67, -126, 77 };
-		for (int i = 0; i < count; i++) {
-			os.write((byte) data[i]);
-			os.flush();
-		}
-
-		byte[] c = new byte[256];
-		is.readBytes(c);
-
-		System.out.println(new String(c));
-
-	}
+	
 
 	void sendSecResult(Writer os) throws TransportException {
 		byte[] b = castIntByte(0);
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java	Fri May 23 23:58:14 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java	Mon May 26 11:06:27 2014 +0900
@@ -7,7 +7,6 @@
 import java.util.logging.Logger;
 
 import jp.ac.u_ryukyu.treevnc.AcceptThread;
-import jp.ac.u_ryukyu.treevnc.server.state.ChangeHost;
 
 import com.glavsoft.core.SettingsChangedEvent;
 import com.glavsoft.rfb.IChangeSettingsListener;
@@ -158,8 +157,8 @@
 		CreateThread createThread = new CreateThread(clients);
 		Thread thread = new Thread(createThread);
 		thread.start();
-		Thread thread2 = new Thread(new ChangeHost(this, forceReconnection));
-		thread2.start();
+		// Thread thread2 = new Thread(new ChangeHost(this, forceReconnection));
+		// thread2.start();
 	}
 
 	protected void socketClose() {
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/state/ChangeHost.java	Fri May 23 23:58:14 2014 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-package jp.ac.u_ryukyu.treevnc.server.state;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.UnknownHostException;
-
-import jp.ac.u_ryukyu.treevnc.server.VncProxyService;
-
-public class ChangeHost implements Runnable {
-
-	private VncProxyService vps;
-
-	public ChangeHost(VncProxyService _vps, boolean isApplet) {
-		vps = _vps;
-	}
-
-
-	String str;
-
-	@Override
-	public void run() {
-		try {
-			waitingInput();
-			ReconnectionRequest reconnectionRequest = new ReconnectionRequest(vps);
-			reconnectionRequest.sendReconnection(String.valueOf(vps.opendPort));
-		} catch (UnknownHostException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public String getHost() {
-		return str;
-	}
-
-	private void waitingInput() {
-		try {
-			while(true) {
-				BufferedReader br = new BufferedReader(new InputStreamReader(
-						System.in));
-				str = br.readLine();
-				// param hostAddress,width,height 
-				vps.changeVNCServer(str,1000,1000);
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		} catch (InterruptedException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-}