Skip to content

Commit 1a5be44

Browse files
d-leroyd-leroy
committed
Added missing derived to metamodel and updated state graph and timeline diff viewer to the new generic API
1 parent 2c22d95 commit 1a5be44

File tree

12 files changed

+903
-1085
lines changed

12 files changed

+903
-1085
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,14 +281,14 @@ public void addRepresentationToRefresh(String representationID,
281281
}
282282

283283
@Override
284-
public void activate(Object context, Step step) {
284+
public void activate(Object context, Step<?> step) {
285285
final Set<URI> instructionURIs = new HashSet<URI>();
286286
MSEOccurrence mseOccurrence = step.getMseoccurrence();
287287
if (mseOccurrence != null && mseOccurrence.getMse() != null && mseOccurrence.getMse().getCaller() != null) {
288288
instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse().getCaller()));
289289
}
290290
if(step instanceof ParallelStep){
291-
for(Step substep: ((ParallelStep<?>)step).getSubSteps()){
291+
for(Step<?> substep: ((ParallelStep<?, ?>)step).getSubSteps()){
292292
if (substep.getMseoccurrence() != null &&
293293
substep.getMseoccurrence().getMse() != null &&
294294
substep.getMseoccurrence().getMse().getCaller() != null) {
@@ -388,18 +388,18 @@ public void aboutToSelectStep(IExecutionEngine engine, Collection<Step> logicalS
388388
}
389389

390390
@Override
391-
public void stepSelected(IExecutionEngine engine, Step selectedLogicalStep) {
391+
public void stepSelected(IExecutionEngine engine, Step<?> selectedLogicalStep) {
392392
}
393393

394394
@Override
395-
public void aboutToExecuteStep(IExecutionEngine engine, Step stepToExecute) {
395+
public void aboutToExecuteStep(IExecutionEngine engine, Step<?> stepToExecute) {
396396
if(!(stepToExecute.eContainer() instanceof ParallelStep)){
397397
activate(engine, stepToExecute);
398398
}
399399
}
400400

401401
@Override
402-
public void stepExecuted(IExecutionEngine engine, Step stepExecuted) {
402+
public void stepExecuted(IExecutionEngine engine, Step<?> stepExecuted) {
403403
}
404404
}
405405

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public interface IModelAnimator extends IEngineAddon {
3030
* @param context
3131
* the context {@link Object}
3232
*/
33-
void activate(Object context, Step step);
33+
void activate(Object context, Step<?> step);
3434

3535
/**
3636
* Clears {@link IModelAnimator#activate(LogicalStep) activated}

0 commit comments

Comments
 (0)