Skip to content

Commit 8b76855

Browse files
ebousseebousse
committed
Complete last set of changes made for simplifying API and inheritance tree
1 parent 8f7533e commit 8b76855

File tree

31 files changed

+517
-585
lines changed

31 files changed

+517
-585
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.eclipse.jface.resource.ImageDescriptor;
1717
import org.eclipse.ui.plugin.AbstractUIPlugin;
1818
import org.gemoc.executionframework.engine.ui.debug.semanticsopener.OpenSemanticsHandler;
19-
import org.gemoc.xdsmlframework.api.core.IBasicExecutionEngine;
19+
import org.gemoc.xdsmlframework.api.core.IExecutionEngine;
2020
//import org.gemoc.gemoc_language_workbench.extensions.sirius.services.AbstractGemocDebuggerServices;
2121
import org.osgi.framework.BundleContext;
2222

@@ -35,7 +35,7 @@ public class Activator extends AbstractUIPlugin {
3535

3636
private OpenSemanticsHandler handler;
3737

38-
private Supplier<IBasicExecutionEngine> engineSupplier;
38+
private Supplier<IExecutionEngine> engineSupplier;
3939

4040
private Supplier<String> bundleSymbolicNameSupplier;
4141

@@ -105,7 +105,7 @@ public void setHandler(OpenSemanticsHandler handler) {
105105
}
106106
}
107107

