# HG changeset patch
# User kono
# Date 1221042493 -32400
# Node ID 6c2f542654712f206368129af35631de08bea0f2
# Parent  8c02ec16b8740806b673b68a42dce5a4eea207b0
editor list initialize
translator return empty list instead of null

diff -r 8c02ec16b874 -r 6c2f54265471 rep/Editor.java
--- a/rep/Editor.java	Tue Sep 09 18:50:18 2008 +0900
+++ b/rep/Editor.java	Wed Sep 10 19:28:13 2008 +0900
@@ -25,6 +25,7 @@
 		setHostAndPort(myChannel);
 		translater = new TranslaterImp1(eid);
 		sentList = new LinkedList<REPCommand>();
+		sentMergedList = new LinkedList<REPCommand>();
 
 		if (doOptimize) optimizer = new DeleteInsertOptimizer(); //タカノがつくったおぷてぃまいざ
 		else            optimizer = new NullOptimizer();         //なにもしないけどOptimizer.
@@ -36,6 +37,7 @@
 		this.myChannel = channel;
 		translater = new TranslaterImp1(eid);
 		sentList = new LinkedList<REPCommand>();
+		sentMergedList = new LinkedList<REPCommand>();
 		setHostAndPort(myChannel);
 	}
 	
@@ -57,7 +59,7 @@
 				//マージ中のエディタからの割り込み検知に使う
 				sentMergedList.addAll(cmds);
 				sendMergedCommand(cmds);
-				return null;
+				return list;
 			}else{
 				//エディタからの新たな編集コマンド
 				sentList.add(command);