Mercurial > hg > RemoteEditor > REPSessionManager

changeset 265:6c2f54265471

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
editor list initialize translator return empty list instead of null
author kono
date Wed, 10 Sep 2008 19:28:13 +0900
parents 8c02ec16b874
children 4a02c7f26794
files rep/Editor.java
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);