# HG changeset patch # User tkaito # Date 1220063711 -32400 # Node ID d234a9d2a1721841f73750084391873afc096e47 # Parent b4f2c0aeb4747dc7df11a93ab8bfc19b6dd129ed *** empty log message *** diff -r b4f2c0aeb474 -r d234a9d2a172 src/pathfinder/mergetest/test/RepCommandOptimizeTest.java --- a/src/pathfinder/mergetest/test/RepCommandOptimizeTest.java Sat Aug 30 01:55:39 2008 +0900 +++ b/src/pathfinder/mergetest/test/RepCommandOptimizeTest.java Sat Aug 30 11:35:11 2008 +0900 @@ -107,6 +107,7 @@ } output.remove(r); output.remove(s); + lineNumberCorrection(output,minln,i); break; } @@ -119,19 +120,19 @@ System.out.println("There are no such commands."); } } - lineNumberCorrection(output,minln); + } - private void lineNumberCorrection(LinkedList opt, int ln) { - int i = 0; - for(REPCommand o : opt){ - if(ln < o.lineno) i++; + private void lineNumberCorrection(LinkedList opt, int ln, int count){ + for(int i = 0; i < count; i++){ + REPCommand o = opt.get(i); + if(ln < o.lineno) o.lineno -= 1; } - if(i == opt.size()){ + /*if(i == opt.size()){ for(REPCommand c : opt){ c.lineno -= 1; } - } + }*/ } void printCmdList(LinkedList before){ @@ -178,7 +179,7 @@ RepCommandOptimizeTest rco = new RepCommandOptimizeTest(); rco.makeCommand(test2); - java.util.Collections.shuffle(cmdlist); + //java.util.Collections.shuffle(cmdlist); rco.printCmdList(cmdlist); rco.edit(cmdlist,text1); rco.printCmdList(rco.optimize(cmdlist));