Mercurial > hg > RemoteEditor > REPSessionManager
changeset 502:49b689b17d06 default tip
merged TestEditor to REPEditor
author | suika6039 |
---|---|
date | Tue, 21 Dec 2010 18:01:15 +0900 |
parents | ebfa3b05a8dd |
children | |
files | test/editortest/REPEditor.java |
diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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;