Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2017-10-27 13:04:50 -0400
committerHenrik Rentz-Reichert2017-10-27 13:04:50 -0400
commit37d506d21b2d9d2867c07d6470795c31965d96cf (patch)
tree93d61cbf78db1c1869116769846c15b557dfc4c1
parent403e8d28ae2edc813b75a1dbbe32b01b8f7d1074 (diff)
downloadorg.eclipse.etrice-37d506d21b2d9d2867c07d6470795c31965d96cf.tar.gz
org.eclipse.etrice-37d506d21b2d9d2867c07d6470795c31965d96cf.tar.xz
org.eclipse.etrice-37d506d21b2d9d2867c07d6470795c31965d96cf.zip
Bug 511330 - [core.genmodel.fsm] introduce simplified generator model
for state machines Some bug fixes concerning the graphical editor for state machines which is using the new FSM genmodel now. Change-Id: I10397957cc6c896f68fed364a0f020c50995922d
-rw-r--r--plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/room/util/CommonDataCalculator.java66
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/NodeGen.java8
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java74
-rw-r--r--plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/AbstractStateMachineGenerator.java8
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java8
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java16
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java93
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java31
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/commands/PopulateDiagramCommand.java2
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/commands/StateGraphContext.java276
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/AbstractFSMDiagramBehavior.java6
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/provider/BaseDiagramProvider.xtend2
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/ChoicePointSupport.java3
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/DiagramUpdateFeature.java5
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/IStateGraphContext.java2
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/InitialPointSupport.java91
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java1
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphUpdateContext.java1
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java10
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TrPointSupport.java4
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java3
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramEditingUtil.java19
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramExtensions.xtend2
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/FSMSupportUtil.java16
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.xtend2
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/provider/BaseDiagramProvider.java24
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramExtensions.java2
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.java2
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/DefaultDetailExpressionProvider.java9
-rw-r--r--plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/DiagramEditorBase.java12
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zipbin104130 -> 103431 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.java.zipbin210088 -> 210088 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zipbin194421 -> 183137 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zipbin15875 -> 15881 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zipbin47908 -> 26331 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zipbin200345 -> 200344 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zipbin87360 -> 84024 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zipbin70307 -> 70307 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zipbin12276 -> 11519 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.cpp.zipbin14005 -> 13204 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zipbin20908 -> 20181 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.cpp.zipbin22175 -> 21449 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zipbin17881 -> 17881 bytes
43 files changed, 335 insertions, 463 deletions
diff --git a/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/room/util/CommonDataCalculator.java b/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/room/util/CommonDataCalculator.java
index 1acb3d3a8..976d28914 100644
--- a/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/room/util/CommonDataCalculator.java
+++ b/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/room/util/CommonDataCalculator.java
@@ -46,37 +46,52 @@ public class CommonDataCalculator implements ICommonDataCalculator {
return null;
} else {
EList<Link> _chainHeads = l.getChainHeads();
- final Function1<Link, TransitionBase> _function = (Link it) -> {
- TransitionBase _transition = it.getTransition();
- return CommonDataCalculator.realTransition(_transition);
+ final Function1<Link, TransitionBase> _function = new Function1<Link, TransitionBase>() {
+ @Override
+ public TransitionBase apply(final Link it) {
+ TransitionBase _transition = it.getTransition();
+ return CommonDataCalculator.realTransition(_transition);
+ }
};
List<TransitionBase> _map = ListExtensions.<Link, TransitionBase>map(_chainHeads, _function);
Iterable<TriggeredTransition> transitions = Iterables.<TriggeredTransition>filter(_map, TriggeredTransition.class);
- final Function1<TriggeredTransition, EList<Trigger>> _function_1 = (TriggeredTransition it) -> {
- return it.getTriggers();
+ final Function1<TriggeredTransition, EList<Trigger>> _function_1 = new Function1<TriggeredTransition, EList<Trigger>>() {
+ @Override
+ public EList<Trigger> apply(final TriggeredTransition it) {
+ return it.getTriggers();
+ }
};
Iterable<EList<Trigger>> _map_1 = IterableExtensions.<TriggeredTransition, EList<Trigger>>map(transitions, _function_1);
final Iterable<Trigger> triggers = Iterables.<Trigger>concat(_map_1);
- final Function1<Trigger, EList<MessageFromIf>> _function_2 = (Trigger it) -> {
- return it.getMsgFromIfPairs();
+ final Function1<Trigger, EList<MessageFromIf>> _function_2 = new Function1<Trigger, EList<MessageFromIf>>() {
+ @Override
+ public EList<MessageFromIf> apply(final Trigger it) {
+ return it.getMsgFromIfPairs();
+ }
};
Iterable<EList<MessageFromIf>> _map_2 = IterableExtensions.<Trigger, EList<MessageFromIf>>map(triggers, _function_2);
Iterable<MessageFromIf> _flatten = Iterables.<MessageFromIf>concat(_map_2);
- final Function1<MessageFromIf, VarDecl> _function_3 = (MessageFromIf it) -> {
- EObject _message = it.getMessage();
- return ((Message) _message).getData();
+ final Function1<MessageFromIf, VarDecl> _function_3 = new Function1<MessageFromIf, VarDecl>() {
+ @Override
+ public VarDecl apply(final MessageFromIf it) {
+ EObject _message = it.getMessage();
+ return ((Message) _message).getData();
+ }
};
final Iterable<VarDecl> varDeclarations = IterableExtensions.<MessageFromIf, VarDecl>map(_flatten, _function_3);
- final Function1<VarDecl, DataType> _function_4 = (VarDecl it) -> {
- RefableType _refType = null;
- if (it!=null) {
- _refType=it.getRefType();
- }
- DataType _type = null;
- if (_refType!=null) {
- _type=_refType.getType();
+ final Function1<VarDecl, DataType> _function_4 = new Function1<VarDecl, DataType>() {
+ @Override
+ public DataType apply(final VarDecl it) {
+ RefableType _refType = null;
+ if (it!=null) {
+ _refType=it.getRefType();
+ }
+ DataType _type = null;
+ if (_refType!=null) {
+ _type=_refType.getType();
+ }
+ return _type;
}
- return _type;
};
Iterable<DataType> _map_3 = IterableExtensions.<VarDecl, DataType>map(varDeclarations, _function_4);
final Set<DataType> allData = IterableExtensions.<DataType>toSet(_map_3);
@@ -85,12 +100,15 @@ public class CommonDataCalculator implements ICommonDataCalculator {
if (_equals) {
return IterableExtensions.<VarDecl>head(varDeclarations);
} else {
- final Function1<VarDecl, RefableType> _function_5 = (VarDecl it) -> {
- RefableType _refType = null;
- if (it!=null) {
- _refType=it.getRefType();
+ final Function1<VarDecl, RefableType> _function_5 = new Function1<VarDecl, RefableType>() {
+ @Override
+ public RefableType apply(final VarDecl it) {
+ RefableType _refType = null;
+ if (it!=null) {
+ _refType=it.getRefType();
+ }
+ return _refType;
}
- return _refType;
};
Iterable<RefableType> _map_4 = IterableExtensions.<VarDecl, RefableType>map(varDeclarations, _function_5);
final List<RefableType> types = IterableExtensions.<RefableType>toList(_map_4);
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/NodeGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/NodeGen.java
index 74632625e..105ac2c7c 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/NodeGen.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/NodeGen.java
@@ -19,6 +19,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.function.Consumer;
import org.eclipse.emf.common.util.EList;
import org.eclipse.etrice.core.common.converter.TimeConverter;
import org.eclipse.etrice.core.etmap.util.ETMapUtil;
@@ -53,7 +54,6 @@ import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.ListExtensions;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
@Singleton
@SuppressWarnings("all")
@@ -84,14 +84,14 @@ public class NodeGen {
final Map<SubSystemClass, WiredSubSystemClass> sscc2wired = CollectionLiterals.<SubSystemClass, WiredSubSystemClass>newHashMap();
EList<WiredStructureClass> _wiredInstances = root.getWiredInstances();
Iterable<WiredSubSystemClass> _filter = Iterables.<WiredSubSystemClass>filter(_wiredInstances, WiredSubSystemClass.class);
- final Procedure1<WiredSubSystemClass> _function = new Procedure1<WiredSubSystemClass>() {
+ final Consumer<WiredSubSystemClass> _function = new Consumer<WiredSubSystemClass>() {
@Override
- public void apply(final WiredSubSystemClass it) {
+ public void accept(final WiredSubSystemClass it) {
SubSystemClass _subSystemClass = it.getSubSystemClass();
sscc2wired.put(_subSystemClass, it);
}
};
- IterableExtensions.<WiredSubSystemClass>forEach(_filter, _function);
+ _filter.forEach(_function);
Collection<NodeRef> _nodeRefs = ETMapUtil.getNodeRefs();
for (final NodeRef nr : _nodeRefs) {
List<String> _subSystemInstancePaths = ETMapUtil.getSubSystemInstancePaths(nr);
diff --git a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java
index f01eb97fc..6625d68f9 100644
--- a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java
+++ b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java
@@ -17,7 +17,6 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
-import java.util.function.Consumer;
import org.eclipse.emf.common.util.EList;
import org.eclipse.etrice.core.common.base.Documentation;
import org.eclipse.etrice.core.common.base.util.RelativePathHelpers;
@@ -55,6 +54,7 @@ import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
@Singleton
@SuppressWarnings("all")
@@ -107,119 +107,119 @@ public class DocGen {
String _plus = (path + _name_1);
this.fileAccess.setOutputPath(_plus);
EList<LogicalSystem> _systems = model.getSystems();
- final Consumer<LogicalSystem> _function = new Consumer<LogicalSystem>() {
+ final Procedure1<LogicalSystem> _function = new Procedure1<LogicalSystem>() {
@Override
- public void accept(final LogicalSystem it) {
+ public void apply(final LogicalSystem it) {
CharSequence _generateDoc = DocGen.this.generateDoc(it, ctx);
String _docFragmentName = DocGen.this.docFragmentName(it);
DocGen.this.saveAs(_generateDoc, _docFragmentName);
}
};
- _systems.forEach(_function);
+ IterableExtensions.<LogicalSystem>forEach(_systems, _function);
EList<LogicalSystem> _systems_1 = model.getSystems();
- final Consumer<LogicalSystem> _function_1 = new Consumer<LogicalSystem>() {
+ final Procedure1<LogicalSystem> _function_1 = new Procedure1<LogicalSystem>() {
@Override
- public void accept(final LogicalSystem it) {
+ public void apply(final LogicalSystem it) {
EList<RoomModel> _referencedModels = root.getReferencedModels(it);
referencedModels.addAll(_referencedModels);
}
};
- _systems_1.forEach(_function_1);
+ IterableExtensions.<LogicalSystem>forEach(_systems_1, _function_1);
EList<SubSystemClass> _subSystemClasses = model.getSubSystemClasses();
- final Consumer<SubSystemClass> _function_2 = new Consumer<SubSystemClass>() {
+ final Procedure1<SubSystemClass> _function_2 = new Procedure1<SubSystemClass>() {
@Override
- public void accept(final SubSystemClass it) {
+ public void apply(final SubSystemClass it) {
CharSequence _generateDoc = DocGen.this.generateDoc(it, ctx);
String _docFragmentName = DocGen.this.docFragmentName(it);
DocGen.this.saveAs(_generateDoc, _docFragmentName);
}
};
- _subSystemClasses.forEach(_function_2);
+ IterableExtensions.<SubSystemClass>forEach(_subSystemClasses, _function_2);
EList<SubSystemClass> _subSystemClasses_1 = model.getSubSystemClasses();
- final Consumer<SubSystemClass> _function_3 = new Consumer<SubSystemClass>() {
+ final Procedure1<SubSystemClass> _function_3 = new Procedure1<SubSystemClass>() {
@Override
- public void accept(final SubSystemClass it) {
+ public void apply(final SubSystemClass it) {
EList<RoomModel> _referencedModels = root.getReferencedModels(it);
referencedModels.addAll(_referencedModels);
}
};
- _subSystemClasses_1.forEach(_function_3);
+ IterableExtensions.<SubSystemClass>forEach(_subSystemClasses_1, _function_3);
EList<GeneralProtocolClass> _protocolClasses = model.getProtocolClasses();
- final Consumer<GeneralProtocolClass> _function_4 = new Consumer<GeneralProtocolClass>() {
+ final Procedure1<GeneralProtocolClass> _function_4 = new Procedure1<GeneralProtocolClass>() {
@Override
- public void accept(final GeneralProtocolClass it) {
+ public void apply(final GeneralProtocolClass it) {
CharSequence _generateDoc = DocGen.this.generateDoc(it, ctx);
String _docFragmentName = DocGen.this.docFragmentName(it);
DocGen.this.saveAs(_generateDoc, _docFragmentName);
}
};
- _protocolClasses.forEach(_function_4);
+ IterableExtensions.<GeneralProtocolClass>forEach(_protocolClasses, _function_4);
EList<GeneralProtocolClass> _protocolClasses_1 = model.getProtocolClasses();
- final Consumer<GeneralProtocolClass> _function_5 = new Consumer<GeneralProtocolClass>() {
+ final Procedure1<GeneralProtocolClass> _function_5 = new Procedure1<GeneralProtocolClass>() {
@Override
- public void accept(final GeneralProtocolClass it) {
+ public void apply(final GeneralProtocolClass it) {
EList<RoomModel> _referencedModels = root.getReferencedModels(it);
referencedModels.addAll(_referencedModels);
}
};
- _protocolClasses_1.forEach(_function_5);
+ IterableExtensions.<GeneralProtocolClass>forEach(_protocolClasses_1, _function_5);
EList<EnumerationType> _enumerationTypes = model.getEnumerationTypes();
- final Consumer<EnumerationType> _function_6 = new Consumer<EnumerationType>() {
+ final Procedure1<EnumerationType> _function_6 = new Procedure1<EnumerationType>() {
@Override
- public void accept(final EnumerationType it) {
+ public void apply(final EnumerationType it) {
CharSequence _generateDoc = DocGen.this.generateDoc(it, ctx);
String _docFragmentName = DocGen.this.docFragmentName(it);
DocGen.this.saveAs(_generateDoc, _docFragmentName);
}
};
- _enumerationTypes.forEach(_function_6);
+ IterableExtensions.<EnumerationType>forEach(_enumerationTypes, _function_6);
EList<EnumerationType> _enumerationTypes_1 = model.getEnumerationTypes();
- final Consumer<EnumerationType> _function_7 = new Consumer<EnumerationType>() {
+ final Procedure1<EnumerationType> _function_7 = new Procedure1<EnumerationType>() {
@Override
- public void accept(final EnumerationType it) {
+ public void apply(final EnumerationType it) {
EList<RoomModel> _referencedModels = root.getReferencedModels(it);
referencedModels.addAll(_referencedModels);
}
};
- _enumerationTypes_1.forEach(_function_7);
+ IterableExtensions.<EnumerationType>forEach(_enumerationTypes_1, _function_7);
EList<DataClass> _dataClasses = model.getDataClasses();
- final Consumer<DataClass> _function_8 = new Consumer<DataClass>() {
+ final Procedure1<DataClass> _function_8 = new Procedure1<DataClass>() {
@Override
- public void accept(final DataClass it) {
+ public void apply(final DataClass it) {
CharSequence _generateDoc = DocGen.this.generateDoc(it, ctx);
String _docFragmentName = DocGen.this.docFragmentName(it);
DocGen.this.saveAs(_generateDoc, _docFragmentName);
}
};
- _dataClasses.forEach(_function_8);
+ IterableExtensions.<DataClass>forEach(_dataClasses, _function_8);
EList<DataClass> _dataClasses_1 = model.getDataClasses();
- final Consumer<DataClass> _function_9 = new Consumer<DataClass>() {
+ final Procedure1<DataClass> _function_9 = new Procedure1<DataClass>() {
@Override
- public void accept(final DataClass it) {
+ public void apply(final DataClass it) {
EList<RoomModel> _referencedModels = root.getReferencedModels(it);
referencedModels.addAll(_referencedModels);
}
};
- _dataClasses_1.forEach(_function_9);
+ IterableExtensions.<DataClass>forEach(_dataClasses_1, _function_9);
EList<ActorClass> _actorClasses = model.getActorClasses();
- final Consumer<ActorClass> _function_10 = new Consumer<ActorClass>() {
+ final Procedure1<ActorClass> _function_10 = new Procedure1<ActorClass>() {
@Override
- public void accept(final ActorClass it) {
+ public void apply(final ActorClass it) {
CharSequence _generateDoc = DocGen.this.generateDoc(it, ctx);
String _docFragmentName = DocGen.this.docFragmentName(it);
DocGen.this.saveAs(_generateDoc, _docFragmentName);
}
};
- _actorClasses.forEach(_function_10);
+ IterableExtensions.<ActorClass>forEach(_actorClasses, _function_10);
EList<ActorClass> _actorClasses_1 = model.getActorClasses();
- final Consumer<ActorClass> _function_11 = new Consumer<ActorClass>() {
+ final Procedure1<ActorClass> _function_11 = new Procedure1<ActorClass>() {
@Override
- public void accept(final ActorClass it) {
+ public void apply(final ActorClass it) {
EList<RoomModel> _referencedModels = root.getReferencedModels(it);
referencedModels.addAll(_referencedModels);
}
};
- _actorClasses_1.forEach(_function_11);
+ IterableExtensions.<ActorClass>forEach(_actorClasses_1, _function_11);
this.fileAccess.setOutputPath(path);
CharSequence _generateModelDoc = this.generateModelDoc(ctx, referencedModels);
this.saveAs(_generateModelDoc, file);
diff --git a/plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/AbstractStateMachineGenerator.java b/plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/AbstractStateMachineGenerator.java
index 568cdede2..840313c11 100644
--- a/plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/AbstractStateMachineGenerator.java
+++ b/plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/AbstractStateMachineGenerator.java
@@ -18,7 +18,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.function.Consumer;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.etrice.core.fsm.fSM.AbstractInterfaceItem;
@@ -58,6 +57,7 @@ import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.IteratorExtensions;
import org.eclipse.xtext.xbase.lib.ListExtensions;
+import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
/**
* @author Henrik Rentz-Reichert
@@ -513,14 +513,14 @@ public abstract class AbstractStateMachineGenerator {
};
final List<Node> nodes = IterableExtensions.<Node, String>sortBy(_list, _function);
final HashMap<State, Node> state2node = CollectionLiterals.<State, Node>newHashMap();
- final Consumer<Node> _function_1 = new Consumer<Node>() {
+ final Procedure1<Node> _function_1 = new Procedure1<Node>() {
@Override
- public void accept(final Node it) {
+ public void apply(final Node it) {
StateGraphNode _stateGraphNode = it.getStateGraphNode();
state2node.put(((State) _stateGraphNode), it);
}
};
- nodes.forEach(_function_1);
+ IterableExtensions.<Node>forEach(nodes, _function_1);
final Function1<Node, StateGraphNode> _function_2 = new Function1<Node, StateGraphNode>() {
@Override
public StateGraphNode apply(final Node it) {
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java
index afacbdd06..781318739 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java
@@ -22,6 +22,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.function.Consumer;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.TreeIterator;
@@ -72,7 +73,6 @@ import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.IteratorExtensions;
import org.eclipse.xtext.xbase.lib.ListExtensions;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
@Singleton
@SuppressWarnings("all")
@@ -118,14 +118,14 @@ public class NodeGen {
}
};
Iterable<WiredStructureClass> _filter = IterableExtensions.<WiredStructureClass>filter(_wiredInstances, _function);
- final Procedure1<WiredStructureClass> _function_1 = new Procedure1<WiredStructureClass>() {
+ final Consumer<WiredStructureClass> _function_1 = new Consumer<WiredStructureClass>() {
@Override
- public void apply(final WiredStructureClass w) {
+ public void accept(final WiredStructureClass w) {
SubSystemClass _subSystemClass = ((WiredSubSystemClass) w).getSubSystemClass();
sscc2wired.put(_subSystemClass, ((WiredSubSystemClass) w));
}
};
- IterableExtensions.<WiredStructureClass>forEach(_filter, _function_1);
+ _filter.forEach(_function_1);
Collection<NodeRef> _nodeRefs = ETMapUtil.getNodeRefs();
for (final NodeRef nr : _nodeRefs) {
List<String> _subSystemInstancePaths = ETMapUtil.getSubSystemInstancePaths(nr);
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
index 4004a1254..5ac6a98f8 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
@@ -137,8 +137,11 @@ public class GenericStateMachineGenerator extends AbstractStateMachineGenerator
{
TransitionBase _transition = tt.getTransition();
EList<Trigger> _triggers = ((TriggeredTransition) _transition).getTriggers();
- final Function1<Trigger, Boolean> _function = (Trigger trig) -> {
- return Boolean.valueOf(this._triggerExtensions.isMatching(trig, trigger));
+ final Function1<Trigger, Boolean> _function = new Function1<Trigger, Boolean>() {
+ @Override
+ public Boolean apply(final Trigger trig) {
+ return Boolean.valueOf(GenericStateMachineGenerator.this._triggerExtensions.isMatching(trig, trigger));
+ }
};
final Trigger tr = IterableExtensions.<Trigger>findFirst(_triggers, _function);
StringConcatenation _builder = new StringConcatenation();
@@ -174,9 +177,12 @@ public class GenericStateMachineGenerator extends AbstractStateMachineGenerator
public String genActionCodeMethod(final GraphContainer gc, final Link link, final boolean generateImplementation) {
String _xblockexpression = null;
{
- boolean hasArgs = ((!link.getChainHeads().isEmpty()) && IterableExtensions.<Link>forall(link.getChainHeads(), ((Function1<Link, Boolean>) (Link it) -> {
- return Boolean.valueOf(((it.getTransition() instanceof NonInitialTransition) && (!(it.getTransition() instanceof GuardedTransition))));
- })));
+ boolean hasArgs = ((!link.getChainHeads().isEmpty()) && IterableExtensions.<Link>forall(link.getChainHeads(), new Function1<Link, Boolean>() {
+ @Override
+ public Boolean apply(final Link it) {
+ return Boolean.valueOf(((it.getTransition() instanceof NonInitialTransition) && (!(it.getTransition() instanceof GuardedTransition))));
+ }
+ }));
String _className = this.getClassName(gc);
final String opScope = this.langExt.operationScope(_className, false);
String _xifexpression = null;
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
index e7f882e20..e8698f6ec 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
@@ -388,11 +388,14 @@ public class ProcedureHelpers {
* @return an argument list for the attributes
*/
public String argList(final Iterable<Attribute> attributes) {
- final Function1<Attribute, String> _function = (Attribute it) -> {
- String _signatureString = this.signatureString(it);
- String _plus = (_signatureString + " ");
- String _name = it.getName();
- return (_plus + _name);
+ final Function1<Attribute, String> _function = new Function1<Attribute, String>() {
+ @Override
+ public String apply(final Attribute it) {
+ String _signatureString = ProcedureHelpers.this.signatureString(it);
+ String _plus = (_signatureString + " ");
+ String _name = it.getName();
+ return (_plus + _name);
+ }
};
Iterable<String> _map = IterableExtensions.<Attribute, String>map(attributes, _function);
return IterableExtensions.join(_map, ", ");
@@ -558,9 +561,12 @@ public class ProcedureHelpers {
boolean _usesInheritance = this.languageExt.usesInheritance();
boolean _not = (!_usesInheritance);
List<ClassStructor> _structors = this.getStructors(cls, _not);
- final Function1<ClassStructor, Boolean> _function = (ClassStructor it) -> {
- boolean _isConstructor = it.isConstructor();
- return Boolean.valueOf((_isConstructor == ctor));
+ final Function1<ClassStructor, Boolean> _function = new Function1<ClassStructor, Boolean>() {
+ @Override
+ public Boolean apply(final ClassStructor it) {
+ boolean _isConstructor = it.isConstructor();
+ return Boolean.valueOf((_isConstructor == ctor));
+ }
};
boolean _exists = IterableExtensions.<ClassStructor>exists(_structors, _function);
if (_exists) {
@@ -597,8 +603,11 @@ public class ProcedureHelpers {
boolean _usesInheritance = this.languageExt.usesInheritance();
boolean _not = (!_usesInheritance);
List<ClassStructor> _structors = this.getStructors(cls, _not);
- final Function1<ClassStructor, Boolean> _function = (ClassStructor it) -> {
- return Boolean.valueOf(it.isConstructor());
+ final Function1<ClassStructor, Boolean> _function = new Function1<ClassStructor, Boolean>() {
+ @Override
+ public Boolean apply(final ClassStructor it) {
+ return Boolean.valueOf(it.isConstructor());
+ }
};
boolean _exists = IterableExtensions.<ClassStructor>exists(_structors, _function);
if (_exists) {
@@ -610,9 +619,12 @@ public class ProcedureHelpers {
boolean _usesInheritance_1 = this.languageExt.usesInheritance();
boolean _not_1 = (!_usesInheritance_1);
List<ClassStructor> _structors_1 = this.getStructors(cls, _not_1);
- final Function1<ClassStructor, Boolean> _function_1 = (ClassStructor it) -> {
- boolean _isConstructor = it.isConstructor();
- return Boolean.valueOf((!_isConstructor));
+ final Function1<ClassStructor, Boolean> _function_1 = new Function1<ClassStructor, Boolean>() {
+ @Override
+ public Boolean apply(final ClassStructor it) {
+ boolean _isConstructor = it.isConstructor();
+ return Boolean.valueOf((!_isConstructor));
+ }
};
boolean _exists_1 = IterableExtensions.<ClassStructor>exists(_structors_1, _function_1);
if (_exists_1) {
@@ -654,9 +666,12 @@ public class ProcedureHelpers {
boolean _usesInheritance = this.languageExt.usesInheritance();
boolean _not = (!_usesInheritance);
List<ClassStructor> _structors = this.getStructors(cls, _not);
- final Function1<ClassStructor, Boolean> _function = (ClassStructor it) -> {
- boolean _isConstructor = it.isConstructor();
- return Boolean.valueOf((_isConstructor == ctor));
+ final Function1<ClassStructor, Boolean> _function = new Function1<ClassStructor, Boolean>() {
+ @Override
+ public Boolean apply(final ClassStructor it) {
+ boolean _isConstructor = it.isConstructor();
+ return Boolean.valueOf((_isConstructor == ctor));
+ }
};
boolean _exists = IterableExtensions.<ClassStructor>exists(_structors, _function);
boolean _not_1 = (!_exists);
@@ -705,30 +720,42 @@ public class ProcedureHelpers {
boolean _usesInheritance = this.languageExt.usesInheritance();
boolean _not = (!_usesInheritance);
List<ClassStructor> _structors = this.getStructors(cls, _not);
- final Function1<ClassStructor, Boolean> _function = (ClassStructor it) -> {
- boolean _isConstructor = it.isConstructor();
- return Boolean.valueOf((_isConstructor == ctor));
+ final Function1<ClassStructor, Boolean> _function = new Function1<ClassStructor, Boolean>() {
+ @Override
+ public Boolean apply(final ClassStructor it) {
+ boolean _isConstructor = it.isConstructor();
+ return Boolean.valueOf((_isConstructor == ctor));
+ }
};
final Iterable<ClassStructor> implementedStructors = IterableExtensions.<ClassStructor>filter(_structors, _function);
- final Function1<ClassStructor, DetailCode> _function_1 = (ClassStructor it) -> {
- return it.getDetailCode();
+ final Function1<ClassStructor, DetailCode> _function_1 = new Function1<ClassStructor, DetailCode>() {
+ @Override
+ public DetailCode apply(final ClassStructor it) {
+ return it.getDetailCode();
+ }
};
Iterable<DetailCode> _map = IterableExtensions.<ClassStructor, DetailCode>map(implementedStructors, _function_1);
- final Function1<DetailCode, String> _function_2 = (DetailCode it) -> {
- AbstractGenerator _instance = AbstractGenerator.getInstance();
- return _instance.getTranslatedCode(it);
+ final Function1<DetailCode, String> _function_2 = new Function1<DetailCode, String>() {
+ @Override
+ public String apply(final DetailCode it) {
+ AbstractGenerator _instance = AbstractGenerator.getInstance();
+ return _instance.getTranslatedCode(it);
+ }
};
final Iterable<String> translatedCodes = IterableExtensions.<DetailCode, String>map(_map, _function_2);
- final Function1<String, CharSequence> _function_3 = (String it) -> {
- CharSequence _xifexpression = null;
- int _size = IterableExtensions.size(translatedCodes);
- boolean _greaterThan = (_size > 1);
- if (_greaterThan) {
- _xifexpression = this.asBlock(it);
- } else {
- _xifexpression = it;
+ final Function1<String, CharSequence> _function_3 = new Function1<String, CharSequence>() {
+ @Override
+ public CharSequence apply(final String it) {
+ CharSequence _xifexpression = null;
+ int _size = IterableExtensions.size(translatedCodes);
+ boolean _greaterThan = (_size > 1);
+ if (_greaterThan) {
+ _xifexpression = ProcedureHelpers.this.asBlock(it);
+ } else {
+ _xifexpression = it;
+ }
+ return _xifexpression;
}
- return _xifexpression;
};
Iterable<CharSequence> _map_1 = IterableExtensions.<String, CharSequence>map(translatedCodes, _function_3);
String _join = IterableExtensions.join(_map_1);
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
index 730f7758f..1095bc38b 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
@@ -17,7 +17,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import java.util.function.Consumer;
import javax.inject.Inject;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
@@ -52,6 +51,7 @@ import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
/**
* collection of convenience functions for code generation
@@ -103,11 +103,14 @@ public class RoomExtensions extends FSMExtensions {
*/
public List<Port> punion(final Iterable<Port> in1, final Iterable<ExternalPort> in2) {
final ArrayList<Port> ret = new ArrayList<Port>();
- final Consumer<ExternalPort> _function = (ExternalPort e) -> {
- Port _interfacePort = e.getInterfacePort();
- ret.add(_interfacePort);
+ final Procedure1<ExternalPort> _function = new Procedure1<ExternalPort>() {
+ @Override
+ public void apply(final ExternalPort e) {
+ Port _interfacePort = e.getInterfacePort();
+ ret.add(_interfacePort);
+ }
};
- in2.forEach(_function);
+ IterableExtensions.<ExternalPort>forEach(in2, _function);
Iterables.<Port>addAll(ret, in1);
return ret;
}
@@ -558,9 +561,12 @@ public class RoomExtensions extends FSMExtensions {
public MessageHandler getSendHandler(final Message m, final boolean conj) {
EObject _eContainer = m.eContainer();
List<MessageHandler> _sendHandlers = this.getSendHandlers(((ProtocolClass) _eContainer), conj);
- final Function1<MessageHandler, Boolean> _function = (MessageHandler e) -> {
- Message _msg = e.getMsg();
- return Boolean.valueOf(Objects.equal(_msg, m));
+ final Function1<MessageHandler, Boolean> _function = new Function1<MessageHandler, Boolean>() {
+ @Override
+ public Boolean apply(final MessageHandler e) {
+ Message _msg = e.getMsg();
+ return Boolean.valueOf(Objects.equal(_msg, m));
+ }
};
return IterableExtensions.<MessageHandler>findFirst(_sendHandlers, _function);
}
@@ -597,9 +603,12 @@ public class RoomExtensions extends FSMExtensions {
* void return type
*/
public boolean overridesStop(final ActorClass ac) {
- return (IterableExtensions.<StandardOperation>exists(ac.getOperations(), ((Function1<StandardOperation, Boolean>) (StandardOperation e) -> {
- return Boolean.valueOf(((Objects.equal(e.getName(), "stop") && e.getArguments().isEmpty()) && Objects.equal(e.getReturnType(), null)));
- })) || ((!Objects.equal(ac.getActorBase(), null)) && this.overridesStop(ac.getActorBase())));
+ return (IterableExtensions.<StandardOperation>exists(ac.getOperations(), new Function1<StandardOperation, Boolean>() {
+ @Override
+ public Boolean apply(final StandardOperation e) {
+ return Boolean.valueOf(((Objects.equal(e.getName(), "stop") && e.getArguments().isEmpty()) && Objects.equal(e.getReturnType(), null)));
+ }
+ }) || ((!Objects.equal(ac.getActorBase(), null)) && this.overridesStop(ac.getActorBase())));
}
public BasicEList<AbstractInstance> getAllSubInstances(final StructureInstance ssi) {
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/commands/PopulateDiagramCommand.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/commands/PopulateDiagramCommand.java
index 7edc726d5..6bc96f050 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/commands/PopulateDiagramCommand.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/commands/PopulateDiagramCommand.java
@@ -41,8 +41,6 @@ public class PopulateDiagramCommand extends RecordingCommand {
dtp.getFeatureProvider().link(diagram, mc);
- //IStateGraphContext tree = new GenModelStateGraphContext((AbstractFSMDiagramTypeProvider)dtp);
- //DiagramEditingUtil.getInstance().addStateGraph(tree, diagram, dtp.getFeatureProvider());
UpdateContext ctx = new UpdateContext(diagram);
dtp.getFeatureProvider().getUpdateFeature(ctx).update(ctx);
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/commands/StateGraphContext.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/commands/StateGraphContext.java
deleted file mode 100644
index c6a5ed4db..000000000
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/commands/StateGraphContext.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package org.eclipse.etrice.ui.behavior.fsm.commands;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.etrice.core.fsm.fSM.ChoicePoint;
-import org.eclipse.etrice.core.fsm.fSM.FSMFactory;
-import org.eclipse.etrice.core.fsm.fSM.InitialTransition;
-import org.eclipse.etrice.core.fsm.fSM.ModelComponent;
-import org.eclipse.etrice.core.fsm.fSM.RefinedState;
-import org.eclipse.etrice.core.fsm.fSM.SimpleState;
-import org.eclipse.etrice.core.fsm.fSM.State;
-import org.eclipse.etrice.core.fsm.fSM.StateGraph;
-import org.eclipse.etrice.core.fsm.fSM.StateGraphItem;
-import org.eclipse.etrice.core.fsm.fSM.TrPoint;
-import org.eclipse.etrice.core.fsm.fSM.Transition;
-import org.eclipse.etrice.ui.behavior.fsm.support.DefaultPositionProvider;
-import org.eclipse.etrice.ui.behavior.fsm.support.IPositionProvider;
-import org.eclipse.etrice.ui.behavior.fsm.support.IStateGraphContext;
-import org.eclipse.etrice.ui.behavior.fsm.support.util.FSMSupportUtil;
-
-import com.google.inject.Injector;
-
-public class StateGraphContext implements IStateGraphContext {
- private ArrayList<StateGraphContext> children = new ArrayList<StateGraphContext>();
-
- private StateGraph stateGraph;
- private ArrayList<State> states = new ArrayList<State>();
- private ArrayList<ChoicePoint> chPoints = new ArrayList<ChoicePoint>();
- private ArrayList<TrPoint> trPoints = new ArrayList<TrPoint>();
- private ArrayList<Transition> transitions = new ArrayList<Transition>();
- private IPositionProvider positionProvider;
- private HashMap<StateGraphItem, StateGraphContext> obj2ctx;
-
- public static StateGraphContext createContextTree(ModelComponent mc, Injector injector) {
-
- // the top level state graph is always the one of our actor class
- if (mc.getStateMachine()==null || mc.getStateMachine().eIsProxy()) {
- mc.setStateMachine(FSMFactory.eINSTANCE.createStateGraph());
- }
-
- // base classes in reverse order
- ArrayList<ModelComponent> classes = new ArrayList<ModelComponent>();
- {
- ModelComponent a = mc;
- while (a!=null) {
- classes.add(0, a);
- a = a.getBase();
- }
- }
-
- // build and merge contexts from base classes to derived classes
- StateGraphContext tree = null;
- for (ModelComponent cls : classes) {
- if (cls.getStateMachine()!=null) {
- if (tree==null)
- tree = new StateGraphContext(cls.getStateMachine(), new HashMap<StateGraphItem, StateGraphContext>());
- else
- tree.merge(cls.getStateMachine());
- }
- }
-
- tree.positionProvider = new DefaultPositionProvider(mc, injector);
- makePositionsAvailableToChildrenContexts(tree);
-
- return tree;
- }
-
- private StateGraphContext(StateGraph sg, HashMap<StateGraphItem, StateGraphContext> obj2ctx) {
- this.stateGraph = sg;
- this.obj2ctx = obj2ctx;
-
- init(sg);
- }
-
- private void init(StateGraph sg) {
- for (State s : sg.getStates()) {
- states.add(s);
- obj2ctx.put(s, this);
- }
- for (ChoicePoint cp : sg.getChPoints()) {
- chPoints.add(cp);
- obj2ctx.put(cp, this);
- }
- for (TrPoint tp : sg.getTrPoints()) {
- trPoints.add(tp);
- obj2ctx.put(tp, this);
- }
- for (Transition t : sg.getTransitions()) {
- transitions.add(t);
- obj2ctx.put(t, this);
- }
-
- // recurse
- for (State s : sg.getStates()) {
- if (s.getSubgraph()!=null)
- children.add(new StateGraphContext(s.getSubgraph(), obj2ctx));
- }
- }
-
- private void merge(StateGraph derived) {
- stateGraph = derived;
-
- // add derived contents up to refined states
- for (State s : derived.getStates()) {
- if (s instanceof SimpleState) {
- states.add(s);
- obj2ctx.put(s, this);
- }
- }
- for (ChoicePoint cp : derived.getChPoints()) {
- chPoints.add(cp);
- obj2ctx.put(cp, this);
- }
- for (TrPoint tp : derived.getTrPoints()) {
- trPoints.add(tp);
- obj2ctx.put(tp, this);
- }
- for (Transition t : derived.getTransitions()) {
- transitions.add(t);
- obj2ctx.put(t, this);
- }
-
- // recurse for non-refined states
- for (State s : derived.getStates()) {
- if (s instanceof SimpleState)
- if (s.getSubgraph()!=null)
- children.add(new StateGraphContext(s.getSubgraph(), obj2ctx));
- }
-
- // refined states
- for (State refined : derived.getStates()) {
- if (refined instanceof RefinedState) {
- State base = ((RefinedState) refined).getTarget();
- StateGraphContext ctx = obj2ctx.get(base);
- assert(ctx!=null): "should have visited base state already";
-
- // remove base and put refined in place
- ctx.getStates().remove(base);
- ctx.getStates().add(refined);
- obj2ctx.put(refined, this);
-
- // merge sub contexts
- if (FSMSupportUtil.getInstance().getFSMHelpers().hasDirectSubStructure(base)) {
- StateGraphContext basesub = null;
- for (StateGraphContext bs : ctx.children) {
- if (bs.getParentState()==base) {
- basesub = bs;
- break;
- }
- }
- if (basesub!=null) {
- if (FSMSupportUtil.getInstance().getFSMHelpers().hasDirectSubStructure(refined)) {
- basesub.merge(refined.getSubgraph());
- }
- }
- else {
- assert(false): "context not found";
- }
- }
- else if (FSMSupportUtil.getInstance().getFSMHelpers().hasDirectSubStructure(refined)) {
- StateGraphContext sub = new StateGraphContext(refined.getSubgraph(), obj2ctx);
- ctx.getChildren().add(sub);
- }
- }
- }
- }
-
- /**
- * Propagate the position map to all children recursively
- *
- * @param tree
- */
- private static void makePositionsAvailableToChildrenContexts(StateGraphContext tree) {
- for (StateGraphContext child : tree.children) {
- child.positionProvider = tree.positionProvider;
- makePositionsAvailableToChildrenContexts(child);
- }
- }
-
- public State getParentState() {
- if (stateGraph.eContainer() instanceof State)
- return (State) stateGraph.eContainer();
-
- return null;
- }
-
- public List<IStateGraphContext> getChildren() {
- return new ArrayList<IStateGraphContext>(children);
- }
-
- public List<State> getStates() {
- return states;
- }
-
- public List<ChoicePoint> getChPoints() {
- return chPoints;
- }
-
- public StateGraph getStateGraph() {
- return stateGraph;
- }
-
- public List<TrPoint> getTrPoints() {
- return trPoints;
- }
-
- public List<Transition> getTransitions() {
- return transitions;
- }
-
- public IPositionProvider getPositionProvider() {
- return positionProvider;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return dump("");
- }
-
- /**
- * @param indent
- * @return context tree in human readable form
- */
- private String dump(String indent) {
- StringBuilder result = new StringBuilder();
- result.append(indent+">>> "+getText(stateGraph)+"\n");
- indent += " ";
- for (State s : states) {
- result.append(indent+getText(s)+"\n");
- }
-
- for (StateGraphContext child : children) {
- result.append(child.dump(indent));
- }
- return result.toString();
- }
-
- private String getText(StateGraph sg) {
- ModelComponent mc = getModelComponent(sg);
- EObject parent = sg.eContainer();
- String item = parent instanceof ModelComponent? "diagram" : (parent.eClass().getName()+" "+((State)parent).getName());
- return "state graph of "+item+" of "+(mc==null? "?":mc.getComponentName());
- }
-
- private String getText(StateGraphItem item) {
- ModelComponent mc = getModelComponent(item);
- return item.eClass().getName()+" "+item.getName()+" of "+(mc==null? "?":mc.getComponentName());
- }
-
- private ModelComponent getModelComponent(EObject obj) {
- EObject parent = obj.eContainer();
- while (parent!=null) {
- if (parent instanceof ModelComponent)
- return (ModelComponent) parent;
- parent = parent.eContainer();
- }
- return null;
- }
-
- public StateGraphContext getContext(StateGraphItem item) {
- return obj2ctx.get(item);
- }
-
- public StateGraph getInitialPoint(){
- for(Transition t : transitions)
- if(t instanceof InitialTransition)
- return (StateGraph) t.eContainer();
- return null;
- }
-}
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/AbstractFSMDiagramBehavior.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/AbstractFSMDiagramBehavior.java
index 7dc1a9eb2..bac71ebe4 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/AbstractFSMDiagramBehavior.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/AbstractFSMDiagramBehavior.java
@@ -100,9 +100,11 @@ public class AbstractFSMDiagramBehavior extends CustomDiagramBehavior {
*/
@Override
public void internalRefreshEditPart(EditPart editPart) {
+ // JH: deactivated due https://bugs.eclipse.org/bugs/show_bug.cgi?id=464014
+ // TODO find another solution
// Explicitly deactivate and reactivate EditPart to force call to removeDecorators
- editPart.deactivate();
- editPart.activate();
+ //editPart.deactivate();
+ //editPart.activate();
super.internalRefreshEditPart(editPart);
}
}
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/provider/BaseDiagramProvider.xtend b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/provider/BaseDiagramProvider.xtend
index d4f9262f0..3d3f28823 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/provider/BaseDiagramProvider.xtend
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/provider/BaseDiagramProvider.xtend
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/ChoicePointSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/ChoicePointSupport.java
index c9970dd5e..d7891a575 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/ChoicePointSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/ChoicePointSupport.java
@@ -123,8 +123,7 @@ public class ChoicePointSupport {
StateGraph sg = (StateGraph) targetContainer.getLink().getBusinessObjects().get(0);
ModelComponent mc = FSMSupportUtil.getInstance().getModelComponent(getDiagram());
- boolean inherited = FSMSupportUtil.getInstance().isInherited(getDiagram(), sg);
- if (inherited) {
+ if (!FSMSupportUtil.getInstance().isOwnedBy(mc, sg)) {
sg = ModelEditingUtil.insertRefinedState(sg, mc, targetContainer, getFeatureProvider());
}
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/DiagramUpdateFeature.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/DiagramUpdateFeature.java
index 8cdd19284..bf9b7ceab 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/DiagramUpdateFeature.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/DiagramUpdateFeature.java
@@ -17,10 +17,7 @@ import java.util.ArrayList;
import org.eclipse.etrice.core.fsm.fSM.FSMFactory;
import org.eclipse.etrice.core.fsm.fSM.ModelComponent;
import org.eclipse.etrice.core.fsm.fSM.StateGraph;
-import org.eclipse.etrice.ui.behavior.fsm.commands.StateGraphContext;
import org.eclipse.etrice.ui.behavior.fsm.editor.AbstractFSMDiagramTypeProvider;
-import org.eclipse.etrice.ui.behavior.fsm.provider.GenModelProvider;
-import org.eclipse.etrice.ui.behavior.fsm.provider.IInjectorProvider;
import org.eclipse.etrice.ui.behavior.fsm.support.util.DiagramEditingUtil;
import org.eclipse.etrice.ui.behavior.fsm.support.util.FSMSupportUtil;
import org.eclipse.graphiti.features.IFeatureProvider;
@@ -38,8 +35,6 @@ import org.eclipse.graphiti.mm.pictograms.ContainerShape;
import org.eclipse.graphiti.mm.pictograms.Shape;
import org.eclipse.graphiti.platform.IDiagramBehavior;
-import com.google.inject.Injector;
-
/**
* @author Henrik Rentz-Reichert (initial contribution)
*
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/IStateGraphContext.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/IStateGraphContext.java
index d64a7b946..5764c136d 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/IStateGraphContext.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/IStateGraphContext.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/InitialPointSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/InitialPointSupport.java
index 56c7f0b74..c38007be6 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/InitialPointSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/InitialPointSupport.java
@@ -13,6 +13,7 @@
package org.eclipse.etrice.ui.behavior.fsm.support;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.etrice.core.fsm.fSM.InitialTransition;
import org.eclipse.etrice.core.fsm.fSM.ModelComponent;
import org.eclipse.etrice.core.fsm.fSM.StateGraph;
@@ -30,8 +31,10 @@ import org.eclipse.graphiti.features.ICreateFeature;
import org.eclipse.graphiti.features.IDeleteFeature;
import org.eclipse.graphiti.features.IFeatureProvider;
import org.eclipse.graphiti.features.IMoveShapeFeature;
+import org.eclipse.graphiti.features.IReason;
import org.eclipse.graphiti.features.IRemoveFeature;
import org.eclipse.graphiti.features.IResizeShapeFeature;
+import org.eclipse.graphiti.features.IUpdateFeature;
import org.eclipse.graphiti.features.context.IAddContext;
import org.eclipse.graphiti.features.context.ICreateContext;
import org.eclipse.graphiti.features.context.IDeleteContext;
@@ -39,11 +42,15 @@ import org.eclipse.graphiti.features.context.IMoveShapeContext;
import org.eclipse.graphiti.features.context.IPictogramElementContext;
import org.eclipse.graphiti.features.context.IRemoveContext;
import org.eclipse.graphiti.features.context.IResizeShapeContext;
+import org.eclipse.graphiti.features.context.IUpdateContext;
import org.eclipse.graphiti.features.context.impl.CreateConnectionContext;
+import org.eclipse.graphiti.features.context.impl.RemoveContext;
import org.eclipse.graphiti.features.impl.AbstractAddFeature;
import org.eclipse.graphiti.features.impl.AbstractCreateFeature;
+import org.eclipse.graphiti.features.impl.AbstractUpdateFeature;
import org.eclipse.graphiti.features.impl.DefaultMoveShapeFeature;
import org.eclipse.graphiti.features.impl.DefaultRemoveFeature;
+import org.eclipse.graphiti.features.impl.Reason;
import org.eclipse.graphiti.mm.algorithms.Ellipse;
import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
import org.eclipse.graphiti.mm.algorithms.Rectangle;
@@ -95,9 +102,8 @@ public class InitialPointSupport {
ContainerShape targetContainer = context.getTargetContainer();
StateGraph sg = (StateGraph) targetContainer.getLink().getBusinessObjects().get(0);
- boolean inherited = FSMSupportUtil.getInstance().isInherited(getDiagram(), sg);
- if (inherited) {
- ModelComponent mc = FSMSupportUtil.getInstance().getModelComponent(getDiagram());
+ ModelComponent mc = FSMSupportUtil.getInstance().getModelComponent(getDiagram());
+ if (!FSMSupportUtil.getInstance().isOwnedBy(mc, sg)) {
sg = ModelEditingUtil.insertRefinedState(sg, mc, targetContainer, getFeatureProvider());
}
@@ -157,7 +163,8 @@ public class InitialPointSupport {
ContainerShape sgShape = context.getTargetContainer();
StateGraph sg = (StateGraph) context.getNewObject();
- boolean inherited = FSMSupportUtil.getInstance().isInherited(getDiagram(), sg);
+ Transition initTransition = FSMSupportUtil.getInstance().getFSMHelpers().getInitTransition(sg);
+ boolean inherited = FSMSupportUtil.getInstance().isInherited(getDiagram(), initTransition);
// CONTAINER SHAPE WITH RECTANGLE
IPeCreateService peCreateService = Graphiti.getPeCreateService();
@@ -217,7 +224,8 @@ public class InitialPointSupport {
if (canMove) {
Object bo = getBusinessObjectForPictogramElement(context.getPictogramElement());
if (bo instanceof StateGraph) {
- return !FSMSupportUtil.getInstance().isInherited(getDiagram(), (StateGraph)bo);
+ Transition initTransition = FSMSupportUtil.getInstance().getFSMHelpers().getInitTransition((StateGraph) bo);
+ return !FSMSupportUtil.getInstance().isInherited(getDiagram(), initTransition);
}
return false;
}
@@ -226,6 +234,58 @@ public class InitialPointSupport {
}
}
+ private class UpdateFeature extends AbstractUpdateFeature {
+
+ public UpdateFeature(IFeatureProvider fp) {
+ super(fp);
+ }
+
+ @Override
+ public boolean canUpdate(IUpdateContext context) {
+ Object bo = getBusinessObjectForPictogramElement(context.getPictogramElement());
+ if (bo instanceof EObject && ((EObject)bo).eIsProxy())
+ return true;
+
+ return bo instanceof StateGraph;
+ }
+
+ @Override
+ public IReason updateNeeded(IUpdateContext context) {
+ Object bo = getBusinessObjectForPictogramElement(context.getPictogramElement());
+ if (bo instanceof EObject && ((EObject)bo).eIsProxy()) {
+ return Reason.createTrueReason("InitialPoint deleted from model");
+ }
+
+ return Reason.createFalseReason();
+ }
+
+ @Override
+ public boolean update(IUpdateContext context) {
+ ContainerShape containerShape = (ContainerShape)context.getPictogramElement();
+ Object bo = getBusinessObjectForPictogramElement(containerShape);
+ if (bo instanceof EObject && ((EObject)bo).eIsProxy()) {
+ IRemoveContext rc = new RemoveContext(containerShape);
+ IFeatureProvider featureProvider = getFeatureProvider();
+ IRemoveFeature removeFeature = featureProvider.getRemoveFeature(rc);
+ if (removeFeature != null) {
+ removeFeature.remove(rc);
+ }
+ EcoreUtil.delete((EObject) bo);
+ return true;
+ }
+
+ if (bo instanceof StateGraph) {
+ Transition initTransition = FSMSupportUtil.getInstance().getFSMHelpers().getInitTransition((StateGraph) bo);
+ boolean inherited = FSMSupportUtil.getInstance().isInherited(getDiagram(), initTransition);
+
+ Color dark = manageColor(inherited? INHERITED_COLOR:DARK_COLOR);
+ updateFigure(containerShape, dark, manageColor(BRIGHT_COLOR));
+ }
+ return true;
+ }
+
+ }
+
protected static class RemoveFeature extends DefaultRemoveFeature {
public RemoveFeature(IFeatureProvider fp) {
@@ -235,7 +295,8 @@ public class InitialPointSupport {
public boolean canRemove(IRemoveContext context) {
Object bo = getBusinessObjectForPictogramElement(context.getPictogramElement());
if (bo instanceof StateGraph) {
- return !FSMSupportUtil.getInstance().isInherited(getDiagram(), (StateGraph) bo);
+ Transition initTransition = FSMSupportUtil.getInstance().getFSMHelpers().getInitTransition((StateGraph) bo);
+ return !FSMSupportUtil.getInstance().isInherited(getDiagram(), initTransition);
}
return false;
}
@@ -302,6 +363,11 @@ public class InitialPointSupport {
return new DeleteFeature(fp);
}
+ @Override
+ public IUpdateFeature getUpdateFeature(IUpdateContext context) {
+ return new UpdateFeature(fp);
+ }
+
protected static void createFigure(
ContainerShape containerShape,
GraphicsAlgorithm invisibleRectangle, Color darkColor, Color brightColor) {
@@ -327,7 +393,18 @@ public class InitialPointSupport {
//containerShape.getAnchors().get(0).setReferencedGraphicsAlgorithm(rect);
}
}
-
+
+ private static void updateFigure(PictogramElement pe, Color dark, Color bright) {
+ ContainerShape container = (ContainerShape)pe;
+
+ // we clear the figure and rebuild it
+ GraphicsAlgorithm borderRect = pe.getGraphicsAlgorithm();
+ while (!borderRect.getGraphicsAlgorithmChildren().isEmpty()) {
+ EcoreUtil.delete(borderRect.getGraphicsAlgorithmChildren().get(0), true);
+ }
+
+ createFigure(container, borderRect, dark, bright);
+ }
}
private class BehaviorProvider extends DefaultToolBehaviorProvider {
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java
index 82f573889..a194ba4f4 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java
@@ -23,7 +23,6 @@ import org.eclipse.etrice.core.fsm.fSM.State;
import org.eclipse.etrice.core.fsm.fSM.StateGraph;
import org.eclipse.etrice.core.fsm.fSM.TrPoint;
import org.eclipse.etrice.core.fsm.fSM.Transition;
-import org.eclipse.etrice.ui.behavior.fsm.commands.StateGraphContext;
import org.eclipse.etrice.ui.behavior.fsm.editor.AbstractFSMEditor;
import org.eclipse.etrice.ui.behavior.fsm.editor.DecoratorUtil;
import org.eclipse.etrice.ui.behavior.fsm.support.util.DiagramEditingUtil;
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphUpdateContext.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphUpdateContext.java
index 578cf77dc..a1afa2204 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphUpdateContext.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphUpdateContext.java
@@ -12,7 +12,6 @@
package org.eclipse.etrice.ui.behavior.fsm.support;
-import org.eclipse.etrice.ui.behavior.fsm.commands.StateGraphContext;
import org.eclipse.graphiti.features.context.impl.UpdateContext;
import org.eclipse.graphiti.mm.pictograms.PictogramElement;
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java
index 319aa813d..5de5a6031 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java
@@ -16,7 +16,6 @@ import java.util.ArrayList;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.etrice.core.fsm.fSM.FSMFactory;
import org.eclipse.etrice.core.fsm.fSM.ModelComponent;
@@ -157,12 +156,11 @@ public class StateSupport {
public Object[] doCreate(ICreateContext context) {
ContainerShape targetContainer = context.getTargetContainer();
- ModelComponent ac = FSMSupportUtil.getInstance().getModelComponent(getDiagram());
+ ModelComponent mc = FSMSupportUtil.getInstance().getModelComponent(getDiagram());
StateGraph sg = (StateGraph) targetContainer.getLink().getBusinessObjects().get(0);
- boolean inherited = FSMSupportUtil.getInstance().isInherited(getDiagram(), sg);
- if (inherited) {
- sg = ModelEditingUtil.insertRefinedState(sg, ac, targetContainer, getFeatureProvider());
+ if (!FSMSupportUtil.getInstance().isOwnedBy(mc, sg)) {
+ sg = ModelEditingUtil.insertRefinedState(sg, mc, targetContainer, getFeatureProvider());
}
// create new State and add it
@@ -173,7 +171,7 @@ public class StateSupport {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
Injector injector = ((IInjectorProvider) getFeatureProvider()).getInjector();
IFSMDialogFactory factory = injector.getInstance(IFSMDialogFactory.class);
- IStatePropertyDialog dlg = factory.createStatePropertyDialog(shell, ac, s, true);
+ IStatePropertyDialog dlg = factory.createStatePropertyDialog(shell, mc, s, true);
if (dlg.open()==Window.OK) {
addGraphicalRepresentation(context, s);
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TrPointSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TrPointSupport.java
index aa1d8df9f..bd07b6f83 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TrPointSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TrPointSupport.java
@@ -147,8 +147,8 @@ public class TrPointSupport {
ContainerShape targetContainer = context.getTargetContainer();
ModelComponent mc = FSMSupportUtil.getInstance().getModelComponent(getDiagram());
StateGraph sg = (StateGraph) targetContainer.getLink().getBusinessObjects().get(0);
- boolean inherited = FSMSupportUtil.getInstance().isInherited(getDiagram(), sg);
- if (inherited) {
+
+ if (!FSMSupportUtil.getInstance().isOwnedBy(mc, sg)) {
sg = ModelEditingUtil.insertRefinedState(sg, mc, targetContainer, getFeatureProvider());
}
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java
index cc917e15d..15eb09e6b 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java
@@ -269,8 +269,7 @@ public class TransitionSupport {
}
ContainerShape targetContainer = FSMSupportUtil.getInstance().getStateGraphContainer((ContainerShape) context.getSourcePictogramElement().eContainer());
- boolean inherited = FSMSupportUtil.getInstance().isInherited(getDiagram(), sg);
- if (inherited) {
+ if (!FSMSupportUtil.getInstance().isOwnedBy(mc, sg)) {
sg = ModelEditingUtil.insertRefinedState(sg, mc, targetContainer, getFeatureProvider());
}
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramEditingUtil.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramEditingUtil.java
index d9315526d..faadabd60 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramEditingUtil.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramEditingUtil.java
@@ -41,15 +41,14 @@ import org.eclipse.etrice.core.fsm.fSM.TrPointTerminal;
import org.eclipse.etrice.core.fsm.fSM.Transition;
import org.eclipse.etrice.core.fsm.fSM.TransitionTerminal;
import org.eclipse.etrice.core.fsm.naming.FSMNameProvider;
-import org.eclipse.etrice.ui.behavior.fsm.commands.StateGraphContext;
import org.eclipse.etrice.ui.behavior.fsm.support.ContextSwitcher;
import org.eclipse.etrice.ui.behavior.fsm.support.IPositionProvider;
-import org.eclipse.etrice.ui.behavior.fsm.support.StateGraphSupport;
-import org.eclipse.etrice.ui.behavior.fsm.support.StateSupport;
-import org.eclipse.etrice.ui.behavior.fsm.support.TrPointSupport;
import org.eclipse.etrice.ui.behavior.fsm.support.IPositionProvider.Pos;
import org.eclipse.etrice.ui.behavior.fsm.support.IPositionProvider.PosAndSize;
import org.eclipse.etrice.ui.behavior.fsm.support.IStateGraphContext;
+import org.eclipse.etrice.ui.behavior.fsm.support.StateGraphSupport;
+import org.eclipse.etrice.ui.behavior.fsm.support.StateSupport;
+import org.eclipse.etrice.ui.behavior.fsm.support.TrPointSupport;
import org.eclipse.etrice.ui.common.base.support.CommonSupportUtil;
import org.eclipse.graphiti.datatypes.ILocation;
import org.eclipse.graphiti.features.IFeatureProvider;
@@ -185,17 +184,21 @@ public class DiagramEditingUtil {
if (bo instanceof StateGraph)
present = ch;
}
- if(present != null)
+ if(present != null) {
node2anchor.put(INITIAL, present.getAnchors().get(0));
+ }
// exists in model ?
StateGraph expected = ctx.getInitialPoint();
- if(expected == null)
+ if(expected == null) {
// exists in (super class) diagram ?
expected = ctx.getPositionProvider().getInitialPoint(ctx.getStateGraph());
- if(expected != null && present == null)
+ }
+ if(expected != null && present == null) {
addInitialPointIff(ctx, ctx.getPositionProvider(), sgShape, fp, node2anchor);
- else
+ }
+ else {
updateInitialPoint(present, ctx.getPositionProvider(), fp);
+ }
}
// transitions
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramExtensions.xtend b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramExtensions.xtend
index 4481b6fb3..6905d6821 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramExtensions.xtend
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramExtensions.xtend
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/FSMSupportUtil.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/FSMSupportUtil.java
index 8ccf50015..d283a8b1a 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/FSMSupportUtil.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/FSMSupportUtil.java
@@ -106,7 +106,11 @@ public class FSMSupportUtil {
}
public boolean isInherited(Diagram diag, EObject obj) {
- if(obj instanceof StateGraph)
+ return isInherited(getModelComponent(diag), obj);
+ }
+
+ public boolean isInherited(ModelComponent mc, EObject obj) {
+ if (obj instanceof StateGraph)
obj = obj.eContainer();
else if (obj instanceof ModelComponent)
// the next line states: if a ModelComponent has no base class, then it is not inherited.
@@ -115,7 +119,15 @@ public class FSMSupportUtil {
// However, this method isn't called with an obj instanceof ModelComponent
return ((ModelComponent) obj).getBase() != null;
- return obj instanceof RefinedState || obj instanceof RefinedTransition || !EcoreUtil.isAncestor(getModelComponent(diag), obj);
+ return obj instanceof RefinedState || obj instanceof RefinedTransition || !EcoreUtil.isAncestor(mc, obj);
+ }
+
+ public boolean isOwnedBy(Diagram diag, EObject obj) {
+ return isOwnedBy(getModelComponent(diag), obj);
+ }
+
+ public boolean isOwnedBy(ModelComponent mc, EObject obj) {
+ return EcoreUtil.isAncestor(mc, obj);
}
public boolean showAsInherited(Diagram diag, State obj) {
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.xtend b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.xtend
index 003a040ef..c80c570fe 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.xtend
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.xtend
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/provider/BaseDiagramProvider.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/provider/BaseDiagramProvider.java
index 0c2eae0a5..b66cfeb7e 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/provider/BaseDiagramProvider.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/provider/BaseDiagramProvider.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -19,8 +19,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -39,8 +37,10 @@ import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.ListExtensions;
+import org.eclipse.xtext.xbase.lib.MapExtensions;
import org.eclipse.xtext.xbase.lib.ObjectExtensions;
import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+import org.eclipse.xtext.xbase.lib.Procedures.Procedure2;
/**
* Provides the {@linkplain PictogramElement} objects of the base class diagram.
@@ -75,16 +75,16 @@ public class BaseDiagramProvider {
};
final ArrayList<ModelComponent> baseClasses = ObjectExtensions.<ArrayList<ModelComponent>>operator_doubleArrow(_newArrayList, _function);
List<ModelComponent> _reverseView = ListExtensions.<ModelComponent>reverseView(baseClasses);
- final Consumer<ModelComponent> _function_1 = new Consumer<ModelComponent>() {
+ final Procedure1<ModelComponent> _function_1 = new Procedure1<ModelComponent>() {
@Override
- public void accept(final ModelComponent base) {
+ public void apply(final ModelComponent base) {
final Diagram baseDiagram = diagramAccess.getDiagram(base, rs);
boolean _notEquals = (!Objects.equal(baseDiagram, null));
if (_notEquals) {
Map<EObject, Collection<EStructuralFeature.Setting>> _find = EcoreUtil.ExternalCrossReferencer.find(baseDiagram);
- final BiConsumer<EObject, Collection<EStructuralFeature.Setting>> _function = new BiConsumer<EObject, Collection<EStructuralFeature.Setting>>() {
+ final Procedure2<EObject, Collection<EStructuralFeature.Setting>> _function = new Procedure2<EObject, Collection<EStructuralFeature.Setting>>() {
@Override
- public void accept(final EObject targetEObj, final Collection<EStructuralFeature.Setting> eFeatureSetting) {
+ public void apply(final EObject targetEObj, final Collection<EStructuralFeature.Setting> eFeatureSetting) {
final Function1<EStructuralFeature.Setting, EObject> _function = new Function1<EStructuralFeature.Setting, EObject>() {
@Override
public EObject apply(final EStructuralFeature.Setting it) {
@@ -100,23 +100,23 @@ public class BaseDiagramProvider {
}
};
Iterable<PictogramElement> _map_1 = IterableExtensions.<PictogramLink, PictogramElement>map(_filter, _function_1);
- final Consumer<PictogramElement> _function_2 = new Consumer<PictogramElement>() {
+ final Procedure1<PictogramElement> _function_2 = new Procedure1<PictogramElement>() {
@Override
- public void accept(final PictogramElement pe) {
+ public void apply(final PictogramElement pe) {
BaseDiagramProvider.this.baseDiagramBusinessObjs.put(targetEObj, pe);
}
};
- _map_1.forEach(_function_2);
+ IterableExtensions.<PictogramElement>forEach(_map_1, _function_2);
}
};
- _find.forEach(_function);
+ MapExtensions.<EObject, Collection<EStructuralFeature.Setting>>forEach(_find, _function);
EList<Resource> _resources = rs.getResources();
Resource _eResource = baseDiagram.eResource();
_resources.remove(_eResource);
}
}
};
- _reverseView.forEach(_function_1);
+ IterableExtensions.<ModelComponent>forEach(_reverseView, _function_1);
}
public Collection<PictogramElement> getPictograms(final EObject roomObj) {
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramExtensions.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramExtensions.java
index bb3e077d6..cc8253a14 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramExtensions.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/support/util/DiagramExtensions.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.java
index 804a112f8..181c87a3d 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/xtend-gen/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/DefaultDetailExpressionProvider.java b/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/DefaultDetailExpressionProvider.java
index 35662a4d8..81e83705e 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/DefaultDetailExpressionProvider.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/DefaultDetailExpressionProvider.java
@@ -13,7 +13,6 @@ package org.eclipse.etrice.ui.behavior.detailcode;
import com.google.common.base.Objects;
import com.google.common.collect.Iterables;
import java.util.List;
-import java.util.function.Consumer;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.Attribute;
import org.eclipse.etrice.core.room.CommunicationType;
@@ -33,7 +32,9 @@ import org.eclipse.etrice.ui.behavior.fsm.detailcode.IDetailExpressionProvider;
import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.ListExtensions;
+import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
/**
* Defines expression for fsm detail code of an ActorClass
@@ -50,9 +51,9 @@ public class DefaultDetailExpressionProvider extends GuardDetailExpressionProvid
scope.add(_createExprFeature);
}
List<InterfaceItem> _allInterfaceItems = this.roomHelpers.getAllInterfaceItems(this.actorClass);
- final Consumer<InterfaceItem> _function = new Consumer<InterfaceItem>() {
+ final Procedure1<InterfaceItem> _function = new Procedure1<InterfaceItem>() {
@Override
- public void accept(final InterfaceItem it) {
+ public void apply(final InterfaceItem it) {
boolean _matched = false;
if (it instanceof SPP) {
boolean _isEventDriven = ((SPP)it).isEventDriven();
@@ -96,7 +97,7 @@ public class DefaultDetailExpressionProvider extends GuardDetailExpressionProvid
}
}
};
- _allInterfaceItems.forEach(_function);
+ IterableExtensions.<InterfaceItem>forEach(_allInterfaceItems, _function);
List<StandardOperation> _latestOperations = this.roomHelpers.getLatestOperations(this.actorClass);
final Function1<StandardOperation, IDetailExpressionProvider.ExpressionFeature> _function_1 = new Function1<StandardOperation, IDetailExpressionProvider.ExpressionFeature>() {
@Override
diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/DiagramEditorBase.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/DiagramEditorBase.java
index d2199e72e..f2b2b7b15 100644
--- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/DiagramEditorBase.java
+++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/DiagramEditorBase.java
@@ -96,12 +96,16 @@ public abstract class DiagramEditorBase extends DiagramEditor implements IInputU
*/
@Override
public void setFocus() {
+ if (getGraphicalViewer() == null) {
+ return;
+ }
+
boolean dirtyAlready = isDirty();
// inside this call auto refresh will happen if (and turn the editor dirty)
super.setFocus();
- if (superClassListener.isChangeInSuperClass())
+ if (superClassListener != null && superClassListener.isChangeInSuperClass())
superClassChanged();
if (!dirtyAlready && isDirty())
@@ -126,8 +130,10 @@ public abstract class DiagramEditorBase extends DiagramEditor implements IInputU
public void dispose() {
mte.unsetTarget(getEditingDomain());
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().removePartListener(superClassListener);
- superClassListener.dispose();
+ if(superClassListener != null) {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().removePartListener(superClassListener);
+ superClassListener.dispose();
+ }
super.dispose();
}
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip
index 933eecc4c..2403927c8 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.java.zip
index 3ebad3b6f..8bdbedd83 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.java.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
index 9f1931419..acd65a076 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip
index 720433703..017f52788 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
index 4cd106974..54aeb6026 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
index fc3288043..8339a3b84 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip
index 5c29c8962..923cc8ae5 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
index de7a68a66..8dc4013a3 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip
index 9ef755850..012a9cf0f 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.cpp.zip
index 3b50ea080..ce50ba113 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.cpp.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.cpp.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
index d9845f56a..109abc24e 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.cpp.zip
index a64158a5f..c90c4c306 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.cpp.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.cpp.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
index dae04f108..42a8c53c3 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
Binary files differ

Back to the top