Mercurial > hg > RemoteEditor > Eclipse

changeset 163:34f770c7fd86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author kono
date Thu, 28 Aug 2008 22:13:08 +0900
parents d96717ca6270
children 5c458f1a7679
files src/pathfinder/mergetest/TestMerger.java
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/pathfinder/mergetest/TestMerger.java	Tue Aug 26 19:46:51 2008 +0900
+++ b/src/pathfinder/mergetest/TestMerger.java	Thu Aug 28 22:13:08 2008 +0900
@@ -10,7 +10,7 @@
 	static public int cmdNO[] = { REP.REPCMD_INSERT, REP.REPCMD_REPLACE, REP.REPCMD_DELETE };
 	protected NetworkSimulator<REPCommand> ns=null;
 	protected LinkedList<EditorSimulator> editors;
-	protected SeMaSimulator<REPCommand> sema;
+	protected SessionManagerSimulatorWithMerger sema;
 	protected UserSimulator users;
 
 	public TestMerger(){
@@ -66,10 +66,10 @@
 	protected void init(boolean sm, int ne, int np, int ll){
 		/* create NetworkSimulator, and SessionManager if it's required.   */
 		if (sm){
-			ns = new NetworkSimulatorwithSeMa<REPCommand>();
-			sema = new SeMaSimulator<REPCommand>(ns, ne);
+			ns = new NetworkSimulator<REPCommand>();
+			sema = new SessionManagerSimulatorWithMerger(ns, ne);
 		} else {
-			ns = new NetworkSimulatorwithoutSeMa<REPCommand>();
+			ns = new NetworkSimulator<REPCommand>();
 			sema = null;
 		}
 		ns.setLogLevel(ll);