Mercurial > hg > Members > nobuyasu > Alice > DPPAlice

diff src/alice/test/dpp/codesegment/philosophy2/TakeRightForkCodeSegment.java @ 30:5eb22e2f7169 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge 28, 29
author Nobuyasu Oshiro <dimolto@cr.ie.u-ryukyu.ac.jp>
date Tue, 29 Jan 2013 17:17:44 +0900
parents src/alice/test/dpp/codesegment/philosophy/TakeRightForkCodeSegment.java@d45de183af46 src/alice/test/dpp/codesegment/philosophy/TakeRightForkCodeSegment.java@f77f0bb99f35
children
line wrap: on
line diff
--- a/src/alice/test/dpp/codesegment/philosophy2/TakeRightForkCodeSegment.java	Tue Jan 15 16:41:57 2013 +0900
+++ b/src/alice/test/dpp/codesegment/philosophy2/TakeRightForkCodeSegment.java	Tue Jan 29 17:17:44 2013 +0900
@@ -3,6 +3,7 @@
 import alice.codesegment.CodeSegment;
 import alice.datasegment.CommandType;
 import alice.datasegment.Receiver;
+import alice.test.dpp.codesegment.fork.ForkStateTakeCodeSegment;
 import alice.test.dpp.datasegment.Fork;
 import alice.test.dpp.datasegment.Philosophy;
 
@@ -20,12 +21,8 @@
 	public void run() {
 		Philosophy phil = arg1.asClass(Philosophy.class);
 		Fork fork = arg2.asClass(Fork.class);
-		if (fork.takeFork(phil.getName())) {
-			phil.setState(Philosophy.State.TAKELEFTFORK);
-			new TakeLeftForkCodeSegment(phil.getName(), phil.getLeftFork());
-		} else { 
-			new TakeRightForkCodeSegment(phil.getName(), phil.getRightFork());
-		}
+		System.out.println(phil.getName() + " take right fork.");		
+		new ForkStateTakeCodeSegment(phil.getName(), fork.getForkName());
 		ods.update("local", phil.getName(), phil);
 		ods.update("local", fork.getForkName(), fork);
 	}