# HG changeset patch
# User suika6039
# Date 1292922075 -32400
# Node ID 49b689b17d06866274f0799b0a12929b1ced1733
# Parent  ebfa3b05a8dd6c82c538eff94f5b9b0c8298df08
merged TestEditor to REPEditor

diff -r ebfa3b05a8dd -r 49b689b17d06 test/editortest/REPEditor.java
--- a/test/editortest/REPEditor.java	Fri Dec 17 16:18:26 2010 +0900
+++ b/test/editortest/REPEditor.java	Tue Dec 21 18:01:15 2010 +0900
@@ -165,22 +165,32 @@
 			forward(command);
 			break;
 		case REPCMD_NOP:
+		case REPCMD_MERGE_MARK:
 		case REPCMD_INSERT_ACK:
 		case REPCMD_DELETE_ACK:
 			forward(command);
 			break;	
+		case REPCMD_CLOSE:
+		case REPCMD_CLOSE_2:
+			assert(false);
+			break;
 		case SMCMD_PUT_ACK:
 			sid = command.sid;
 			eid = command.eid;
+			setName(name+eid);
 			name += "(eid="+eid+",sid="+sid+")";
 			inputLock = false;
 			break;
 		case SMCMD_JOIN_ACK	:
 			sid = command.sid;
 			eid = command.eid;
+			setName(name+eid);
 			name += "(eid="+eid+",sid="+sid+")";
 			inputLock = false;
 			break;
+		case SMCMD_QUIT:
+			timeout = 1;
+			break;
 		case SMCMD_START_MERGE :
 			// lock user input during merge (optional)
 			inputLock = hasInputLock;