--- a/rep/REPCommand.java	Wed Sep 24 17:31:57 2008 +0900
+++ b/rep/REPCommand.java	Fri Sep 26 21:14:02 2008 +0900
@@ -48,7 +48,7 @@
 	}
 	
 	public String toString(){
-		String repCmdString = new String(cmd + "," + sid + "," + eid + "," + seq + "," + lineno + "," + textsiz + "," + string);
+		String repCmdString = new String(cmd + ",sid=" + sid + ",eid=" + eid + ",seq=" + seq + ",lineno=" + lineno + ",sz=" + textsiz + "," + string);
 		return repCmdString;
 	}
 

--- a/rep/translater/TranslaterImp1.java	Wed Sep 24 17:31:57 2008 +0900
+++ b/rep/translater/TranslaterImp1.java	Fri Sep 26 21:14:02 2008 +0900
@@ -82,7 +82,6 @@
 	}
 
 	private REPCommand createUndo(REPCommand cmd){
-		//REPCommand retCmd = cmd.clone();
 		String str = new String(cmd.string);
 		REPCommand retCmd = new REPCommand(cmd.cmd, cmd.sid, cmd.eid, cmd.seq, cmd.lineno, str.length(), str);
 		
@@ -90,24 +89,9 @@
 		
 		if (cmd.cmd==REP.REPCMD_INSERT) retCmd.cmd=REP.REPCMD_DELETE;
 		else if (cmd.cmd==REP.REPCMD_DELETE) retCmd.cmd=REP.REPCMD_INSERT;
-		else if (cmd.cmd == REP.REPCMD_REPLACE) retCmd = createUndoReplace(retCmd);
 		return retCmd;
 	}
 
-	private REPCommand createUndoReplace(REPCommand cmd) {
-		for(REPCommand command : undoReplaceList){
-			if(command.eid == cmd.eid && command.seq == cmd.seq){
-				REPCommand tmp = new REPCommand(command);
-				tmp.setCMD(REP.REPCMD_REPLACE);
-				return tmp;
-			}
-		}
-		System.out.println(undoReplaceList);
-		System.out.println(cmd);
-		System.out.println();
-		return null;	
-	}
-	
 	class REPCommandComparator implements Comparator<REPCommand>{
 
 		public int compare(REPCommand o1, REPCommand o2) {
@@ -115,7 +99,6 @@
 			if ( o2.lineno > o1.lineno ) return 1;
 			else if ( o2.lineno < o1.lineno 
 					|| o2.eid > o1.eid )
-				/* deleteとinsertの場合などはeidによらず、順序を強制する必要があるかも  */
 				return -1;
 
 			return 1;
@@ -127,32 +110,12 @@
 		TreeSet<REPCommand> sortedCmds1 = new TreeSet<REPCommand>(new REPCommandComparator());
 		int top;
 		int prevEid=-1;
-		int i,j;
-
 		while ( -1 != (top=getPrecedence(cmds, prevEid+1)) ){
-		//while ( -1 != (top=getPrecedence(cmds, prevEid)) ){
 			REPCommand tmp = cmds.remove(top); 
 			sortedCmds1.add(tmp);
 			prevEid = tmp.eid;
 		}
 		
-		if(false){
-			ArrayList<REPCommand> sortedCmds = new ArrayList<REPCommand>();
-		/* lineno の大きい順にソート  */
-		for (i=0; i<sortedCmds.size(); i++){
-			int k=i;
-			for (j=i+1; j<sortedCmds.size(); j++){
-				if ( sortedCmds.get(k).lineno > sortedCmds.get(j).lineno ) continue;
-				else if ( sortedCmds.get(k).lineno < sortedCmds.get(j).lineno 
-						|| sortedCmds.get(k).eid > sortedCmds.get(j).eid )
-					   /* deleteとinsertの場合などはeidによらず、順序を強制する必要があるかも  */
-					k=j;
-			}
-			REPCommand tmp = sortedCmds.get(i);
-			sortedCmds.set(i, sortedCmds.get(k));
-			sortedCmds.set(k, tmp);
-		}
-		}
 		return sortedCmds1;
 	}
 
@@ -174,7 +137,6 @@
 				cSeq = tmp.seq;
 				ret = i;
 			}
-			//if ( cEid>cmds.get(i) && cmds.get(i)>lowEid )
 		}
 		return ret;
 	}
@@ -282,7 +244,6 @@
 	}
 
 	public boolean isMerging() {
-		// TODO Auto-generated method stub
 		if(sentMergedList.size() > 0) return true;
 		return false;
 	}