Mercurial > hg > RemoteEditor > REPSessionManager
changeset 493:24297c2d9422
new merge continue...
author | one |
---|---|
date | Sat, 23 Oct 2010 18:54:15 +0900 |
parents | d2afd4efdd2d |
children | 6b718b6b789c |
files | rep/handler/Editor.java |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/rep/handler/Editor.java Sat Oct 23 16:15:14 2010 +0900 +++ b/rep/handler/Editor.java Sat Oct 23 18:54:15 2010 +0900 @@ -646,7 +646,7 @@ // sort したコマンド列を生成する for( REPCommand cmd0 : sentList) { if (cmd0.cmd==REP.REPCMD_INSERT || cmd0.cmd==REP.REPCMD_DELETE) - output.addFirst( createUndo(cmd0) ); + output.addLast( createUndo(cmd0) ); } sortedEditCmds = new TreeSet<REPCommand>(new REPCommandComparator(1)); @@ -678,7 +678,7 @@ // merge queue上にあるコマンドを全部undoコマンドするのと同時に // sort したコマンド列を生成する for( REPCommand cmd0 : sentList) { - output.addFirst( createUndo(cmd0) ); + output.addLast( createUndo(cmd0) ); } sortedEditCmds = new TreeSet<REPCommand>(new REPCommandComparator(1)); @@ -798,7 +798,7 @@ LinkedList<REPCommand> returnCommand = new LinkedList<REPCommand>(); for(REPCommand command : sentList) { if (command.cmd==REP.REPCMD_INSERT||command.cmd==REP.REPCMD_DELETE) - returnCommand.addFirst(createUndo(command)); + returnCommand.addLast(createUndo(command)); } returnCommand.addAll(sortedEditCmds); returnCommand.addLast(new REPCommand(REP.REPCMD_MERGE_MARK,0, sid, REP.MERGE_EID.id, seq(), ""));