comparison test/editortest/REPEditor.java @ 502:49b689b17d06 default tip

merged TestEditor to REPEditor
author suika6039
date Tue, 21 Dec 2010 18:01:15 +0900
parents 5c95a9020e31
children
comparison
equal deleted inserted replaced
501:ebfa3b05a8dd 502:49b689b17d06
163 repText.insert(command.lineno, command.string); 163 repText.insert(command.lineno, command.string);
164 } 164 }
165 forward(command); 165 forward(command);
166 break; 166 break;
167 case REPCMD_NOP: 167 case REPCMD_NOP:
168 case REPCMD_MERGE_MARK:
168 case REPCMD_INSERT_ACK: 169 case REPCMD_INSERT_ACK:
169 case REPCMD_DELETE_ACK: 170 case REPCMD_DELETE_ACK:
170 forward(command); 171 forward(command);
171 break; 172 break;
173 case REPCMD_CLOSE:
174 case REPCMD_CLOSE_2:
175 assert(false);
176 break;
172 case SMCMD_PUT_ACK: 177 case SMCMD_PUT_ACK:
173 sid = command.sid; 178 sid = command.sid;
174 eid = command.eid; 179 eid = command.eid;
180 setName(name+eid);
175 name += "(eid="+eid+",sid="+sid+")"; 181 name += "(eid="+eid+",sid="+sid+")";
176 inputLock = false; 182 inputLock = false;
177 break; 183 break;
178 case SMCMD_JOIN_ACK : 184 case SMCMD_JOIN_ACK :
179 sid = command.sid; 185 sid = command.sid;
180 eid = command.eid; 186 eid = command.eid;
187 setName(name+eid);
181 name += "(eid="+eid+",sid="+sid+")"; 188 name += "(eid="+eid+",sid="+sid+")";
182 inputLock = false; 189 inputLock = false;
190 break;
191 case SMCMD_QUIT:
192 timeout = 1;
183 break; 193 break;
184 case SMCMD_START_MERGE : 194 case SMCMD_START_MERGE :
185 // lock user input during merge (optional) 195 // lock user input during merge (optional)
186 inputLock = hasInputLock; 196 inputLock = hasInputLock;
187 command.cmd = REP.SMCMD_START_MERGE_ACK; 197 command.cmd = REP.SMCMD_START_MERGE_ACK;