changeset 117:92ceb7b1fe12

remove unnecessary constructor
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Mon, 26 May 2014 13:57:03 +0900
parents 16d8f2f7c8e1
children 38e461e9b9c9
files src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java
diffstat 1 files changed, 7 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java	Mon May 26 11:10:57 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java	Mon May 26 13:57:03 2014 +0900
@@ -10,17 +10,16 @@
 	private int nodeCounter = 0, parentnum = 0;
 	private LinkedList<String> ls = new LinkedList<String>();
 	private boolean addrRegistor = true;
-	// private int passNumber=0,numberZone;
 	boolean runflag = false;
 	private final int treebranch = 2;
 	private String newparent, request, myAddress;
 	private String leaderflag = "0", sendleaderflag = "0";
 	private final int intv_time = 100;
-	private String port = "5999";
+	private String defaultVNCport = "5999";
 
 	public AcceptClient() {
-		// this.name = name;
 	}
+	
 	public void transferParentAddrerss(BufferedReader is, PrintStream os) {
 		try {
 			while (true) {
@@ -133,10 +132,9 @@
 		parentnum = (Integer.parseInt(port) - 1) / treebranch;
 		newparent = ls.get(parentnum);
 		sendleaderflag = decisionLeader(Integer.parseInt(port), treebranch);
-		// leaderflag = decisionLeader(Integer.parseInt(port),treebranch);
 	}
 
-	private void replyLeaderNode(PrintStream os, BufferedReader is, String port, int treeNumber) throws IOException,
+	private synchronized void replyLeaderNode(PrintStream os, BufferedReader is, String port, int treeNumber) throws IOException,
 			InterruptedException {
 		String lastNode = ls.getLast();
 		String checkSameHost = ls.get(treeNumber);
@@ -148,12 +146,12 @@
 		reportLastNode(lastNode, newparent, port, String.valueOf(parentnum), sendleaderflag);
 		listupdate(port);
 		if(lastNode != checkSameHost) {
-			os.println(this.port);
+			os.println(this.defaultVNCport);
 			os.println(treeNumber);
 		}
 		leaderflag = decisionLeader(treeNumber, treebranch);
 		if(ls.size() > treeNumber +1)
-			lostNodeConnection(treeNumber, lastNode, this.port);
+			lostNodeConnection(treeNumber, lastNode, this.defaultVNCport);
 		Thread.sleep(intv_time);
 		is.close();
 		os.close();
@@ -178,29 +176,6 @@
 		}
 	}
 	
-/*
-	private void replyNormalChildren(PrintStream os, BufferedReader is,
-			String port, String treeNumber, boolean flag) throws IOException,
-			InterruptedException {
-		if (flag)
-			notifyThread();
-		else
-			waitThread();
-		if (Integer.parseInt(treeNumber) == ls.size())
-			return;
-		os.println(ls.get(Integer.parseInt(port)));
-		os.println(port);
-		if (ls.size() - 1 + passCheck == Integer.parseInt(treeNumber))
-			treeNumber = "skip";
-		passCheck = 0;
-		os.println(treeNumber);
-		System.out.println("num4=" + ls.get(Integer.parseInt(port)));
-		runflag = false;
-		is.close();
-		os.close();
-	}
-*/
-	
 	private synchronized boolean replyCreateTree(PrintStream os, String port,
 			String line) throws InterruptedException {
 		if (addrRegistor == true) {
@@ -239,7 +214,7 @@
 			DataOutputStream os = new DataOutputStream(echoSocket.getOutputStream());
 			BufferedReader is = new BufferedReader(new InputStreamReader(echoSocket.getInputStream()));
 			os.writeBytes(newparent + "\n");
-			os.writeBytes(this.port+"\n");
+			os.writeBytes(this.defaultVNCport+"\n");
 			os.writeBytes(newpnum + "\n");
 			// os.writeBytes(newtreenum + "\n");
 			// os.writeBytes(newleaderflag + "\n");
@@ -271,20 +246,7 @@
 
 	}
 
-	/*
-	 * // previous viersion for reconnection. synchronized void
-	 * checkWait(PrintStream os,BufferedReader is,String port,int treeNum)
-	 * throws InterruptedException, IOException { final int TIMEOUT = 3000; if
-	 * (passNumber == 0) { passNumber++; numberZone = ((treeNum - 1) /
-	 * treebranch); replyLeaderNode(os,is,port,String.valueOf(treeNum));
-	 * notifyAll(); passNumber = 0; } else if (numberZone == ((treeNum - 1) /
-	 * treebranch)) { if (++passNumber == treebranch) { passNumber = 0;
-	 * replyNormalChildren(os,is,port,String.valueOf(treeNum),true); } else {
-	 * replyNormalChildren(os,is,port,String.valueOf(treeNum),false);
-	 * wait(TIMEOUT); } } else { wait(); checkWait(os,is,port,treeNum); } }
-	 */
-
-	synchronized void checkWait(PrintStream os, BufferedReader is, String port,
+	void checkWait(PrintStream os, BufferedReader is, String port,
 			int treeNum) throws InterruptedException, IOException {
 		replyLeaderNode(os, is, port, treeNum);
 	}