Browse Source

Removed Dependency to Statechart in SimulationEngine

Andreas Mülder 11 years ago
parent
commit
4517b5d2be

+ 2 - 2
plugins/org.yakindu.sct.simulation.core/src/org/yakindu/sct/simulation/core/hmr/SCTHotModelReplacementManager.java

@@ -159,8 +159,8 @@ public class SCTHotModelReplacementManager implements IResourceChangeListener, I
 		if (event.getResource() instanceof IProject) {
 			IProject project = ((IProject) event.getResource());
 			for (IDebugTarget target : activeTargets) {
-				EObject statechart = (EObject) target.getAdapter(EObject.class);
-				IFile file = WorkspaceSynchronizer.getFile(statechart.eResource());
+				EObject object = (EObject) target.getAdapter(EObject.class);
+				IFile file = WorkspaceSynchronizer.getFile(object.eResource());
 				if (project.equals(file.getProject())) {
 					try {
 						target.terminate();

+ 6 - 2
plugins/org.yakindu.sct.simulation.core/src/org/yakindu/sct/simulation/core/launch/AbstractSCTLaunchConfigurationDelegate.java

@@ -42,12 +42,16 @@ public abstract class AbstractSCTLaunchConfigurationDelegate extends LaunchConfi
 			throws CoreException {
 		String filename = configuration.getAttribute(FILE_NAME, DEFAULT_FILE_NAME);
 		Statechart statechart = loadStatechart(filename);
-		Assert.isNotNull(statechart);
-		SCTDebugTarget target = new SCTDebugTarget(launch, statechart, createExecutionContainer(launch, statechart));
+		SCTDebugTarget target = createDebugTarget(launch, statechart);
 		launch.addDebugTarget(target);
 		target.start();
 	}
 
+	protected SCTDebugTarget createDebugTarget(ILaunch launch, Statechart statechart) throws CoreException {
+		Assert.isNotNull(statechart);
+		return new SCTDebugTarget(launch, statechart, createExecutionContainer(launch, statechart));
+	}
+
 	protected Statechart loadStatechart(String filename) {
 		return ResourceUtil.loadStatechart(filename);
 	}