Skip to content

Commit e59cde1

Browse files
d-leroyd-leroy
committed
Refactored mse metamodel to trace metamodel and moved it to trace commons
1 parent 3c53325 commit e59cde1

File tree

141 files changed

+6175
-1571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+6175
-1571
lines changed

‎framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ Require-Bundle: org.gemoc.xdsmlframework.api,
2121
org.eclipse.xtext,
2222
org.gemoc.executionframework.extensions.sirius,
2323
fr.inria.diverse.commons.eclipse.messagingsystem.api,
24-
fr.obeo.dsl.debug.ide.ui;bundle-version="1.0.0"
24+
fr.obeo.dsl.debug.ide.ui;bundle-version="1.0.0",
25+
fr.inria.diverse.trace.commons.model;bundle-version="0.1.0"
2526
Bundle-ActivationPolicy: lazy
2627
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2728
Export-Package: org.gemoc.executionframework.engine.ui;

‎framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
import org.eclipse.ui.IWorkbench;
4545
import org.eclipse.ui.IWorkbenchPage;
4646
import org.eclipse.ui.PlatformUI;
47-
import org.gemoc.executionframework.engine.mse.MSEOccurrence;
48-
import org.gemoc.executionframework.engine.mse.Step;
4947
import org.gemoc.executionframework.engine.ui.Activator;
5048
import org.gemoc.executionframework.engine.ui.debug.semanticsopener.OpenSemanticsHandler;
5149
import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus;
@@ -55,6 +53,8 @@
5553
import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.IModelChangeListenerAddon;
5654
import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.SimpleModelChangeListenerAddon;
5755

56+
import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence;
57+
import fr.inria.diverse.trace.commons.model.trace.Step;
5858
import fr.obeo.dsl.debug.StackFrame;
5959
import fr.obeo.dsl.debug.ide.AbstractDSLDebugger;
6060
import fr.obeo.dsl.debug.ide.adapter.DSLStackFrameAdapter;

‎framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/IGemocDebugger.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212

1313
import java.util.function.BiPredicate;
1414

15-
import org.gemoc.executionframework.engine.mse.MSEOccurrence;
1615
import org.gemoc.xdsmlframework.api.core.IBasicExecutionEngine;
1716
import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon;
1817

