diff rep/translator/TranslatorImpl.java @ 327:7b6dede07f4a

*** empty log message ***
author kono
date Sat, 11 Oct 2008 19:31:13 +0900
parents b1a6acf0b8a9
children 36faf76a087c
line wrap: on
line diff
--- a/rep/translator/TranslatorImpl.java	Sat Oct 11 19:04:38 2008 +0900
+++ b/rep/translator/TranslatorImpl.java	Sat Oct 11 19:31:13 2008 +0900
@@ -18,7 +18,6 @@
 	 * queue が5つもいるって、あまりに馬鹿げてる。
 	 */
 	public REPCommandOptimizer optimizer;
-	private LinkedList<REPCommand> sentCmds;
 	private LinkedList<REPCommand> unMergedCmds;
 	public LinkedList<REPCommand> sentMergedList;
 	private LinkedList<REPCommand> mergeAgainList;
@@ -27,7 +26,6 @@
 	public TranslatorImpl(int _eid,REPCommandOptimizer opt){
 		eid = _eid;
 		optimizer = opt;
-		sentCmds = new LinkedList<REPCommand>();
 		unMergedCmds = new LinkedList<REPCommand>();
 		mergeAgainList = new LinkedList<REPCommand>();
 		sentMergedList = new LinkedList<REPCommand>();
@@ -40,7 +38,7 @@
 	 * @return translated command.
 	 */
 	public REPCommand transSendCmd(REPCommand cmd){
-		sentCmds.add(cmd);
+		assert(cmd.eid==eid);
 		unMergedCmds.add(cmd);
 		
 		//マージ中にユーザから割り込みがあった場合
@@ -101,10 +99,6 @@
 		return true;
 	}
 	
-	public REPCommand prev() {
-		return sentCmds.poll();
-	}
-
 	private REPCommand createUndo(REPCommand cmd){
 		REPCommand retCmd = new REPCommand(cmd);
 		if (cmd.cmd==REP.REPCMD_INSERT) retCmd.cmd=REP.REPCMD_DELETE;
@@ -215,7 +209,6 @@
 	public boolean isFinished() {
 		if(unMergedCmds.size() > 0) return false;
 		if(sentMergedList.size() > 0) return false;
-		if(sentCmds.size() > 0) return false;
 		return true;
 	}