Merge pull request #92 from d3scomp/newgen-keznikl

SingleThreadedScheduler impl and tests
d3scomp · Nov 7, 2013 · b2917b7 · b2917b7
2 parents baee85e + a0c52ee
commit b2917b7
Show file tree

Hide file tree

Showing 6 changed files with 925 additions and 240 deletions.
diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
@@ -114,7 +114,7 @@ private void stopTask(final Task task) {
 		TaskInfo ti = tasks.get(task);
 
 		if( ti != null && ti.state != States.RUNNING ){
-			task.setTriggerListener(null);
+			task.unsetTriggerListener();
 
 
 			ti.timer.cancel();

diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
@@ -1,24 +1,24 @@
-package cz.cuni.mff.d3s.deeco.scheduler;
-
-import cz.cuni.mff.d3s.deeco.executor.ExecutionListener;
-import cz.cuni.mff.d3s.deeco.executor.Executor;
-import cz.cuni.mff.d3s.deeco.task.Task;
-
-
-/**
- * Interface Scheduler for LocalTimeScheduler(and others if needed)
- * 
- * @author Andranik Muradyan <muradian@d3s.mff.cuni.cz>
- *
- */
-public interface Scheduler extends ExecutionListener {
-	public void start();
-	public void stop();
-	public void addTask( Task task );
-	public void removeTask( Task task );
-
-	public void executionFailed(Task task, Exception e);
-	public void executionCompleted( Task task );
-	public void setExecutor(Executor executor);
-
+package cz.cuni.mff.d3s.deeco.scheduler;
+
+import cz.cuni.mff.d3s.deeco.executor.ExecutionListener;
+import cz.cuni.mff.d3s.deeco.executor.Executor;
+import cz.cuni.mff.d3s.deeco.task.Task;
+
+
+/**
+ * Interface Scheduler for LocalTimeScheduler(and others if needed)
+ * 
+ * @author Andranik Muradyan <muradian@d3s.mff.cuni.cz>
+ *
+ */
+public interface Scheduler extends ExecutionListener {
+	public void start();
+	public void stop();
+	public void addTask( Task task );
+	public void removeTask( Task task );
+
+	public void executionFailed(Task task, Exception e);
+	public void executionCompleted( Task task );
+	public void setExecutor(Executor executor);
+
 }