diff rep/handler/Translator.java @ 421:f8916a96a373

(no commit message)
author one
date Sat, 06 Jun 2009 14:42:40 +0900
parents 795ef563f2a0
children 1acc3dfde5d3
line wrap: on
line diff
--- a/rep/handler/Translator.java	Fri Feb 13 19:13:50 2009 +0900
+++ b/rep/handler/Translator.java	Sat Jun 06 14:42:40 2009 +0900
@@ -9,6 +9,7 @@
 import rep.REP;
 import rep.REPCommand;
 import rep.SessionManager;
+import rep.channel.REPLogger;
 import rep.optimizers.REPCommandOptimizer;
 
 public class Translator {
@@ -18,6 +19,7 @@
 	private LinkedList<REPCommand> unMergedCmds;
 	public LinkedList<REPCommand> sentMergedList;
 	private LinkedList<REPCommand> mergeAgainList;
+	public REPLogger logger = SessionManager.logger;
 	boolean merge_mode = false;
 
 	public Translator(int _eid,REPCommandOptimizer opt){
@@ -53,6 +55,7 @@
 	 * @param cmd
 	 */
 	public boolean catchOwnCommand(REPNode editor){
+		logger.writeLog("beforeMarge:"+unMergedCmds);
 		LinkedList<REPCommand> output = new LinkedList<REPCommand>();
 		LinkedList<REPCommand> cmds = new LinkedList<REPCommand>();
 				//スタック上にあるコマンドを全部undoコマンドにする
@@ -68,6 +71,8 @@
 		/* 残ったコマンドも再び実行させるが、まだマージされてないのでunMergedにも入れる  */
 		output.addAll(cmds);
 		unMergedCmds.addAll(cmds);
+		logger.writeLog("outputMarge:"+output);
+		logger.writeLog("afterMarge:"+unMergedCmds);
 		return optimizedSend(editor,output);
 	}
 
@@ -203,7 +208,7 @@
 //			default: assert false;
 //			}
 //		}
-		SessionManager.logger.writeLog("MergeAgain ret="+returnCommand.size());
+		logger.writeLog("MergeAgain ret="+returnCommand.size());
 //				+" increment="+count);
 		mergeAgainList.clear();
 		optimizedSend(editor, returnCommand);