fixing failing build caused by errors in simulation project (obsolete

now)
d3scomp · Feb 14, 2015 · 9754ccb · 9754ccb
1 parent 3787d14
commit 9754ccb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectSimulationHost.java b/jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectSimulationHost.java
@@ -4,7 +4,7 @@
 import cz.cuni.mff.d3s.deeco.network.AbstractHost;
 import cz.cuni.mff.d3s.deeco.network.DataReceiver;
 import cz.cuni.mff.d3s.deeco.network.DataSender;
-import cz.cuni.mff.d3s.deeco.scheduler.CurrentTimeProvider;
+import cz.cuni.mff.d3s.deeco.scheduler.notifier.CurrentTimeProvider;
 
 public class DirectSimulationHost extends AbstractHost implements SimulationTimeEventListenerHolder {
 

diff --git a/jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java b/jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
@@ -1,6 +1,6 @@
 package cz.cuni.mff.d3s.deeco.simulation;
 
-import cz.cuni.mff.d3s.deeco.scheduler.CurrentTimeProvider;
+import cz.cuni.mff.d3s.deeco.scheduler.notifier.CurrentTimeProvider;
 
 public abstract class Simulation implements CurrentTimeProvider,
 		CallbackProvider {

diff --git a/jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulationHost.java b/jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulationHost.java
@@ -3,7 +3,7 @@
 import static cz.cuni.mff.d3s.deeco.simulation.Simulation.secondsToMilliseconds;
 import cz.cuni.mff.d3s.deeco.network.Host;
 import cz.cuni.mff.d3s.deeco.network.NetworkProvider;
-import cz.cuni.mff.d3s.deeco.scheduler.CurrentTimeProvider;
+import cz.cuni.mff.d3s.deeco.scheduler.notifier.CurrentTimeProvider;
 import cz.cuni.mff.d3s.deeco.simulation.SimulationTimeEventListener;
 import cz.cuni.mff.d3s.deeco.simulation.SimulationTimeEventListenerHolder;
 

diff --git a/jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java b/jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
@@ -14,23 +14,24 @@
 import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;
 import cz.cuni.mff.d3s.deeco.model.runtime.api.Trigger;
 import cz.cuni.mff.d3s.deeco.network.AbstractHost;
-import cz.cuni.mff.d3s.deeco.scheduler.CurrentTimeProvider;
 import cz.cuni.mff.d3s.deeco.scheduler.Scheduler;
 import cz.cuni.mff.d3s.deeco.scheduler.SchedulerEvent;
-import cz.cuni.mff.d3s.deeco.scheduler.SchedulerNotifier;
+import cz.cuni.mff.d3s.deeco.scheduler.notifier.CurrentTimeProvider;
+import cz.cuni.mff.d3s.deeco.scheduler.notifier.SchedulerNotifier;
 import cz.cuni.mff.d3s.deeco.simulation.CallbackProvider;
 import cz.cuni.mff.d3s.deeco.simulation.SimulationTimeEventListener;
 import cz.cuni.mff.d3s.deeco.task.Task;
 import cz.cuni.mff.d3s.deeco.task.TaskTriggerListener;
 
 /**
+ * TODO Remove this class, it is no more needed since we have a new scheduler in core.
+ * 
  * The {@link Scheduler} implementation designed for single threaded simulation.
  * This scheduler is suppose to be driven by the simulation through
  * {@link SimulationTimeEventListener} methods.
  * 
  * @author Michal Kit <kit@d3s.mff.cuni.cz>
  * 
- * TODO Remove this class, it is no more needed since we have a new scheduler in core.
  */
 public class SimulationScheduler implements Scheduler,
 		SimulationTimeEventListener {
@@ -60,16 +61,6 @@ public AbstractHost getHost() {
 		return host;
 	}
 
-	@Override
-	public void start() {
-		registerNextExecution(true);
-	}
-
-	@Override
-	public void stop() {
-		Log.d("The simulation scheduler is stopped together with the simulation.");
-	}
-
 	@Override
 	public void addTask(Task task) {
 		if (task == null)
@@ -245,4 +236,10 @@ public boolean isRunning() {
 		// TODO Auto-generated method stub
 		return false;
 	}
+
+	@Override
+	public void setSchedulerNotifier(SchedulerNotifier schedulerNotifier) {
+		// TODO Auto-generated method stub
+
+	}
 }