Mercurial > hg > RemoteEditor > REPSessionManager
comparison rep/handler/Translator.java @ 448:ed97273477a0
fix sentList
author | one |
---|---|
date | Wed, 22 Sep 2010 17:42:47 +0900 |
parents | dc9b2da06fa9 |
children | 89a326696c54 |
comparison
equal
deleted
inserted
replaced
447:dc9b2da06fa9 | 448:ed97273477a0 |
---|---|
84 | 84 |
85 /** | 85 /** |
86 * Received all merge command ack | 86 * Received all merge command ack |
87 */ | 87 */ |
88 public void endMerge() { | 88 public void endMerge() { |
89 if (false) { | |
90 LinkedList<REPCommand> n = new LinkedList<REPCommand>(); | 89 LinkedList<REPCommand> n = new LinkedList<REPCommand>(); |
91 for(int i=0;i< sortedEditCmds.size()-1;i++) { | 90 for(int i=0;i< sortedEditCmds.size()-1;i++) { |
92 n.addLast(unMergedCmds.get(i)); | 91 n.addLast(unMergedCmds.get(i)); |
93 } | 92 } |
94 sortedEditCmds = null; | 93 sortedEditCmds = null; |
95 unMergedCmds = n; | 94 unMergedCmds = n; |
96 } | |
97 } | 95 } |
98 /** | 96 /** |
99 * Sent optimized merged command list | 97 * Sent optimized merged command list |
100 * @param editor | 98 * @param editor |
101 * @param output | 99 * @param output |