Small adjustments after today's meeting.

jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java

@@ -11,11 +11,10 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
-
 import cz.cuni.mff.d3s.deeco.executor.Executor;
+import cz.cuni.mff.d3s.deeco.knowledge.TriggerListener;
 import cz.cuni.mff.d3s.deeco.model.runtime.api.Trigger;
 import cz.cuni.mff.d3s.deeco.task.Task;
-import cz.cuni.mff.d3s.deeco.task.NotificationsForScheduler;
 
 public class LocalTimeScheduler implements Scheduler{
 	Map<Task, TaskInfo> tasks;
@@ -102,9 +101,9 @@ public synchronized void removeTask(Task task) {
 
 	private void startTask(final Task task) {
 		TaskInfo ti = tasks.get(task);
-		task.setSchedulingNotificationTarget(new NotificationsForScheduler() { // FIXME: TB: It is an overkill to instantiate this for each task since the task now passes itself as a parameter.
+		task.setTriggerListener(new TriggerListener() {
 			@Override
-			public void triggered(Task task) {
+			public void triggered(Trigger trigger) {
 				taskTriggerFired(task);
 			}
 		});

jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java

@@ -1,13 +1,14 @@
 package cz.cuni.mff.d3s.deeco.task;
 
 import cz.cuni.mff.d3s.deeco.model.runtime.api.InstanceEnsemblingController;
+import cz.cuni.mff.d3s.deeco.scheduler.Scheduler;
 
 public class EnsembleTask extends Task {
 
 	InstanceEnsemblingController ensemblingController;
 
-	public EnsembleTask(InstanceEnsemblingController ensemblingController) {
-		super(ensemblingController.getEnsemble().getSchedule());
+	public EnsembleTask(InstanceEnsemblingController ensemblingController, Scheduler scheduler) {
+		super(ensemblingController.getEnsemble().getSchedule(), scheduler);
 
 		this.ensemblingController = ensemblingController;
 	}
@@ -16,7 +17,7 @@ public EnsembleTask(InstanceEnsemblingController ensemblingController) {
 	 * @see cz.cuni.mff.d3s.deeco.task.Task#registerTriggers()
 	 */
 	@Override
-	public void registerTriggers() {
+	protected void registerTriggers() {
 		// TODO Auto-generated method stub
 
 	}
@@ -25,7 +26,7 @@ public void registerTriggers() {
 	 * @see cz.cuni.mff.d3s.deeco.task.Task#unregisterTriggers()
 	 */
 	@Override
-	public void unregisterTriggers() {
+	protected void unregisterTriggers() {
 		// TODO Auto-generated method stub
 
 	}

jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java

@@ -1,6 +1,7 @@
 package cz.cuni.mff.d3s.deeco.task;
 
 import cz.cuni.mff.d3s.deeco.model.runtime.api.InstanceProcess;
+import cz.cuni.mff.d3s.deeco.scheduler.Scheduler;
 
 /**
  * @author Tomas Bures <bures@d3s.mff.cuni.cz>
@@ -10,8 +11,8 @@ public class ProcessTask extends Task {
 
 	InstanceProcess process;
 
-	public ProcessTask(InstanceProcess process) {
-		super(process.getProcess().getSchedule());
+	public ProcessTask(InstanceProcess process, Scheduler scheduler) {
+		super(process.getProcess().getSchedule(), scheduler);
 	}
 
 	/* (non-Javadoc)
@@ -27,7 +28,7 @@ public void invoke() {
 	 * @see cz.cuni.mff.d3s.deeco.task.Task#registerTriggers()
 	 */
 	@Override
-	public void registerTriggers() {
+	protected void registerTriggers() {
 		// TODO Auto-generated method stub
 
 	}
@@ -36,7 +37,7 @@ public void registerTriggers() {
 	 * @see cz.cuni.mff.d3s.deeco.task.Task#unregisterTriggers()
 	 */
 	@Override
-	public void unregisterTriggers() {
+	protected void unregisterTriggers() {
 		// TODO Auto-generated method stub	
 	}
 }

jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.java

@@ -1,6 +1,8 @@
 package cz.cuni.mff.d3s.deeco.task;
 
+import cz.cuni.mff.d3s.deeco.knowledge.TriggerListener;
 import cz.cuni.mff.d3s.deeco.model.runtime.api.SchedulingSpecification;
+import cz.cuni.mff.d3s.deeco.scheduler.Scheduler;
 
 /**
  * 
@@ -9,30 +11,35 @@
  * 
  */
 public abstract class Task {
+	protected SchedulingSpecification schedulingSpecification;
+	protected TriggerListener listener;
+	protected Scheduler scheduler;
 
-	SchedulingSpecification schedulingSpecification;
-	NotificationsForScheduler listener;
-
-	public Task(SchedulingSpecification schedulingSpecification) {
+	public Task(SchedulingSpecification schedulingSpecification, Scheduler scheduler) {
 		this.schedulingSpecification = schedulingSpecification;
+		this.scheduler = scheduler;
 	}
-		
+
 	public abstract void invoke();
 
-	public abstract void registerTriggers();
-	public abstract void unregisterTriggers();
+	protected abstract void registerTriggers();
+	protected abstract void unregisterTriggers();
+
+	public void setTriggerListener(TriggerListener listener) {
+		assert(listener != null);
+
+		if (this.listener != null) {
+			unsetTriggerListener();
+		}
+
+		this.listener = listener;
+		registerTriggers();
+	}
 
-	public void setSchedulingNotificationTarget(NotificationsForScheduler listener) {
-		if (this.listener != null && listener == null) {
+	public void unsetTriggerListener() {
+		if (this.listener != null) {
 			unregisterTriggers();			
 			this.listener = null;
-
-		} else if (this.listener == null && listener != null) {
-			this.listener = listener;
-			registerTriggers();
-
-		} else {
-			this.listener = listener;
 		}
 	}
 

jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java

@@ -9,6 +9,7 @@
 import org.mockito.MockitoAnnotations;
 
 import cz.cuni.mff.d3s.deeco.model.runtime.api.InstanceEnsemblingController;
+import cz.cuni.mff.d3s.deeco.scheduler.Scheduler;
 
 /**
  * @author Tomas Bures <bures@d3s.mff.cuni.cz>
@@ -18,14 +19,16 @@ public class EnsembleTaskTest {
 
 	@Mock
 	private InstanceEnsemblingController instanceEnsemblingController;
+	@Mock
+	private Scheduler scheduler;
 
 	private Task ensembleTask;
 
 
 	@Before
 	public void setUp() throws Exception {
 		MockitoAnnotations.initMocks(this);
-		this.ensembleTask = new EnsembleTask(instanceEnsemblingController);
+		this.ensembleTask = new EnsembleTask(instanceEnsemblingController, scheduler);
 	}
 
 	@Test

jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/ProcessTaskTest.java

@@ -33,6 +33,7 @@
 import cz.cuni.mff.d3s.deeco.model.runtime.RuntimeModelTest;
 import cz.cuni.mff.d3s.deeco.model.runtime.SampleRuntimeModel;
 import cz.cuni.mff.d3s.deeco.model.runtime.api.KnowledgePath;
+import cz.cuni.mff.d3s.deeco.scheduler.Scheduler;
 
 /**
  * @author Tomas Bures <bures@d3s.mff.cuni.cz>
@@ -45,9 +46,11 @@ public class ProcessTaskTest {
 	@Mock
 	private KnowledgeManager knowledgeManager;
 	@Mock
-	private NotificationsForScheduler schedulingNotificationTarget;
+	private TriggerListener triggerListener;
 	@Captor
 	private ArgumentCaptor<TriggerListener> taskTriggerListenerCaptor;
+	@Mock
+	private Scheduler scheduler;
 
 	private Task task;
 
@@ -90,7 +93,7 @@ public ValueSet answer(InvocationOnMock invocation) {
 
 		model.setKnowledgeManager(knowledgeManager);
 
-		this.task = new ProcessTask(model.instanceProcess);
+		this.task = new ProcessTask(model.instanceProcess, scheduler);
 	}
 
 	@Test
@@ -109,25 +112,24 @@ public void testTriggerIsDeliveredOnlyWhenListenerIsRegistered() {
 
 		// GIVEN a ProcessTask initialized with an InstanceProcess
 		// WHEN a listener (i.e. scheduler) is registered at the task
-		task.setSchedulingNotificationTarget(schedulingNotificationTarget);
+		task.setTriggerListener(triggerListener);
 		// THEN the task registers a trigger listener on the knowledge manager
 		verify(knowledgeManager).register(eq(model.trigger), any(TriggerListener.class));
 
 		// WHEN a trigger comes from the knowledge manager
 		taskTriggerListenerCaptor.getValue().triggered(model.trigger);
 		// THEN the task calls the registered listener (i.e. the scheduler)
-		inOrder.verify(schedulingNotificationTarget).triggered(task);
+		inOrder.verify(triggerListener).triggered(model.trigger);
 
 		// WHEN the listener (i.e. the scheduler) is unregistered
-		task.setSchedulingNotificationTarget(null);
+		task.unsetTriggerListener();
 		// THEN the trigger is unregistered at the knowledge manager
 		inOrder.verify(knowledgeManager).unregister(model.trigger, taskTriggerListenerCaptor.getValue());
 
 		// WHEN another trigger (possibly spurious) comes from the knowledge manager
 		taskTriggerListenerCaptor.getValue().triggered(model.trigger);		
 		// THEN nothing is called on the unregistered listener (i.e. scheduler)
-
-		verifyNoMoreInteractions(schedulingNotificationTarget);
+		verifyNoMoreInteractions(triggerListener);
 	}
 
 	@Test