108-
public void setHandlerFieldSuppliers(Supplier<IBasicExecutionEngine> engineSupplier, Supplier<String> bundleSymbolicNameSupplier) {
108+
public void setHandlerFieldSuppliers(Supplier<IExecutionEngine> engineSupplier, Supplier<String> bundleSymbolicNameSupplier) {
109109
this.engineSupplier = engineSupplier;
110110
this.bundleSymbolicNameSupplier = bundleSymbolicNameSupplier;
111111
}

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.gemoc.executionframework.engine.ui.Activator;
4848
import org.gemoc.executionframework.engine.ui.debug.semanticsopener.OpenSemanticsHandler;
4949
import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus;
50-
import org.gemoc.xdsmlframework.api.core.IBasicExecutionEngine;
50+
import org.gemoc.xdsmlframework.api.core.IExecutionEngine;
5151
import org.gemoc.xdsmlframework.api.core.IExecutionContext;
5252
import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon;
5353
import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.FieldChange;
@@ -83,13 +83,13 @@ public abstract class AbstractGemocDebugger extends AbstractDSLDebugger implemen
8383

8484
protected EObject executedModelRoot = null;
8585

86-
protected final IBasicExecutionEngine engine;
86+
protected final IExecutionEngine engine;
8787

8888
private String bundleSymbolicName;
8989

9090
private List<IMutableFieldExtractor> mutableFieldExtractors = new ArrayList<>();
9191

92-
public AbstractGemocDebugger(IDSLDebugEventProcessor target, IBasicExecutionEngine engine) {
92+
public AbstractGemocDebugger(IDSLDebugEventProcessor target, IExecutionEngine engine) {
9393
super(target);
9494
this.engine = engine;
9595

@@ -128,31 +128,31 @@ public void setMutableFieldExtractors(List<IMutableFieldExtractor> mutableFieldE
128128
this.mutableFieldExtractors = mutableFieldExtractors;
129129
}
130130

131-
private Set<BiPredicate<IBasicExecutionEngine, MSEOccurrence>> predicateBreakPoints = new HashSet<BiPredicate<IBasicExecutionEngine, MSEOccurrence>>();
132-
private Set<BiPredicate<IBasicExecutionEngine, MSEOccurrence>> predicateBreaks = new HashSet<BiPredicate<IBasicExecutionEngine, MSEOccurrence>>();
131+
private Set<BiPredicate<IExecutionEngine, MSEOccurrence>> predicateBreakPoints = new HashSet<BiPredicate<IExecutionEngine, MSEOccurrence>>();
132+
private Set<BiPredicate<IExecutionEngine, MSEOccurrence>> predicateBreaks = new HashSet<BiPredicate<IExecutionEngine, MSEOccurrence>>();
133133

134134
@Override
135135
/**
136136
* Breakpoints are persistent, and can trigger pauses as long as they are not removed.
137137
*/
138-
public void addPredicateBreakpoint(BiPredicate<IBasicExecutionEngine, MSEOccurrence> predicate) {
138+
public void addPredicateBreakpoint(BiPredicate<IExecutionEngine, MSEOccurrence> predicate) {
139139
predicateBreakPoints.add(predicate);
140140
}
141141

142142
@Override
143143
/**
144144
* A Break only trigger a single pause, then is removed.
145145
*/
146-
public void addPredicateBreak(BiPredicate<IBasicExecutionEngine, MSEOccurrence> predicate) {
146+
public void addPredicateBreak(BiPredicate<IExecutionEngine, MSEOccurrence> predicate) {
147147
predicateBreaks.add(predicate);
148148
}
149149

150-
protected boolean shouldBreakPredicates(IBasicExecutionEngine engine, MSEOccurrence mseOccurrence) {
150+
protected boolean shouldBreakPredicates(IExecutionEngine engine, MSEOccurrence mseOccurrence) {
151151

152152
// We look at predicate breaks to remove the ones that are true
153153
boolean shouldBreak = false;
154-
Set<BiPredicate<IBasicExecutionEngine, MSEOccurrence>> toRemove = new HashSet<BiPredicate<IBasicExecutionEngine, MSEOccurrence>>();
155-
for (BiPredicate<IBasicExecutionEngine, MSEOccurrence> pred : predicateBreaks) {
154+
Set<BiPredicate<IExecutionEngine, MSEOccurrence>> toRemove = new HashSet<BiPredicate<IExecutionEngine, MSEOccurrence>>();
155+
for (BiPredicate<IExecutionEngine, MSEOccurrence> pred : predicateBreaks) {
156156
if (pred.test(engine, mseOccurrence)) {
157157
shouldBreak = true;
158158
toRemove.add(pred);
@@ -163,7 +163,7 @@ protected boolean shouldBreakPredicates(IBasicExecutionEngine engine, MSEOccurre
163163
return true;
164164

165165
// If no break yet, we look at predicate breakpoints
166-
for (BiPredicate<IBasicExecutionEngine, MSEOccurrence> pred : predicateBreakPoints) {
166+
for (BiPredicate<IExecutionEngine, MSEOccurrence> pred : predicateBreakPoints) {
167167
if (pred.test(engine, mseOccurrence)) {
168168
return true;
169169
}
@@ -459,33 +459,33 @@ private void selectLastStackframe() {
459459
}
460460

461461
@Override
462-
public void engineAboutToStart(IBasicExecutionEngine engine) {
462+
public void engineAboutToStart(IExecutionEngine engine) {
463463
}
464464

465465
@Override
466-
public void engineAboutToStop(IBasicExecutionEngine engine) {
466+
public void engineAboutToStop(IExecutionEngine engine) {
467467
resume();
468468
}
469469

470470
@Override
471-
public void engineAboutToDispose(IBasicExecutionEngine engine) {
471+
public void engineAboutToDispose(IExecutionEngine engine) {
472472
resume();
473473
}
474474

475475
@Override
476-
public void engineStatusChanged(IBasicExecutionEngine engine, RunStatus newStatus) {
476+
public void engineStatusChanged(IExecutionEngine engine, RunStatus newStatus) {
477477
}
478478

479479
@Override
480-
public void aboutToSelectStep(IBasicExecutionEngine engine, Collection<Step> logicalSteps) {
480+
public void aboutToSelectStep(IExecutionEngine engine, Collection<Step> logicalSteps) {
481481
}
482482

483483
@Override
484-
public void proposedStepsChanged(IBasicExecutionEngine engine, Collection<Step> logicalSteps) {
484+
public void proposedStepsChanged(IExecutionEngine engine, Collection<Step> logicalSteps) {
485485
}
486486

487487
@Override
488-
public void stepSelected(IBasicExecutionEngine engine, Step selectedLogicalStep) {
488+
public void stepSelected(IExecutionEngine engine, Step selectedLogicalStep) {
489489
}
490490

491491
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*******************************************************************************/
1111
package org.gemoc.executionframework.engine.ui.debug;
1212

13-
import org.gemoc.xdsmlframework.api.core.IBasicExecutionEngine;
13+
import org.gemoc.xdsmlframework.api.core.IExecutionEngine;
1414

1515
import fr.obeo.dsl.debug.ide.event.IDSLDebugEventProcessor;
1616

@@ -20,5 +20,5 @@ public AbstractGemocDebuggerFactory(){
2020

2121
}
2222

23-
public abstract AbstractGemocDebugger createDebugger(IDSLDebugEventProcessor target, IBasicExecutionEngine engine);
23+
public abstract AbstractGemocDebugger createDebugger(IDSLDebugEventProcessor target, IExecutionEngine engine);
2424
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212

1313
import java.util.function.BiPredicate;
1414

15-
import org.gemoc.xdsmlframework.api.core.IBasicExecutionEngine;
15+
import org.gemoc.xdsmlframework.api.core.IExecutionEngine;
1616
import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon;
1717

1818
import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence;
1919

2020
public interface IGemocDebugger extends IEngineAddon {
2121

22-
public abstract void addPredicateBreak(BiPredicate<IBasicExecutionEngine, MSEOccurrence> predicate);
22+
public abstract void addPredicateBreak(BiPredicate<IExecutionEngine, MSEOccurrence> predicate);
2323

24-
public abstract void addPredicateBreakpoint(BiPredicate<IBasicExecutionEngine, MSEOccurrence> predicate);
24+
public abstract void addPredicateBreakpoint(BiPredicate<IExecutionEngine, MSEOccurrence> predicate);
2525

2626
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
import org.gemoc.commons.eclipse.ui.OpenEditor;
3030
import org.gemoc.executionframework.engine.core.AbstractExecutionEngine;
3131
import org.gemoc.executionframework.engine.ui.Activator;
32-
import org.gemoc.xdsmlframework.api.core.IBasicExecutionEngine;
32+
import org.gemoc.xdsmlframework.api.core.IExecutionEngine;
3333
import org.osgi.framework.Bundle;
3434

3535
import fr.obeo.dsl.debug.ide.adapter.DSLThreadAdapter;
3636

3737
public class OpenSemanticsHandler extends AbstractHandler {
3838

39-
private IBasicExecutionEngine engine;
39+
private IExecutionEngine engine;
4040

4141
private String bundleSymbolicName;
4242

@@ -111,7 +111,7 @@ public void setBundleSymbolicName(String bundleSymbolicName) {
111111
this.bundleSymbolicName = bundleSymbolicName;
112112
}
113113

114-
public void setEngine(IBasicExecutionEngine engine) {
114+
public void setEngine(IExecutionEngine engine) {
115115
this.engine = engine;
116116
}
117117
}

‎framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.gemoc.executionframework.extensions.sirius.services.AbstractGemocDebuggerServices;
4040
import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus;
4141
import org.gemoc.xdsmlframework.api.core.ExecutionMode;
42-
import org.gemoc.xdsmlframework.api.core.IBasicExecutionEngine;
42+
import org.gemoc.xdsmlframework.api.core.IExecutionEngine;
4343
import org.gemoc.xdsmlframework.api.core.IExecutionEngine;
4444
import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon;
4545

@@ -51,10 +51,10 @@ abstract public class AbstractSequentialGemocLauncher extends AbstractGemocLaunc
5151
// warning this MODEL_ID must be the same as the one in the ModelLoader in order to enable correctly the breakpoints
5252
public final static String MODEL_ID = org.gemoc.executionframework.extensions.sirius.Activator.PLUGIN_ID + ".debugModel";
5353

54-
protected IBasicExecutionEngine _executionEngine;
54+
protected IExecutionEngine _executionEngine;
5555

5656

57-
protected abstract IBasicExecutionEngine createExecutionEngine(RunConfiguration runConfiguration,
57+
protected abstract IExecutionEngine createExecutionEngine(RunConfiguration runConfiguration,
5858
ExecutionMode executionMode) throws CoreException, EngineContextException;
5959

6060
protected abstract void prepareViews();
@@ -147,9 +147,9 @@ protected IStatus run(IProgressMonitor monitor) {
147147

148148
private boolean isEngineAlreadyRunning(URI launchedModelURI) throws CoreException {
149149
// make sure there is no other running engine on this model
150-
Collection<IBasicExecutionEngine> engines = org.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry
150+
Collection<IExecutionEngine> engines = org.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry
151151
.getRunningEngines().values();
152-
for (IBasicExecutionEngine engine : engines) {
152+
for (IExecutionEngine engine : engines) {
153153
IExecutionEngine observable = (IExecutionEngine) engine;
154154
if (observable.getRunningStatus() != RunStatus.Stopped
155155
&& observable.getExecutionContext().getResourceModel().getURI().equals(launchedModelURI)) {

0 commit comments

Comments
 (0)