Fixed breakpoint creation when using melange resource

d-leroy · d-leroy · commit 18dccd0b9e7e · 2017-03-29T10:30:30.000+02:00
diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF
@@ -21,7 +21,8 @@ Require-Bundle: org.gemoc.xdsmlframework.api,
  fr.inria.diverse.commons.eclipse.messagingsystem.api,
  fr.obeo.dsl.debug.ide.ui;bundle-version="1.0.0",
  fr.inria.diverse.trace.commons.model;bundle-version="0.1.0",
- fr.obeo.dsl.debug
+ fr.obeo.dsl.debug,
+ fr.inria.diverse.melange
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.gemoc.executionframework.engine.ui;
diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/sirius/action/GemocToggleBreakpointAction.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/sirius/action/GemocToggleBreakpointAction.java
@@ -12,9 +12,12 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.gemoc.executionframework.engine.ui.debug.breakpoint.GemocBreakpoint;
 import org.gemoc.executionframework.engine.ui.launcher.AbstractGemocLauncher;
 
+import fr.inria.diverse.melange.resource.MelangeResource;
 import fr.obeo.dsl.debug.ide.DSLBreakpoint;
 import fr.obeo.dsl.debug.ide.sirius.ui.DSLToggleBreakpointsUtils;
 import fr.obeo.dsl.debug.ide.sirius.ui.action.AbstractToggleBreakpointAction;
@@ -38,6 +41,15 @@ protected DSLToggleBreakpointsUtils createToggleBreakpointsUtils() {
 			@Override
 			protected DSLBreakpoint createBreakpoint(Object selected,
 					EObject instruction) throws CoreException {
+				final Resource res = ((EObject)instruction).eResource();
+				final ResourceSet resSet = res.getResourceSet();
+				final MelangeResource mr = resSet.getResources().stream().filter(r -> {
+					return r instanceof MelangeResource;
+				}).map(r -> (MelangeResource)r).findFirst().orElse(null);
+				if (mr != null) {
+					final String fragmentURI = res.getURIFragment(instruction);
+					instruction = mr.getWrappedResource().getEObject(fragmentURI);
+				}
 				return new GemocBreakpoint(identifier, instruction, true);
 			}
 			
diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java
@@ -17,6 +17,8 @@
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.ISelectionService;
@@ -25,6 +27,7 @@
 import org.gemoc.execution.sequential.javaengine.ui.launcher.Launcher;
 import org.gemoc.executionframework.engine.ui.debug.breakpoint.GemocBreakpoint;
 
+import fr.inria.diverse.melange.resource.MelangeResource;
 import fr.inria.diverse.trace.commons.model.trace.MSE;
 import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence;
 import fr.obeo.dsl.debug.ide.DSLBreakpoint;
@@ -66,6 +69,15 @@ else if (selected instanceof MSEOccurrence)
 			@Override
 			protected DSLBreakpoint createBreakpoint(Object selected,
 					EObject instruction) throws CoreException {
+				final Resource res = ((EObject)instruction).eResource();
+				final ResourceSet resSet = res.getResourceSet();
+				final MelangeResource mr = resSet.getResources().stream().filter(r -> {
+					return r instanceof MelangeResource;
+				}).map(r -> (MelangeResource)r).findFirst().orElse(null);
+				if (mr != null) {
+					final String fragmentURI = res.getURIFragment(instruction);
+					instruction = mr.getWrappedResource().getEObject(fragmentURI);
+				}
 				return new GemocBreakpoint(identifier, instruction, true);
 			}
 			
