# HG changeset patch
# User one
# Date 1387270842 -32400
# Node ID aafc88985822b7d70162f3c6f8d4d2d438a5a3e5
# Parent  89dc953fd9e8091c6253219c8b0d85297bdff20a
Refactor

diff -r 89dc953fd9e8 -r aafc88985822 src/alice/topology/manager/keeparive/CreateTask.java
--- a/src/alice/topology/manager/keeparive/CreateTask.java	Tue Dec 17 17:21:12 2013 +0900
+++ b/src/alice/topology/manager/keeparive/CreateTask.java	Tue Dec 17 18:00:42 2013 +0900
@@ -23,7 +23,8 @@
 		TaskExecuter.getInstance().setKey();
 		for (String manager : list){
 			int i = 5;
-			TaskInfo task = new TaskInfo(manager, "_RESPONCE", i * 1000);
+			TaskInfo task = new TaskInfo(TaskType.PING);
+			task.setInfo(manager, "_RESPONCE", i * 1000);
 			ods.put("_TASKINFO", task);
 			i +=5;
 		}
diff -r 89dc953fd9e8 -r aafc88985822 src/alice/topology/manager/keeparive/RespondPing.java
--- a/src/alice/topology/manager/keeparive/RespondPing.java	Tue Dec 17 17:21:12 2013 +0900
+++ b/src/alice/topology/manager/keeparive/RespondPing.java	Tue Dec 17 18:00:42 2013 +0900
@@ -16,7 +16,8 @@
 		RespondData d = respond.asClass(RespondData.class);
 		System.out.print("ping from "+d.from);
 		System.out.println(" Recieved time "+d.time);
-		TaskInfo task = new TaskInfo(d.from, "_RESPONCE", 5 * 1000);
+		TaskInfo task = new TaskInfo(TaskType.PING);
+		task.setInfo(d.from, "_RESPONCE", 5 * 1000);
 		ods.put("_TASKINFO", task);
 		
 	}
diff -r 89dc953fd9e8 -r aafc88985822 src/alice/topology/manager/keeparive/TaskExecuter.java
--- a/src/alice/topology/manager/keeparive/TaskExecuter.java	Tue Dec 17 17:21:12 2013 +0900
+++ b/src/alice/topology/manager/keeparive/TaskExecuter.java	Tue Dec 17 18:00:42 2013 +0900
@@ -28,21 +28,20 @@
 			ods.update("_WAITINGLIST", list);
 			setKey();
 			return;
-		} else {
+		}
+		nowTask = list.getTaskList().poll();
+		ods.update("_WAITINGLIST", list);
+		time = System.currentTimeMillis();
+		if (nowTask.getSleepTime()!=0){
 			try {
-				nowTask = list.getTaskList().poll();
-				ods.update("_WAITINGLIST", list);
-				time = System.currentTimeMillis();
-				if (nowTask.getSleepTime()!=0)
-					this.wait(nowTask.getSleepTime());
-				if (interruptFlag){				
-					interruptFlag = false;
-				} else {
-					ods.ping(nowTask.getManagerKey(), nowTask.getReturnKey());
-					new RespondPing(nowTask.getReturnKey());
-				}
-			} catch (InterruptedException e) {		
-			}
+				this.wait(nowTask.getSleepTime());
+			} catch (InterruptedException e) {}
+		}
+		if (interruptFlag){				
+			interruptFlag = false;
+		} else {
+			ods.ping(nowTask.getManagerKey(), nowTask.getReturnKey());
+			new RespondPing(nowTask.getReturnKey());
 		}
 		setKey();
 	}
diff -r 89dc953fd9e8 -r aafc88985822 src/alice/topology/manager/keeparive/TaskInfo.java
--- a/src/alice/topology/manager/keeparive/TaskInfo.java	Tue Dec 17 17:21:12 2013 +0900
+++ b/src/alice/topology/manager/keeparive/TaskInfo.java	Tue Dec 17 18:00:42 2013 +0900
@@ -1,16 +1,25 @@
 package alice.topology.manager.keeparive;
 
 public class TaskInfo {
+	private TaskType type;
 	private long sleepTime;
 	private String managerKey;
 	private String returnKey;
 	
-	public TaskInfo(String managerKey, String returnKey, long time){
+	public TaskInfo(TaskType t){
+		type = t;
+	}
+	
+	public void setInfo(String managerKey, String returnKey, long time){
 		this.managerKey = managerKey;
 		this.returnKey = returnKey;
 		sleepTime = time;
 	}
 	
+	public TaskType getType() {
+		return type;
+	}
+	
 	public long getSleepTime(){
 		return sleepTime;
 	}
@@ -22,16 +31,8 @@
 	public String getManagerKey() {
 		return managerKey;
 	}
-
-	public void setManagerKey(String key) {
-		managerKey = key;
-	}
 	
 	public String getReturnKey() {
 		return returnKey;
 	}
-
-	public void setReturnKey(String key) {
-		returnKey = key;
-	}
 }
diff -r 89dc953fd9e8 -r aafc88985822 src/alice/topology/manager/keeparive/TaskType.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/alice/topology/manager/keeparive/TaskType.java	Tue Dec 17 18:00:42 2013 +0900
@@ -0,0 +1,6 @@
+package alice.topology.manager.keeparive;
+
+public enum TaskType {
+	PING,
+	CLOSE
+}