# HG changeset patch
# User one
# Date 1284191731 -32400
# Node ID 146d91b61b36481a602dcb805572e1e03e14c56f
# Parent  2c00fa39dd849ba4f03ac724b762121c66b9d85b
minor fix

diff -r 2c00fa39dd84 -r 146d91b61b36 Todo
--- a/Todo	Fri Sep 03 10:22:39 2010 +0900
+++ b/Todo	Sat Sep 11 16:55:31 2010 +0900
@@ -1,3 +1,7 @@
+Sat Sep 11 16:45:40 JST 2010
+
+これ、やっぱり難しすぎ。getMergeAgain で、sentMergedList が空でない場合がある。
+
 Sat Jan 16 18:06:37 JST 2010
 
 sentList 全部削除だと quit2 が早めに出されてしまうので、
@@ -41,7 +45,7 @@
     unMergeList はMerge 後、削除  ( まだ merge してない list )
     sentList はいじれない         ( 自分が他のエディタに送信した list)
 
-    sentMergeList                 ( 送信した merge command )
+    sentMergedList                 ( 送信した merge command )
     mergeAgainList                ( merge 中に自分のeditorに割り込まれた分 )
 
 確かに、mergeAgainList とかなんか、quueue が多すぎ。
diff -r 2c00fa39dd84 -r 146d91b61b36 rep/handler/Translator.java
--- a/rep/handler/Translator.java	Fri Sep 03 10:22:39 2010 +0900
+++ b/rep/handler/Translator.java	Sat Sep 11 16:55:31 2010 +0900
@@ -16,7 +16,7 @@
 	
 	public REPCommandOptimizer optimizer;
 	private LinkedList<REPCommand> unMergedCmds;
-	public LinkedList<REPCommand> sentMergedList;
+	private LinkedList<REPCommand> sentMergedList;
 	boolean mergeAgain;
 	public REPLogger logger = SessionManager.logger;
 	boolean merge_mode = false;
diff -r 2c00fa39dd84 -r 146d91b61b36 test/sematest/TestSessionManager.java
--- a/test/sematest/TestSessionManager.java	Fri Sep 03 10:22:39 2010 +0900
+++ b/test/sematest/TestSessionManager.java	Sat Sep 11 16:55:31 2010 +0900
@@ -21,7 +21,7 @@
 
 	/*
 	 * All test is performed in localhost, so all session manager
-	 * should have differenct port number each other.
+	 * should have different port number each other.
 	 */
 	
 	/*
@@ -72,7 +72,7 @@
 	}
 
 	/*
-	 * start session manager. sm.init(port,guit) is a mainloop, so
+	 * start session manager. sm.init(port,gui) is a mainloop, so
 	 * we need Thread here. 
 	 */
 	public int startSessionManager(final SessionManager sm,int i,int port) {
@@ -133,7 +133,7 @@
 		 *    isSimulation=true     thread base simulation for PathFinder
 		 *    isSimulation=false    socket based communication mode
 		 */
-		REPServerSocketChannel.isSimulation = true;
+		REPServerSocketChannel.isSimulation = false;
 		// At least 3 TestEditors are required.
 		final TestSessionManager test = new TestSessionManager(1, 0, 3);
 		logger.setLogLevel(5);