18+
import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence;
19+
1920
public interface IGemocDebugger extends IEngineAddon {
2021

2122
public abstract void addPredicateBreak(BiPredicate<IBasicExecutionEngine, MSEOccurrence> predicate);

‎framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpoint.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
import org.eclipse.core.resources.IMarker;
1515
import org.eclipse.core.runtime.CoreException;
1616
import org.eclipse.emf.ecore.EObject;
17-
import org.gemoc.executionframework.engine.mse.Step;
1817
import org.gemoc.executionframework.engine.ui.Activator;
1918

19+
import fr.inria.diverse.trace.commons.model.trace.Step;
2020
import fr.obeo.dsl.debug.ide.DSLBreakpoint;
2121

2222
public class GemocBreakpoint extends DSLBreakpoint {

‎framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ Require-Bundle: org.gemoc.xdsmlframework.api,
99
fr.inria.diverse.commons.eclipse.messagingsystem.api;bundle-version="1.0.0",
1010
org.gemoc.executionframework.reflectivetrace.model;visibility:=reexport,
1111
org.gemoc.commons.eclipse.pde;bundle-version="0.1.0",
12-
org.eclipse.xtend.lib,
12+
org.eclipse.xtend.lib,
1313
org.eclipse.emf.transaction;bundle-version="1.8.0",
1414
fr.inria.diverse.trace.gemoc.api;bundle-version="1.0.0",
15-
org.gemoc.executionframework.engine.mse.model;bundle-version="0.1.0",
16-
fr.inria.diverse.k3.al.annotationprocessor.plugin
15+
fr.inria.diverse.k3.al.annotationprocessor.plugin,
16+
fr.inria.diverse.trace.commons.model;bundle-version="0.1.0"
1717
Bundle-ActivationPolicy: lazy
1818
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
1919
Export-Package: org.gemoc.executionframework.engine,

‎framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@
1616
import java.util.Set;
1717

1818
import org.gemoc.executionframework.engine.Activator;
19-
import org.gemoc.executionframework.engine.mse.Step;
2019
import org.gemoc.xdsmlframework.api.core.EngineStatus;
2120
import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus;
2221
import org.gemoc.xdsmlframework.api.core.IDisposable;
2322
import org.gemoc.xdsmlframework.api.core.IExecutionContext;
2423
import org.gemoc.xdsmlframework.api.core.IExecutionEngine;
2524
import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon;
2625

26+
import fr.inria.diverse.trace.commons.model.trace.Step;
27+
28+
2729
public abstract class AbstractExecutionEngine implements IExecutionEngine, IDisposable {
2830

2931
private RunStatus _runningStatus = RunStatus.Initializing;

‎framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@
3030
import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
3131
import org.eclipse.emf.transaction.util.TransactionUtil;
3232
import org.gemoc.executionframework.engine.Activator;
33-
import org.gemoc.executionframework.engine.mse.GenericMSE;
34-
import org.gemoc.executionframework.engine.mse.MSE;
35-
import org.gemoc.executionframework.engine.mse.MSEModel;
36-
import org.gemoc.executionframework.engine.mse.MSEOccurrence;
37-
import org.gemoc.executionframework.engine.mse.MseFactory;
38-
import org.gemoc.executionframework.engine.mse.SequentialStep;
39-
import org.gemoc.executionframework.engine.mse.Step;
4033
import org.gemoc.xdsmlframework.api.core.IExecutionContext;
4134
import org.gemoc.xdsmlframework.api.core.ISequentialExecutionEngine;
4235

36+
import fr.inria.diverse.trace.commons.model.trace.GenericMSE;
37+
import fr.inria.diverse.trace.commons.model.trace.MSE;
38+
import fr.inria.diverse.trace.commons.model.trace.MSEModel;
39+
import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence;
40+
import fr.inria.diverse.trace.commons.model.trace.SequentialStep;
41+
import fr.inria.diverse.trace.commons.model.trace.Step;
42+
import fr.inria.diverse.trace.commons.model.trace.TraceFactory;
4343
import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon;
4444

4545
public abstract class AbstractSequentialExecutionEngine extends AbstractExecutionEngine implements ISequentialExecutionEngine {
@@ -163,9 +163,9 @@ private Step createStep(EObject caller, String className, String methodName) {
163163
MSE mse = findOrCreateMSE(caller, className, methodName);
164164
Step result;
165165
if (traceAddon == null) {
166-
SequentialStep<Step> step = MseFactory.eINSTANCE.createGenericSequentialStep();
166+
SequentialStep<Step> step = TraceFactory.eINSTANCE.createGenericSequentialStep();
167167
MSEOccurrence occurrence = null;
168-
occurrence = MseFactory.eINSTANCE.createMSEOccurrence();
168+
occurrence = TraceFactory.eINSTANCE.createMSEOccurrence();
169169
step.setMseoccurrence(occurrence);
170170
occurrence.setMse(mse);
171171
result = step;
@@ -250,7 +250,7 @@ public final MSE findOrCreateMSE(EObject caller, String className, String method
250250
// TODO Should be created somewhere before...
251251
// at some point didier had written some code to serialize it... I think
252252
if (_actionModel == null) {
253-
_actionModel = MseFactory.eINSTANCE.createMSEModel();
253+
_actionModel = TraceFactory.eINSTANCE.createMSEModel();
254254
}
255255

256256
if (_actionModel != null) {
@@ -262,7 +262,7 @@ public final MSE findOrCreateMSE(EObject caller, String className, String method
262262
}
263263
}
264264
// let's create a MSE
265-
final GenericMSE mse = MseFactory.eINSTANCE.createGenericMSE();
265+
final GenericMSE mse = TraceFactory.eINSTANCE.createGenericMSE();
266266
mse.setCallerReference(caller);
267267
mse.setActionReference(operation);
268268
if (operation != null)

‎framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/SequentialExecutionException.xtend‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.gemoc.executionframework.engine.core;
22

3-
import org.eclipse.emf.transaction.RollbackException;
4-
import org.gemoc.executionframework.engine.mse.MSEOccurrence;
3+
import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence
4+
import org.eclipse.emf.transaction.RollbackException
55

66
/**
77
* An exception that is caused by anything thrown from the execution of

‎framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ Require-Bundle: org.gemoc.xdsmlframework.api,
1818
org.eclipse.emf.edit.ui,
1919
org.gemoc.executionframework.engine,
2020
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
21-
org.eclipse.ui.ide;bundle-version="3.10.2"
21+
org.eclipse.ui.ide;bundle-version="3.10.2",
22+
fr.inria.diverse.trace.commons.model;bundle-version="0.1.0"
2223
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2324
Bundle-ActivationPolicy: lazy
2425
Export-Package: org.gemoc.executionframework.extensions.sirius,
2526
org.gemoc.executionframework.extensions.sirius.debug,
2627
org.gemoc.executionframework.extensions.sirius.modelloader,
2728
org.gemoc.executionframework.extensions.sirius.services
29+
Import-Package: fr.inria.diverse.trace.commons.model.trace

‎framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
import org.eclipse.sirius.viewpoint.DRepresentation;
3737
import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
3838
import org.gemoc.executionframework.engine.core.CommandExecution;
39-
import org.gemoc.executionframework.engine.mse.MSEOccurrence;
40-
import org.gemoc.executionframework.engine.mse.Step;
4139
import org.gemoc.executionframework.extensions.sirius.services.AbstractGemocDebuggerServices.BreakpointListener;
4240
import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus;
4341
import org.gemoc.xdsmlframework.api.core.IBasicExecutionEngine;
4442
import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon;
4543

44+
import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence;
45+
import fr.inria.diverse.trace.commons.model.trace.Step;
4646
import fr.obeo.dsl.debug.ide.DSLBreakpoint;
4747

4848
public abstract class AbstractGemocAnimatorServices {

0 commit comments

Comments
 (0)