Mercurial > hg > RemoteEditor > Eclipse
changeset 147:a9fdbcbe351f
*** empty log message ***
| author | pin |
|---|---|
| date | Tue, 27 May 2008 18:32:03 +0900 |
| parents | 0d49e1116336 |
| children | bc162b1a7ebf |
| files | src/pathfinder/mergetest/EditorSimulator.java src/sample/merge/TranslaterImp1.java |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/pathfinder/mergetest/EditorSimulator.java Tue May 13 18:26:59 2008 +0900 +++ b/src/pathfinder/mergetest/EditorSimulator.java Tue May 27 18:32:03 2008 +0900 @@ -44,7 +44,7 @@ while(running){ REPCommand cmd = cs.read(); /* received Command */ - if(eid == 0)System.out.println("editor" + eid + ":" + cmd.string + ":" + cmd.eid); + /*if(eid == 0)*/System.out.println("editor" + eid + ":" + cmd.string + ":"); REPCommand[] cmds;
--- a/src/sample/merge/TranslaterImp1.java Tue May 13 18:26:59 2008 +0900 +++ b/src/sample/merge/TranslaterImp1.java Tue May 27 18:32:03 2008 +0900 @@ -83,7 +83,7 @@ private ArrayList<REPCommand> sortCmds(ArrayList<REPCommand> cmds) { ArrayList<REPCommand> sortedCmds = new ArrayList<REPCommand>(); int top; - int prevEid=0; + int prevEid=-1; int i,j; /* @@ -91,6 +91,7 @@ * cmdsにはまだデータが残る */ while ( -1 != (top=getPrecedence(cmds, prevEid+1)) ){ + //while ( -1 != (top=getPrecedence(cmds, prevEid)) ){ REPCommand tmp = cmds.remove(top); sortedCmds.add(tmp); prevEid = tmp.eid;