deleting obsolete files "DEECoSimulationRealm" and

"TerminationTimeHolder"
d3scomp · Feb 14, 2015 · bd58b4e · bd58b4e
1 parent 9afa60d
commit bd58b4e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 63 deletions.
diff --git a/jdeeco-core/simulation/cz/cuni/mff/d3s/deeco/runtime/SimulationSchedulerNotifier.java b/jdeeco-core/simulation/cz/cuni/mff/d3s/deeco/runtime/SimulationSchedulerNotifier.java
@@ -1,7 +1,6 @@
 package cz.cuni.mff.d3s.deeco.runtime;
 
 import cz.cuni.mff.d3s.deeco.scheduler.notifier.SchedulerNotifier;
-import cz.cuni.mff.d3s.deeco.scheduler.notifier.SchedulerNotifierEventListener;
 
 public interface SimulationSchedulerNotifier extends SchedulerNotifier {
 

diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoSimulationRealm.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoSimulationRealm.java
diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/TerminationTimeHolder.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/TerminationTimeHolder.java
diff --git a/jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoySimulationTest.java b/jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoySimulationTest.java
@@ -8,9 +8,9 @@
 import org.junit.contrib.java.lang.system.StandardOutputStreamLog;
 
 import cz.cuni.mff.d3s.deeco.annotations.processor.AnnotationProcessorException;
-import cz.cuni.mff.d3s.deeco.runtime.DEECoNode;
+import cz.cuni.mff.d3s.deeco.runners.DEECoSimulation;
 import cz.cuni.mff.d3s.deeco.runtime.DEECoException;
-import cz.cuni.mff.d3s.deeco.runtime.DEECoSimulationRealm;
+import cz.cuni.mff.d3s.deeco.runtime.DEECoNode;
 import cz.cuni.mff.d3s.deeco.runtime.SimulationSchedulerNotifier;
 import cz.cuni.mff.d3s.deeco.scheduler.notifier.DiscreteEventSchedulerNotifier;
 /**
@@ -30,7 +30,7 @@ public void testConvoy() throws AnnotationProcessorException, InterruptedExcepti
 
 		/* create main application container */
 		SimulationSchedulerNotifier simulationSchedulerNotifier = new DiscreteEventSchedulerNotifier(); // also "new WallTimeSchedulerNotifier()" 
- 		DEECoSimulationRealm realm = new DEECoSimulationRealm(simulationSchedulerNotifier);
+ 		DEECoSimulation realm = new DEECoSimulation(simulationSchedulerNotifier);
 
 		/* create first deeco node */
 		DEECoNode deeco1 = realm.createNode();

diff --git a/jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java b/jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
@@ -8,9 +8,9 @@
 import org.junit.contrib.java.lang.system.StandardOutputStreamLog;
 
 import cz.cuni.mff.d3s.deeco.annotations.processor.AnnotationProcessorException;
-import cz.cuni.mff.d3s.deeco.runtime.DEECoNode;
+import cz.cuni.mff.d3s.deeco.runners.DEECoSimulation;
 import cz.cuni.mff.d3s.deeco.runtime.DEECoException;
-import cz.cuni.mff.d3s.deeco.runtime.DEECoSimulationRealm;
+import cz.cuni.mff.d3s.deeco.runtime.DEECoNode;
 import cz.cuni.mff.d3s.deeco.runtime.SimulationSchedulerNotifier;
 import cz.cuni.mff.d3s.deeco.scheduler.notifier.DiscreteEventSchedulerNotifier;
 /**
@@ -30,7 +30,7 @@ public void testConvoy() throws AnnotationProcessorException, InterruptedExcepti
 
 		/* create main application container */
 		SimulationSchedulerNotifier simulationSchedulerNotifier = new DiscreteEventSchedulerNotifier();
-		DEECoSimulationRealm realm = new DEECoSimulationRealm(simulationSchedulerNotifier);
+		DEECoSimulation realm = new DEECoSimulation(simulationSchedulerNotifier);
 
 		/* create one and only deeco node (centralized deployment) */
 		DEECoNode deeco = realm.createNode();