Mercurial > hg > RemoteEditor > REPSessionManager

comparison rep/handler/Translator.java @ 447:dc9b2da06fa9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add README
author one
date Wed, 22 Sep 2010 17:14:35 +0900
parents 6a7004071777
children ed97273477a0
comparison
equal deleted inserted replaced
446:6a7004071777 447:dc9b2da06fa9
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) {
89 LinkedList<REPCommand> n = new LinkedList<REPCommand>(); 90 LinkedList<REPCommand> n = new LinkedList<REPCommand>();
90 for(int i=0;i< sortedEditCmds.size()-1;i++) { 91 for(int i=0;i< sortedEditCmds.size()-1;i++) {
91 n.addLast(unMergedCmds.get(i)); 92 n.addLast(unMergedCmds.get(i));
92 } 93 }
93 sortedEditCmds = null; 94 sortedEditCmds = null;
94 unMergedCmds = n; 95 unMergedCmds = n;
96 }
95 } 97 }
96 /** 98 /**
97 * Sent optimized merged command list 99 * Sent optimized merged command list
98 * @param editor 100 * @param editor
99 * @param output 101 * @param output
100 * @return if any sent commands output 102 * @return if any sent commands output
101 */ 103 */
102 public boolean optimizedSend(REPNode editor, LinkedList<REPCommand> output) { 104 public boolean optimizedSend(REPNode editor, LinkedList<REPCommand> output) {
105 /*
106 * Optimized send の場合は、unMergedCommand のつじつまを合わせる必要がある。
107 */
103 sentMergedList.clear(); 108 sentMergedList.clear();
104 List<REPCommand> output1 = optimizer.optimize(output); 109 List<REPCommand> output1 = optimizer.optimize(output);
105 if (output1.size()==0) { 110 if (output1.size()==0) {
106 merge_mode = false; 111 merge_mode = false;
107 return false; 112 return false;