Bug fix: avoid ClassCastException and NullPointerException
* ClassCastException: UMLTimedExecutionEngine cannot be cast in
IDebuggableExecutionEngine
* NullPointerException : since the createController() method is already
called in the super.init() this is not necessary to do it again,
moreover the createUMLTaskFactory() method use the controller and its
exectionLoop is store somewhere. This way there is 2 different
LoopExecution used
Change-Id: Ia190b748f0ebd6cfc0918bf01b842124d4247965
Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml.time/plugin.xml b/plugins/org.eclipse.papyrus.moka.engine.uml.time/plugin.xml
index e20d20a..99bc80b 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml.time/plugin.xml
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml.time/plugin.xml
@@ -17,9 +17,6 @@
<context
engineID="org.eclipse.papyrus.moka.engine.uml.debug">
</context>
- <context
- engineID="org.eclipse.papyrus.moka.engine.uml.time">
- </context>
</service>
</extension>
</plugin>
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml/src/org/eclipse/papyrus/moka/engine/uml/AbstractUMLExecutionEngine.java b/plugins/org.eclipse.papyrus.moka.engine.uml/src/org/eclipse/papyrus/moka/engine/uml/AbstractUMLExecutionEngine.java
index bae5e9a..37e0f3a 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml/src/org/eclipse/papyrus/moka/engine/uml/AbstractUMLExecutionEngine.java
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml/src/org/eclipse/papyrus/moka/engine/uml/AbstractUMLExecutionEngine.java
@@ -39,11 +39,9 @@
@Override
protected void init(EngineConfiguration<?> configuration, SubMonitor monitor) {
-
super.init(configuration, monitor);
locus = createLocus();
rootTaskFactory = createUMLTaskFactory();
- controller = createController();
locus.getFactory().setTaskFactory(rootTaskFactory);
installBuiltInTypes();
installLibraries();
@@ -60,15 +58,6 @@
}
/**
- * @see {@link IDebuggableExecutionEngine#createController()}
- */
- public IExecutionController createController() {
- IExecutionController controller = new ExecutionController();
- controller.setExecutionLoop(new ExecutionLoop());
- return controller;
- }
-
- /**
* Create and parameterize the locus
*/
@Override
