Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/PostprocessingHelpers.java24
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java68
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java316
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java24
-rw-r--r--plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java60
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java88
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java40
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.java20
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java64
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java10
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java98
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorFactoryGen.java30
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java12
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java86
-rw-r--r--plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java4
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java2
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java44
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java86
-rw-r--r--runtime/org.eclipse.etrice.runtime.java.aspects/dist/org.eclipse.etrice.runtime.java.aspects.jarbin8085 -> 8092 bytes
-rw-r--r--tests/org.eclipse.etrice.runtime.c.tests/.cproject24
27 files changed, 562 insertions, 560 deletions
diff --git a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/PostprocessingHelpers.java b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/PostprocessingHelpers.java
index fa82f66e4..8ac9c2624 100644
--- a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/PostprocessingHelpers.java
+++ b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/PostprocessingHelpers.java
@@ -45,12 +45,12 @@ public class PostprocessingHelpers {
public static EAttribute getAttribute(final EClass cls, final String name) {
EList<EAttribute> _eAllAttributes = cls.getEAllAttributes();
final Function1<EAttribute,Boolean> _function = new Function1<EAttribute,Boolean>() {
- public Boolean apply(final EAttribute a) {
- String _name = a.getName();
- boolean _equals = _name.equals(name);
- return Boolean.valueOf(_equals);
- }
- };
+ public Boolean apply(final EAttribute a) {
+ String _name = a.getName();
+ boolean _equals = _name.equals(name);
+ return Boolean.valueOf(_equals);
+ }
+ };
EAttribute _findFirst = IterableExtensions.<EAttribute>findFirst(_eAllAttributes, _function);
return _findFirst;
}
@@ -58,12 +58,12 @@ public class PostprocessingHelpers {
public static EReference getReference(final EClass cls, final String name) {
EList<EReference> _eAllReferences = cls.getEAllReferences();
final Function1<EReference,Boolean> _function = new Function1<EReference,Boolean>() {
- public Boolean apply(final EReference a) {
- String _name = a.getName();
- boolean _equals = _name.equals(name);
- return Boolean.valueOf(_equals);
- }
- };
+ public Boolean apply(final EReference a) {
+ String _name = a.getName();
+ boolean _equals = _name.equals(name);
+ return Boolean.valueOf(_equals);
+ }
+ };
EReference _findFirst = IterableExtensions.<EReference>findFirst(_eAllReferences, _function);
return _findFirst;
}
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
index ca119f084..44959c09f 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
@@ -119,48 +119,48 @@ public class ActorClassGen extends GenericActorClassGenerator {
final ActorClass ac = xpac.getActorClass();
List<Port> _allEndPorts = RoomHelpers.getAllEndPorts(ac);
final Function1<Port,Boolean> _function = new Function1<Port,Boolean>() {
- public Boolean apply(final Port p) {
- GeneralProtocolClass _protocol = p.getProtocol();
- CommunicationType _commType = ((ProtocolClass) _protocol).getCommType();
- boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
- return Boolean.valueOf(_equals);
- }
- };
+ public Boolean apply(final Port p) {
+ GeneralProtocolClass _protocol = p.getProtocol();
+ CommunicationType _commType = ((ProtocolClass) _protocol).getCommType();
+ boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
+ return Boolean.valueOf(_equals);
+ }
+ };
final Iterable<Port> eventPorts = IterableExtensions.<Port>filter(_allEndPorts, _function);
List<Port> _allEndPorts_1 = RoomHelpers.getAllEndPorts(ac);
final Function1<Port,Boolean> _function_1 = new Function1<Port,Boolean>() {
- public Boolean apply(final Port p) {
- boolean _and = false;
- GeneralProtocolClass _protocol = p.getProtocol();
- CommunicationType _commType = ((ProtocolClass) _protocol).getCommType();
- boolean _equals = Objects.equal(_commType, CommunicationType.DATA_DRIVEN);
- if (!_equals) {
- _and = false;
- } else {
- boolean _isConjugated = p.isConjugated();
- _and = (_equals && _isConjugated);
+ public Boolean apply(final Port p) {
+ boolean _and = false;
+ GeneralProtocolClass _protocol = p.getProtocol();
+ CommunicationType _commType = ((ProtocolClass) _protocol).getCommType();
+ boolean _equals = Objects.equal(_commType, CommunicationType.DATA_DRIVEN);
+ if (!_equals) {
+ _and = false;
+ } else {
+ boolean _isConjugated = p.isConjugated();
+ _and = (_equals && _isConjugated);
+ }
+ return Boolean.valueOf(_and);
}
- return Boolean.valueOf(_and);
- }
- };
+ };
final Iterable<Port> sendPorts = IterableExtensions.<Port>filter(_allEndPorts_1, _function_1);
List<Port> _allEndPorts_2 = RoomHelpers.getAllEndPorts(ac);
final Function1<Port,Boolean> _function_2 = new Function1<Port,Boolean>() {
- public Boolean apply(final Port p) {
- boolean _and = false;
- GeneralProtocolClass _protocol = p.getProtocol();
- CommunicationType _commType = ((ProtocolClass) _protocol).getCommType();
- boolean _equals = Objects.equal(_commType, CommunicationType.DATA_DRIVEN);
- if (!_equals) {
- _and = false;
- } else {
- boolean _isConjugated = p.isConjugated();
- boolean _not = (!_isConjugated);
- _and = (_equals && _not);
+ public Boolean apply(final Port p) {
+ boolean _and = false;
+ GeneralProtocolClass _protocol = p.getProtocol();
+ CommunicationType _commType = ((ProtocolClass) _protocol).getCommType();
+ boolean _equals = Objects.equal(_commType, CommunicationType.DATA_DRIVEN);
+ if (!_equals) {
+ _and = false;
+ } else {
+ boolean _isConjugated = p.isConjugated();
+ boolean _not = (!_isConjugated);
+ _and = (_equals && _not);
+ }
+ return Boolean.valueOf(_and);
}
- return Boolean.valueOf(_and);
- }
- };
+ };
final Iterable<Port> recvPorts = IterableExtensions.<Port>filter(_allEndPorts_2, _function_2);
ActorCommunicationType _commType = ac.getCommType();
final boolean dataDriven = Objects.equal(_commType, ActorCommunicationType.DATA_DRIVEN);
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
index 65415500d..ed9780851 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
@@ -243,7 +243,7 @@ public class CExtensions implements ILanguageExtension {
_builder.newLineIfNotEmpty();
{
boolean _hasElements = false;
- for(final Pair<String, String> entry : entries) {
+ for(final Pair<String,String> entry : entries) {
if (!_hasElements) {
_hasElements = true;
} else {
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java
index 61fd23fdb..8050dee91 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java
@@ -128,13 +128,13 @@ public class NodeGen {
{
EList<ActorInstance> _allContainedInstances = ssi.getAllContainedInstances();
final Function1<ActorInstance,Boolean> _function = new Function1<ActorInstance,Boolean>() {
- public Boolean apply(final ActorInstance ai) {
- MappedThread _mappedThread = ETMapUtil.getMappedThread(ai);
- PhysicalThread _thread = _mappedThread.getThread();
- boolean _equals = Objects.equal(_thread, thread);
- return Boolean.valueOf(_equals);
- }
- };
+ public Boolean apply(final ActorInstance ai) {
+ MappedThread _mappedThread = ETMapUtil.getMappedThread(ai);
+ PhysicalThread _thread = _mappedThread.getThread();
+ boolean _equals = Objects.equal(_thread, thread);
+ return Boolean.valueOf(_equals);
+ }
+ };
final Iterable<ActorInstance> instancesOnThread = IterableExtensions.<ActorInstance>filter(_allContainedInstances, _function);
boolean _isEmpty = IterableExtensions.isEmpty(instancesOnThread);
boolean _not = (!_isEmpty);
@@ -272,11 +272,11 @@ public class NodeGen {
NodeClass _type = nr.getType();
EList<PhysicalThread> _threads = _type.getThreads();
final Function1<PhysicalThread,Boolean> _function = new Function1<PhysicalThread,Boolean>() {
- public Boolean apply(final PhysicalThread t) {
- boolean _contains = usedThreads.contains(t);
- return Boolean.valueOf(_contains);
- }
- };
+ public Boolean apply(final PhysicalThread t) {
+ boolean _contains = usedThreads.contains(t);
+ return Boolean.valueOf(_contains);
+ }
+ };
final Iterable<PhysicalThread> threads = IterableExtensions.<PhysicalThread>filter(_threads, _function);
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
@@ -783,11 +783,11 @@ public class NodeGen {
ActorClass _actorClass = ai.getActorClass();
EList<StandardOperation> _operations = _actorClass.getOperations();
final Function1<StandardOperation,Boolean> _function_1 = new Function1<StandardOperation,Boolean>() {
- public Boolean apply(final StandardOperation op) {
- boolean _isDestructor = op.isDestructor();
- return Boolean.valueOf(_isDestructor);
- }
- };
+ public Boolean apply(final StandardOperation op) {
+ boolean _isDestructor = op.isDestructor();
+ return Boolean.valueOf(_isDestructor);
+ }
+ };
Iterable<StandardOperation> _filter = IterableExtensions.<StandardOperation>filter(_operations, _function_1);
boolean _isEmpty = IterableExtensions.isEmpty(_filter);
boolean _not = (!_isEmpty);
@@ -871,11 +871,11 @@ public class NodeGen {
ActorClass _actorClass_3 = ai_1.getActorClass();
EList<StandardOperation> _operations_1 = _actorClass_3.getOperations();
final Function1<StandardOperation,Boolean> _function_2 = new Function1<StandardOperation,Boolean>() {
- public Boolean apply(final StandardOperation op) {
- boolean _isConstructor = RoomHelpers.isConstructor(op);
- return Boolean.valueOf(_isConstructor);
- }
- };
+ public Boolean apply(final StandardOperation op) {
+ boolean _isConstructor = RoomHelpers.isConstructor(op);
+ return Boolean.valueOf(_isConstructor);
+ }
+ };
Iterable<StandardOperation> _filter_1 = IterableExtensions.<StandardOperation>filter(_operations_1, _function_2);
boolean _isEmpty_1 = IterableExtensions.isEmpty(_filter_1);
boolean _not_1 = (!_isEmpty_1);
@@ -1010,11 +1010,11 @@ public class NodeGen {
NodeClass _type = nr.getType();
EList<PhysicalThread> _threads = _type.getThreads();
final Function1<PhysicalThread,Boolean> _function = new Function1<PhysicalThread,Boolean>() {
- public Boolean apply(final PhysicalThread t) {
- boolean _contains = usedThreads.contains(t);
- return Boolean.valueOf(_contains);
- }
- };
+ public Boolean apply(final PhysicalThread t) {
+ boolean _contains = usedThreads.contains(t);
+ return Boolean.valueOf(_contains);
+ }
+ };
Iterable<PhysicalThread> _filter = IterableExtensions.<PhysicalThread>filter(_threads, _function);
for(final PhysicalThread thread : _filter) {
_builder.append("/* ");
@@ -1220,110 +1220,110 @@ public class NodeGen {
final ArrayList<InterfaceItemInstance> replEventItems = _arrayList;
EList<InterfaceItemInstance> _orderedIfItemInstances = ai.getOrderedIfItemInstances();
final Function1<InterfaceItemInstance,Boolean> _function = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance e) {
- boolean _isReplicated = e.isReplicated();
- return Boolean.valueOf(_isReplicated);
- }
- };
+ public Boolean apply(final InterfaceItemInstance e) {
+ boolean _isReplicated = e.isReplicated();
+ return Boolean.valueOf(_isReplicated);
+ }
+ };
Iterable<InterfaceItemInstance> _filter = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances, _function);
Iterables.<InterfaceItemInstance>addAll(replEventItems, _filter);
final Function1<InterfaceItemInstance,Boolean> _function_1 = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance e) {
- EList<InterfaceItemInstance> _peers = e.getPeers();
- boolean _isEmpty = _peers.isEmpty();
- boolean _not = (!_isEmpty);
- return Boolean.valueOf(_not);
- }
- };
+ public Boolean apply(final InterfaceItemInstance e) {
+ EList<InterfaceItemInstance> _peers = e.getPeers();
+ boolean _isEmpty = _peers.isEmpty();
+ boolean _not = (!_isEmpty);
+ return Boolean.valueOf(_not);
+ }
+ };
InterfaceItemInstance _findFirst = IterableExtensions.<InterfaceItemInstance>findFirst(replEventItems, _function_1);
final boolean haveReplSubItems = (!Objects.equal(_findFirst, null));
final Function1<InterfaceItemInstance,Boolean> _function_2 = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance i) {
- InterfaceItem _interfaceItem = i.getInterfaceItem();
- return Boolean.valueOf((_interfaceItem instanceof Port));
- }
- };
+ public Boolean apply(final InterfaceItemInstance i) {
+ InterfaceItem _interfaceItem = i.getInterfaceItem();
+ return Boolean.valueOf((_interfaceItem instanceof Port));
+ }
+ };
final Iterable<InterfaceItemInstance> replEventPorts = IterableExtensions.<InterfaceItemInstance>filter(replEventItems, _function_2);
final Function1<InterfaceItemInstance,Boolean> _function_3 = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance i) {
- InterfaceItem _interfaceItem = i.getInterfaceItem();
- return Boolean.valueOf((_interfaceItem instanceof SPP));
- }
- };
+ public Boolean apply(final InterfaceItemInstance i) {
+ InterfaceItem _interfaceItem = i.getInterfaceItem();
+ return Boolean.valueOf((_interfaceItem instanceof SPP));
+ }
+ };
final Iterable<InterfaceItemInstance> replEventSPPs = IterableExtensions.<InterfaceItemInstance>filter(replEventItems, _function_3);
EList<InterfaceItemInstance> _orderedIfItemInstances_1 = ai.getOrderedIfItemInstances();
final Function1<InterfaceItemInstance,Boolean> _function_4 = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance e) {
- boolean _isSimple = e.isSimple();
- return Boolean.valueOf(_isSimple);
- }
- };
+ public Boolean apply(final InterfaceItemInstance e) {
+ boolean _isSimple = e.isSimple();
+ return Boolean.valueOf(_isSimple);
+ }
+ };
final Iterable<InterfaceItemInstance> simplePorts = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances_1, _function_4);
ArrayList<InterfaceItemInstance> _arrayList_1 = new ArrayList<InterfaceItemInstance>();
final ArrayList<InterfaceItemInstance> simpleEventItems = _arrayList_1;
final Function1<InterfaceItemInstance,Boolean> _function_5 = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance p) {
- ProtocolClass _protocol = p.getProtocol();
- CommunicationType _commType = _protocol.getCommType();
- boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
- return Boolean.valueOf(_equals);
- }
- };
+ public Boolean apply(final InterfaceItemInstance p) {
+ ProtocolClass _protocol = p.getProtocol();
+ CommunicationType _commType = _protocol.getCommType();
+ boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
+ return Boolean.valueOf(_equals);
+ }
+ };
Iterable<InterfaceItemInstance> _filter_1 = IterableExtensions.<InterfaceItemInstance>filter(simplePorts, _function_5);
Iterables.<InterfaceItemInstance>addAll(simpleEventItems, _filter_1);
final Function1<InterfaceItemInstance,Boolean> _function_6 = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance i) {
- InterfaceItem _interfaceItem = i.getInterfaceItem();
- return Boolean.valueOf((_interfaceItem instanceof Port));
- }
- };
+ public Boolean apply(final InterfaceItemInstance i) {
+ InterfaceItem _interfaceItem = i.getInterfaceItem();
+ return Boolean.valueOf((_interfaceItem instanceof Port));
+ }
+ };
final Iterable<InterfaceItemInstance> simpleEventPorts = IterableExtensions.<InterfaceItemInstance>filter(simpleEventItems, _function_6);
final Function1<InterfaceItemInstance,Boolean> _function_7 = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance i) {
- InterfaceItem _interfaceItem = i.getInterfaceItem();
- return Boolean.valueOf((_interfaceItem instanceof SAP));
- }
- };
+ public Boolean apply(final InterfaceItemInstance i) {
+ InterfaceItem _interfaceItem = i.getInterfaceItem();
+ return Boolean.valueOf((_interfaceItem instanceof SAP));
+ }
+ };
final Iterable<InterfaceItemInstance> simpleEventSAPs = IterableExtensions.<InterfaceItemInstance>filter(simpleEventItems, _function_7);
final Function1<InterfaceItemInstance,Boolean> _function_8 = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance p) {
- ProtocolClass _protocol = p.getProtocol();
- CommunicationType _commType = _protocol.getCommType();
- boolean _equals = Objects.equal(_commType, CommunicationType.DATA_DRIVEN);
- return Boolean.valueOf(_equals);
- }
- };
+ public Boolean apply(final InterfaceItemInstance p) {
+ ProtocolClass _protocol = p.getProtocol();
+ CommunicationType _commType = _protocol.getCommType();
+ boolean _equals = Objects.equal(_commType, CommunicationType.DATA_DRIVEN);
+ return Boolean.valueOf(_equals);
+ }
+ };
final Iterable<InterfaceItemInstance> dataPorts = IterableExtensions.<InterfaceItemInstance>filter(simplePorts, _function_8);
final Function1<InterfaceItemInstance,Boolean> _function_9 = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance p) {
- boolean _and = false;
- if (!(p instanceof PortInstance)) {
- _and = false;
- } else {
- Port _port = ((PortInstance) p).getPort();
- boolean _isConjugated = _port.isConjugated();
- boolean _not = (!_isConjugated);
- _and = ((p instanceof PortInstance) && _not);
+ public Boolean apply(final InterfaceItemInstance p) {
+ boolean _and = false;
+ if (!(p instanceof PortInstance)) {
+ _and = false;
+ } else {
+ Port _port = ((PortInstance) p).getPort();
+ boolean _isConjugated = _port.isConjugated();
+ boolean _not = (!_isConjugated);
+ _and = ((p instanceof PortInstance) && _not);
+ }
+ return Boolean.valueOf(_and);
}
- return Boolean.valueOf(_and);
- }
- };
+ };
final Iterable<InterfaceItemInstance> recvPorts = IterableExtensions.<InterfaceItemInstance>filter(dataPorts, _function_9);
final Function1<InterfaceItemInstance,Boolean> _function_10 = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance p) {
- boolean _and = false;
- if (!(p instanceof PortInstance)) {
- _and = false;
- } else {
- Port _port = ((PortInstance) p).getPort();
- boolean _isConjugated = _port.isConjugated();
- _and = ((p instanceof PortInstance) && _isConjugated);
+ public Boolean apply(final InterfaceItemInstance p) {
+ boolean _and = false;
+ if (!(p instanceof PortInstance)) {
+ _and = false;
+ } else {
+ Port _port = ((PortInstance) p).getPort();
+ boolean _isConjugated = _port.isConjugated();
+ _and = ((p instanceof PortInstance) && _isConjugated);
+ }
+ return Boolean.valueOf(_and);
}
- return Boolean.valueOf(_and);
- }
- };
+ };
final Iterable<InterfaceItemInstance> sendPorts = IterableExtensions.<InterfaceItemInstance>filter(dataPorts, _function_10);
- HashMap<InterfaceItemInstance,Integer> _hashMap = new HashMap<InterfaceItemInstance, Integer>();
+ HashMap<InterfaceItemInstance,Integer> _hashMap = new HashMap<InterfaceItemInstance,Integer>();
final HashMap<InterfaceItemInstance,Integer> offsets = _hashMap;
int offset = 0;
for (final InterfaceItemInstance p : replEventItems) {
@@ -1386,13 +1386,13 @@ public class NodeGen {
_builder.newLine();
{
final Function1<InterfaceItemInstance,Boolean> _function_11 = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance e) {
- EList<InterfaceItemInstance> _peers = e.getPeers();
- boolean _isEmpty = _peers.isEmpty();
- boolean _not = (!_isEmpty);
- return Boolean.valueOf(_not);
- }
- };
+ public Boolean apply(final InterfaceItemInstance e) {
+ EList<InterfaceItemInstance> _peers = e.getPeers();
+ boolean _isEmpty = _peers.isEmpty();
+ boolean _not = (!_isEmpty);
+ return Boolean.valueOf(_not);
+ }
+ };
Iterable<InterfaceItemInstance> _filter_2 = IterableExtensions.<InterfaceItemInstance>filter(replEventItems, _function_11);
boolean _hasElements = false;
for(final InterfaceItemInstance pi : _filter_2) {
@@ -1909,11 +1909,11 @@ public class NodeGen {
NodeClass _type = nr.getType();
EList<PhysicalThread> _threads = _type.getThreads();
final Function1<PhysicalThread,Boolean> _function = new Function1<PhysicalThread,Boolean>() {
- public Boolean apply(final PhysicalThread t) {
- boolean _contains = usedThreads.contains(t);
- return Boolean.valueOf(_contains);
- }
- };
+ public Boolean apply(final PhysicalThread t) {
+ boolean _contains = usedThreads.contains(t);
+ return Boolean.valueOf(_contains);
+ }
+ };
Iterable<PhysicalThread> _filter = IterableExtensions.<PhysicalThread>filter(_threads, _function);
boolean _hasElements = false;
for(final PhysicalThread thread : _filter) {
@@ -1924,51 +1924,51 @@ public class NodeGen {
}
EList<ActorInstance> _allContainedInstances = ssi.getAllContainedInstances();
final Function1<ActorInstance,Boolean> _function_1 = new Function1<ActorInstance,Boolean>() {
- public Boolean apply(final ActorInstance ai) {
- MappedThread _mappedThread = ETMapUtil.getMappedThread(ai);
- PhysicalThread _thread = _mappedThread.getThread();
- boolean _equals = Objects.equal(_thread, thread);
- return Boolean.valueOf(_equals);
- }
- };
+ public Boolean apply(final ActorInstance ai) {
+ MappedThread _mappedThread = ETMapUtil.getMappedThread(ai);
+ PhysicalThread _thread = _mappedThread.getThread();
+ boolean _equals = Objects.equal(_thread, thread);
+ return Boolean.valueOf(_equals);
+ }
+ };
final Iterable<ActorInstance> instancesOnThread = IterableExtensions.<ActorInstance>filter(_allContainedInstances, _function_1);
_builder.newLineIfNotEmpty();
final Function1<ActorInstance,Boolean> _function_2 = new Function1<ActorInstance,Boolean>() {
- public Boolean apply(final ActorInstance ai) {
- boolean _or = false;
- ActorClass _actorClass = ai.getActorClass();
- ActorCommunicationType _commType = _actorClass.getCommType();
- boolean _equals = Objects.equal(_commType, ActorCommunicationType.EVENT_DRIVEN);
- if (_equals) {
- _or = true;
- } else {
- ActorClass _actorClass_1 = ai.getActorClass();
- ActorCommunicationType _commType_1 = _actorClass_1.getCommType();
- boolean _equals_1 = Objects.equal(_commType_1, ActorCommunicationType.ASYNCHRONOUS);
- _or = (_equals || _equals_1);
+ public Boolean apply(final ActorInstance ai) {
+ boolean _or = false;
+ ActorClass _actorClass = ai.getActorClass();
+ ActorCommunicationType _commType = _actorClass.getCommType();
+ boolean _equals = Objects.equal(_commType, ActorCommunicationType.EVENT_DRIVEN);
+ if (_equals) {
+ _or = true;
+ } else {
+ ActorClass _actorClass_1 = ai.getActorClass();
+ ActorCommunicationType _commType_1 = _actorClass_1.getCommType();
+ boolean _equals_1 = Objects.equal(_commType_1, ActorCommunicationType.ASYNCHRONOUS);
+ _or = (_equals || _equals_1);
+ }
+ return Boolean.valueOf(_or);
}
- return Boolean.valueOf(_or);
- }
- };
+ };
final Iterable<ActorInstance> dispatchedInstances = IterableExtensions.<ActorInstance>filter(instancesOnThread, _function_2);
_builder.newLineIfNotEmpty();
final Function1<ActorInstance,Boolean> _function_3 = new Function1<ActorInstance,Boolean>() {
- public Boolean apply(final ActorInstance ai) {
- boolean _or = false;
- ActorClass _actorClass = ai.getActorClass();
- ActorCommunicationType _commType = _actorClass.getCommType();
- boolean _equals = Objects.equal(_commType, ActorCommunicationType.DATA_DRIVEN);
- if (_equals) {
- _or = true;
- } else {
- ActorClass _actorClass_1 = ai.getActorClass();
- ActorCommunicationType _commType_1 = _actorClass_1.getCommType();
- boolean _equals_1 = Objects.equal(_commType_1, ActorCommunicationType.ASYNCHRONOUS);
- _or = (_equals || _equals_1);
+ public Boolean apply(final ActorInstance ai) {
+ boolean _or = false;
+ ActorClass _actorClass = ai.getActorClass();
+ ActorCommunicationType _commType = _actorClass.getCommType();
+ boolean _equals = Objects.equal(_commType, ActorCommunicationType.DATA_DRIVEN);
+ if (_equals) {
+ _or = true;
+ } else {
+ ActorClass _actorClass_1 = ai.getActorClass();
+ ActorCommunicationType _commType_1 = _actorClass_1.getCommType();
+ boolean _equals_1 = Objects.equal(_commType_1, ActorCommunicationType.ASYNCHRONOUS);
+ _or = (_equals || _equals_1);
+ }
+ return Boolean.valueOf(_or);
}
- return Boolean.valueOf(_or);
- }
- };
+ };
final Iterable<ActorInstance> executedInstances = IterableExtensions.<ActorInstance>filter(instancesOnThread, _function_3);
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -2091,13 +2091,13 @@ public class NodeGen {
{
EList<InterfaceItemInstance> _orderedIfItemInstances = ai_1.getOrderedIfItemInstances();
final Function1<InterfaceItemInstance,Boolean> _function_4 = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance p) {
- ProtocolClass _protocol = p.getProtocol();
- CommunicationType _commType = _protocol.getCommType();
- boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
- return Boolean.valueOf(_equals);
- }
- };
+ public Boolean apply(final InterfaceItemInstance p) {
+ ProtocolClass _protocol = p.getProtocol();
+ CommunicationType _commType = _protocol.getCommType();
+ boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
+ return Boolean.valueOf(_equals);
+ }
+ };
Iterable<InterfaceItemInstance> _filter_1 = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances, _function_4);
for(final InterfaceItemInstance pi : _filter_1) {
{
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
index e9ecf4c04..25ce3554b 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
@@ -492,12 +492,12 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
{
List<Message> _allIncomingMessages = RoomHelpers.getAllIncomingMessages(pc);
final Function1<Message,Boolean> _function = new Function1<Message,Boolean>() {
- public Boolean apply(final Message m) {
- VarDecl _data = m.getData();
- boolean _notEquals = (!Objects.equal(_data, null));
- return Boolean.valueOf(_notEquals);
- }
- };
+ public Boolean apply(final Message m) {
+ VarDecl _data = m.getData();
+ boolean _notEquals = (!Objects.equal(_data, null));
+ return Boolean.valueOf(_notEquals);
+ }
+ };
Iterable<Message> sentMsgs = IterableExtensions.<Message>filter(_allIncomingMessages, _function);
StringConcatenation _builder = new StringConcatenation();
_builder.append("/* data driven send port (conjugated) */");
@@ -630,12 +630,12 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
{
List<Message> _allIncomingMessages = RoomHelpers.getAllIncomingMessages(pc);
final Function1<Message,Boolean> _function = new Function1<Message,Boolean>() {
- public Boolean apply(final Message m) {
- VarDecl _data = m.getData();
- boolean _notEquals = (!Objects.equal(_data, null));
- return Boolean.valueOf(_notEquals);
- }
- };
+ public Boolean apply(final Message m) {
+ VarDecl _data = m.getData();
+ boolean _notEquals = (!Objects.equal(_data, null));
+ return Boolean.valueOf(_notEquals);
+ }
+ };
Iterable<Message> messages = IterableExtensions.<Message>filter(_allIncomingMessages, _function);
StringConcatenation _builder = new StringConcatenation();
{
diff --git a/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java b/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java
index 84ed90e41..4c9f9e3ed 100644
--- a/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java
+++ b/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java
@@ -296,14 +296,14 @@ public class DataConfiguration implements IDataConfiguration {
List<AttrInstanceConfig> configs = DataConfigurationHelper.dynActorInstanceAttrMap.get(_path);
if (configs!=null) {
final Procedure1<AttrInstanceConfig> _function = new Procedure1<AttrInstanceConfig>() {
- public void apply(final AttrInstanceConfig c) {
- boolean _isReadOnly = c.isReadOnly();
- if (_isReadOnly) {
- Attribute _attribute = c.getAttribute();
- result.add(_attribute);
+ public void apply(final AttrInstanceConfig c) {
+ boolean _isReadOnly = c.isReadOnly();
+ if (_isReadOnly) {
+ Attribute _attribute = c.getAttribute();
+ result.add(_attribute);
+ }
}
- }
- };
+ };
IterableExtensions.<AttrInstanceConfig>forEach(configs, _function);
}
return result;
@@ -316,15 +316,15 @@ public class DataConfiguration implements IDataConfiguration {
List<AttrInstanceConfig> configs = DataConfigurationHelper.dynActorInstanceAttrMap.get(_path);
if (configs!=null) {
final Procedure1<AttrInstanceConfig> _function = new Procedure1<AttrInstanceConfig>() {
- public void apply(final AttrInstanceConfig c) {
- boolean _isReadOnly = c.isReadOnly();
- boolean _not = (!_isReadOnly);
- if (_not) {
- Attribute _attribute = c.getAttribute();
- result.add(_attribute);
+ public void apply(final AttrInstanceConfig c) {
+ boolean _isReadOnly = c.isReadOnly();
+ boolean _not = (!_isReadOnly);
+ if (_not) {
+ Attribute _attribute = c.getAttribute();
+ result.add(_attribute);
+ }
}
- }
- };
+ };
IterableExtensions.<AttrInstanceConfig>forEach(configs, _function);
}
return result;
@@ -413,14 +413,14 @@ public class DataConfiguration implements IDataConfiguration {
List<AttrInstanceConfig> configs = DataConfigurationHelper.dynActorClassAttrMap.get(actor);
if (configs!=null) {
final Procedure1<AttrInstanceConfig> _function = new Procedure1<AttrInstanceConfig>() {
- public void apply(final AttrInstanceConfig c) {
- boolean _isReadOnly = c.isReadOnly();
- if (_isReadOnly) {
- Attribute _attribute = c.getAttribute();
- result.add(_attribute);
+ public void apply(final AttrInstanceConfig c) {
+ boolean _isReadOnly = c.isReadOnly();
+ if (_isReadOnly) {
+ Attribute _attribute = c.getAttribute();
+ result.add(_attribute);
+ }
}
- }
- };
+ };
IterableExtensions.<AttrInstanceConfig>forEach(configs, _function);
}
return result;
@@ -432,15 +432,15 @@ public class DataConfiguration implements IDataConfiguration {
List<AttrInstanceConfig> configs = DataConfigurationHelper.dynActorClassAttrMap.get(actor);
if (configs!=null) {
final Procedure1<AttrInstanceConfig> _function = new Procedure1<AttrInstanceConfig>() {
- public void apply(final AttrInstanceConfig c) {
- boolean _isReadOnly = c.isReadOnly();
- boolean _not = (!_isReadOnly);
- if (_not) {
- Attribute _attribute = c.getAttribute();
- result.add(_attribute);
+ public void apply(final AttrInstanceConfig c) {
+ boolean _isReadOnly = c.isReadOnly();
+ boolean _not = (!_isReadOnly);
+ if (_not) {
+ Attribute _attribute = c.getAttribute();
+ result.add(_attribute);
+ }
}
- }
- };
+ };
IterableExtensions.<AttrInstanceConfig>forEach(configs, _function);
}
return result;
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java
index d13462d93..b2cdc35f3 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java
@@ -274,17 +274,17 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.append("\t\t\t");
List<Port> _endPorts = RoomHelpers.getEndPorts(ac);
final Function1<Port,String> _function = new Function1<Port,String>() {
- public String apply(final Port port) {
- StringConcatenation _builder = new StringConcatenation();
- String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(port);
- _builder.append(_portClassName, "");
- _builder.append(" ");
- String _name = port.getName();
- _builder.append(_name, "");
- _builder.append(";");
- return _builder.toString();
- }
- };
+ public String apply(final Port port) {
+ StringConcatenation _builder = new StringConcatenation();
+ String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(port);
+ _builder.append(_portClassName, "");
+ _builder.append(" ");
+ String _name = port.getName();
+ _builder.append(_name, "");
+ _builder.append(";");
+ return _builder.toString();
+ }
+ };
List<String> _map = ListExtensions.<Port, String>map(_endPorts, _function);
String _join = IterableExtensions.join(_map, "\n");
_builder.append(_join, " ");
@@ -295,17 +295,17 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.append("\t\t\t");
EList<SAP> _serviceAccessPoints = ac.getServiceAccessPoints();
final Function1<SAP,String> _function_1 = new Function1<SAP,String>() {
- public String apply(final SAP sap) {
- StringConcatenation _builder = new StringConcatenation();
- String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(sap);
- _builder.append(_portClassName, "");
- _builder.append(" ");
- String _name = sap.getName();
- _builder.append(_name, "");
- _builder.append(";");
- return _builder.toString();
- }
- };
+ public String apply(final SAP sap) {
+ StringConcatenation _builder = new StringConcatenation();
+ String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(sap);
+ _builder.append(_portClassName, "");
+ _builder.append(" ");
+ String _name = sap.getName();
+ _builder.append(_name, "");
+ _builder.append(";");
+ return _builder.toString();
+ }
+ };
List<String> _map_1 = ListExtensions.<SAP, String>map(_serviceAccessPoints, _function_1);
String _join_1 = IterableExtensions.join(_map_1, "\n");
_builder.append(_join_1, " ");
@@ -316,18 +316,18 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.append("\t\t\t");
EList<ServiceImplementation> _serviceImplementations = ac.getServiceImplementations();
final Function1<ServiceImplementation,String> _function_2 = new Function1<ServiceImplementation,String>() {
- public String apply(final ServiceImplementation svc) {
- StringConcatenation _builder = new StringConcatenation();
- String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(svc);
- _builder.append(_portClassName, "");
- _builder.append(" ");
- SPP _spp = svc.getSpp();
- String _name = _spp.getName();
- _builder.append(_name, "");
- _builder.append(";");
- return _builder.toString();
- }
- };
+ public String apply(final ServiceImplementation svc) {
+ StringConcatenation _builder = new StringConcatenation();
+ String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(svc);
+ _builder.append(_portClassName, "");
+ _builder.append(" ");
+ SPP _spp = svc.getSpp();
+ String _name = _spp.getName();
+ _builder.append(_name, "");
+ _builder.append(";");
+ return _builder.toString();
+ }
+ };
List<String> _map_2 = ListExtensions.<ServiceImplementation, String>map(_serviceImplementations, _function_2);
String _join_2 = IterableExtensions.join(_map_2, "\n");
_builder.append(_join_2, " ");
@@ -606,20 +606,20 @@ public class ActorClassGen extends GenericActorClassGenerator {
{
EList<StandardOperation> _operations = ac.getOperations();
final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {
- public Boolean apply(final StandardOperation op) {
- boolean _isConstructor = RoomHelpers.isConstructor(op);
- return Boolean.valueOf(_isConstructor);
- }
- };
+ public Boolean apply(final StandardOperation op) {
+ boolean _isConstructor = RoomHelpers.isConstructor(op);
+ return Boolean.valueOf(_isConstructor);
+ }
+ };
Iterable<StandardOperation> _filter = IterableExtensions.<StandardOperation>filter(_operations, _function);
final StandardOperation ctor = IterableExtensions.<StandardOperation>head(_filter);
EList<StandardOperation> _operations_1 = ac.getOperations();
final Function1<StandardOperation,Boolean> _function_1 = new Function1<StandardOperation,Boolean>() {
- public Boolean apply(final StandardOperation op) {
- boolean _isDestructor = op.isDestructor();
- return Boolean.valueOf(_isDestructor);
- }
- };
+ public Boolean apply(final StandardOperation op) {
+ boolean _isDestructor = op.isDestructor();
+ return Boolean.valueOf(_isDestructor);
+ }
+ };
Iterable<StandardOperation> _filter_1 = IterableExtensions.<StandardOperation>filter(_operations_1, _function_1);
final StandardOperation dtor = IterableExtensions.<StandardOperation>head(_filter_1);
ActorClass _actorClass = xpac.getActorClass();
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java
index 1ae61c89a..df3a810f4 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java
@@ -136,7 +136,7 @@ public class CppExtensions implements ILanguageExtension {
_builder.append("typedef enum {");
_builder.newLine();
{
- for(final Pair<String, String> entry : entries) {
+ for(final Pair<String,String> entry : entries) {
String _first = entry.getFirst();
_builder.append(_first, "");
_builder.append(" = ");
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java
index 305d561bd..a4288a657 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java
@@ -109,20 +109,20 @@ public class DataClassGen {
{
EList<StandardOperation> _operations = dc.getOperations();
final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {
- public Boolean apply(final StandardOperation op) {
- boolean _isConstructor = RoomHelpers.isConstructor(op);
- return Boolean.valueOf(_isConstructor);
- }
- };
+ public Boolean apply(final StandardOperation op) {
+ boolean _isConstructor = RoomHelpers.isConstructor(op);
+ return Boolean.valueOf(_isConstructor);
+ }
+ };
Iterable<StandardOperation> _filter = IterableExtensions.<StandardOperation>filter(_operations, _function);
final StandardOperation ctor = IterableExtensions.<StandardOperation>head(_filter);
EList<StandardOperation> _operations_1 = dc.getOperations();
final Function1<StandardOperation,Boolean> _function_1 = new Function1<StandardOperation,Boolean>() {
- public Boolean apply(final StandardOperation op) {
- boolean _isDestructor = op.isDestructor();
- return Boolean.valueOf(_isDestructor);
- }
- };
+ public Boolean apply(final StandardOperation op) {
+ boolean _isDestructor = op.isDestructor();
+ return Boolean.valueOf(_isDestructor);
+ }
+ };
Iterable<StandardOperation> _filter_1 = IterableExtensions.<StandardOperation>filter(_operations_1, _function_1);
final StandardOperation dtor = IterableExtensions.<StandardOperation>head(_filter_1);
StringConcatenation _builder = new StringConcatenation();
@@ -316,20 +316,20 @@ public class DataClassGen {
{
EList<StandardOperation> _operations = dc.getOperations();
final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {
- public Boolean apply(final StandardOperation op) {
- boolean _isConstructor = RoomHelpers.isConstructor(op);
- return Boolean.valueOf(_isConstructor);
- }
- };
+ public Boolean apply(final StandardOperation op) {
+ boolean _isConstructor = RoomHelpers.isConstructor(op);
+ return Boolean.valueOf(_isConstructor);
+ }
+ };
Iterable<StandardOperation> _filter = IterableExtensions.<StandardOperation>filter(_operations, _function);
final StandardOperation ctor = IterableExtensions.<StandardOperation>head(_filter);
EList<StandardOperation> _operations_1 = dc.getOperations();
final Function1<StandardOperation,Boolean> _function_1 = new Function1<StandardOperation,Boolean>() {
- public Boolean apply(final StandardOperation op) {
- boolean _isDestructor = op.isDestructor();
- return Boolean.valueOf(_isDestructor);
- }
- };
+ public Boolean apply(final StandardOperation op) {
+ boolean _isDestructor = op.isDestructor();
+ return Boolean.valueOf(_isDestructor);
+ }
+ };
Iterable<StandardOperation> _filter_1 = IterableExtensions.<StandardOperation>filter(_operations_1, _function_1);
final StandardOperation dtor = IterableExtensions.<StandardOperation>head(_filter_1);
StringConcatenation _builder = new StringConcatenation();
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java
index 040d8e969..c0f52a704 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java
@@ -138,7 +138,7 @@ public class StateMachineGen extends GenericStateMachineGenerator {
_xifexpression = _triggers;
}
final EList<MessageFromIf> triggers = _xifexpression;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String, String>>();
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
final ArrayList<Pair<String,String>> list = _arrayList;
Pair<String,String> _pair = Tuples.<String, String>pair("POLLING", "0");
list.add(_pair);
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.java
index 53deaaaf7..614261c24 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.java
@@ -51,21 +51,21 @@ public class ActorClassDataGen {
private ProcedureHelpers _procedureHelpers;
public void doGenerate(final Root root) {
- HashMap<ActorClass,WiredActorClass> _hashMap = new HashMap<ActorClass, WiredActorClass>();
+ HashMap<ActorClass,WiredActorClass> _hashMap = new HashMap<ActorClass,WiredActorClass>();
final HashMap<ActorClass,WiredActorClass> ac2wired = _hashMap;
EList<WiredStructureClass> _wiredInstances = root.getWiredInstances();
final Function1<WiredStructureClass,Boolean> _function = new Function1<WiredStructureClass,Boolean>() {
- public Boolean apply(final WiredStructureClass w) {
- return Boolean.valueOf((w instanceof WiredActorClass));
- }
- };
+ public Boolean apply(final WiredStructureClass w) {
+ return Boolean.valueOf((w instanceof WiredActorClass));
+ }
+ };
Iterable<WiredStructureClass> _filter = IterableExtensions.<WiredStructureClass>filter(_wiredInstances, _function);
final Procedure1<WiredStructureClass> _function_1 = new Procedure1<WiredStructureClass>() {
- public void apply(final WiredStructureClass w) {
- ActorClass _actorClass = ((WiredActorClass) w).getActorClass();
- ac2wired.put(_actorClass, ((WiredActorClass) w));
- }
- };
+ public void apply(final WiredStructureClass w) {
+ ActorClass _actorClass = ((WiredActorClass) w).getActorClass();
+ ac2wired.put(_actorClass, ((WiredActorClass) w));
+ }
+ };
IterableExtensions.<WiredStructureClass>forEach(_filter, _function_1);
EList<ExpandedActorClass> _xpActorClasses = root.getXpActorClasses();
for (final ExpandedActorClass xpac : _xpActorClasses) {
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
index a6a990bb9..8bb4f1aa5 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
@@ -98,21 +98,21 @@ public class ActorClassGen extends GenericActorClassGenerator {
private TypeHelpers _typeHelpers;
public void doGenerate(final Root root) {
- HashMap<ActorClass,WiredActorClass> _hashMap = new HashMap<ActorClass, WiredActorClass>();
+ HashMap<ActorClass,WiredActorClass> _hashMap = new HashMap<ActorClass,WiredActorClass>();
final HashMap<ActorClass,WiredActorClass> ac2wired = _hashMap;
EList<WiredStructureClass> _wiredInstances = root.getWiredInstances();
final Function1<WiredStructureClass,Boolean> _function = new Function1<WiredStructureClass,Boolean>() {
- public Boolean apply(final WiredStructureClass w) {
- return Boolean.valueOf((w instanceof WiredActorClass));
- }
- };
+ public Boolean apply(final WiredStructureClass w) {
+ return Boolean.valueOf((w instanceof WiredActorClass));
+ }
+ };
Iterable<WiredStructureClass> _filter = IterableExtensions.<WiredStructureClass>filter(_wiredInstances, _function);
final Procedure1<WiredStructureClass> _function_1 = new Procedure1<WiredStructureClass>() {
- public void apply(final WiredStructureClass w) {
- ActorClass _actorClass = ((WiredActorClass) w).getActorClass();
- ac2wired.put(_actorClass, ((WiredActorClass) w));
- }
- };
+ public void apply(final WiredStructureClass w) {
+ ActorClass _actorClass = ((WiredActorClass) w).getActorClass();
+ ac2wired.put(_actorClass, ((WiredActorClass) w));
+ }
+ };
IterableExtensions.<WiredStructureClass>forEach(_filter, _function_1);
EList<ExpandedActorClass> _xpActorClasses = root.getXpActorClasses();
for (final ExpandedActorClass xpac : _xpActorClasses) {
@@ -159,20 +159,20 @@ public class ActorClassGen extends GenericActorClassGenerator {
final String clsname = _xifexpression;
EList<StandardOperation> _operations = ac.getOperations();
final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {
- public Boolean apply(final StandardOperation op) {
- boolean _isConstructor = RoomHelpers.isConstructor(op);
- return Boolean.valueOf(_isConstructor);
- }
- };
+ public Boolean apply(final StandardOperation op) {
+ boolean _isConstructor = RoomHelpers.isConstructor(op);
+ return Boolean.valueOf(_isConstructor);
+ }
+ };
Iterable<StandardOperation> _filter = IterableExtensions.<StandardOperation>filter(_operations, _function);
final StandardOperation ctor = IterableExtensions.<StandardOperation>head(_filter);
EList<StandardOperation> _operations_1 = ac.getOperations();
final Function1<StandardOperation,Boolean> _function_1 = new Function1<StandardOperation,Boolean>() {
- public Boolean apply(final StandardOperation op) {
- boolean _isDestructor = op.isDestructor();
- return Boolean.valueOf(_isDestructor);
- }
- };
+ public Boolean apply(final StandardOperation op) {
+ boolean _isDestructor = op.isDestructor();
+ return Boolean.valueOf(_isDestructor);
+ }
+ };
Iterable<StandardOperation> _filter_1 = IterableExtensions.<StandardOperation>filter(_operations_1, _function_1);
final StandardOperation dtor = IterableExtensions.<StandardOperation>head(_filter_1);
final EList<RoomModel> models = root.getReferencedModels(ac);
@@ -289,12 +289,12 @@ public class ActorClassGen extends GenericActorClassGenerator {
{
EList<ActorRef> _actorRefs = ac.getActorRefs();
final Function1<ActorRef,Boolean> _function_2 = new Function1<ActorRef,Boolean>() {
- public Boolean apply(final ActorRef r) {
- ReferenceType _refType = r.getRefType();
- boolean _equals = Objects.equal(_refType, ReferenceType.OPTIONAL);
- return Boolean.valueOf(_equals);
- }
- };
+ public Boolean apply(final ActorRef r) {
+ ReferenceType _refType = r.getRefType();
+ boolean _equals = Objects.equal(_refType, ReferenceType.OPTIONAL);
+ return Boolean.valueOf(_equals);
+ }
+ };
Iterable<ActorRef> _filter_2 = IterableExtensions.<ActorRef>filter(_actorRefs, _function_2);
for(final ActorRef sub : _filter_2) {
_builder.append("import ");
@@ -407,12 +407,12 @@ public class ActorClassGen extends GenericActorClassGenerator {
{
EList<ActorRef> _actorRefs_1 = ac.getActorRefs();
final Function1<ActorRef,Boolean> _function_3 = new Function1<ActorRef,Boolean>() {
- public Boolean apply(final ActorRef r) {
- ReferenceType _refType = r.getRefType();
- boolean _equals = Objects.equal(_refType, ReferenceType.OPTIONAL);
- return Boolean.valueOf(_equals);
- }
- };
+ public Boolean apply(final ActorRef r) {
+ ReferenceType _refType = r.getRefType();
+ boolean _equals = Objects.equal(_refType, ReferenceType.OPTIONAL);
+ return Boolean.valueOf(_equals);
+ }
+ };
Iterable<ActorRef> _filter_3 = IterableExtensions.<ActorRef>filter(_actorRefs_1, _function_3);
for(final ActorRef sub_1 : _filter_3) {
_builder.append("\t");
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java
index e84952584..e109bbecb 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java
@@ -79,11 +79,11 @@ public class DataClassGen {
{
EList<StandardOperation> _operations = dc.getOperations();
final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {
- public Boolean apply(final StandardOperation op) {
- boolean _isConstructor = RoomHelpers.isConstructor(op);
- return Boolean.valueOf(_isConstructor);
- }
- };
+ public Boolean apply(final StandardOperation op) {
+ boolean _isConstructor = RoomHelpers.isConstructor(op);
+ return Boolean.valueOf(_isConstructor);
+ }
+ };
Iterable<StandardOperation> _filter = IterableExtensions.<StandardOperation>filter(_operations, _function);
final StandardOperation ctor = IterableExtensions.<StandardOperation>head(_filter);
StringConcatenation _builder = new StringConcatenation();
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java
index 562933b94..2fbf4e2ca 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java
@@ -225,7 +225,7 @@ public class JavaExtensions implements ILanguageExtension {
public String genEnumeration(final String name, final List<Pair<String,String>> entries) {
StringConcatenation _builder = new StringConcatenation();
{
- for(final Pair<String, String> entry : entries) {
+ for(final Pair<String,String> entry : entries) {
_builder.append("public static final int ");
String _first = entry.getFirst();
_builder.append(_first, "");
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 d1a96038d..1126c3ab1 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
@@ -103,21 +103,21 @@ public class NodeGen {
private IDiagnostician diagnostician;
public void doGenerate(final Root root) {
- HashMap<SubSystemClass,WiredSubSystemClass> _hashMap = new HashMap<SubSystemClass, WiredSubSystemClass>();
+ HashMap<SubSystemClass,WiredSubSystemClass> _hashMap = new HashMap<SubSystemClass,WiredSubSystemClass>();
final HashMap<SubSystemClass,WiredSubSystemClass> sscc2wired = _hashMap;
EList<WiredStructureClass> _wiredInstances = root.getWiredInstances();
final Function1<WiredStructureClass,Boolean> _function = new Function1<WiredStructureClass,Boolean>() {
- public Boolean apply(final WiredStructureClass w) {
- return Boolean.valueOf((w instanceof WiredSubSystemClass));
- }
- };
+ public Boolean apply(final WiredStructureClass w) {
+ return Boolean.valueOf((w instanceof WiredSubSystemClass));
+ }
+ };
Iterable<WiredStructureClass> _filter = IterableExtensions.<WiredStructureClass>filter(_wiredInstances, _function);
final Procedure1<WiredStructureClass> _function_1 = new Procedure1<WiredStructureClass>() {
- public void apply(final WiredStructureClass w) {
- SubSystemClass _subSystemClass = ((WiredSubSystemClass) w).getSubSystemClass();
- sscc2wired.put(_subSystemClass, ((WiredSubSystemClass) w));
- }
- };
+ public void apply(final WiredStructureClass w) {
+ SubSystemClass _subSystemClass = ((WiredSubSystemClass) w).getSubSystemClass();
+ sscc2wired.put(_subSystemClass, ((WiredSubSystemClass) w));
+ }
+ };
IterableExtensions.<WiredStructureClass>forEach(_filter, _function_1);
Collection<NodeRef> _nodeRefs = ETMapUtil.getNodeRefs();
for (final NodeRef nr : _nodeRefs) {
@@ -148,13 +148,13 @@ public class NodeGen {
{
EList<ActorInstance> _allContainedInstances = ssi.getAllContainedInstances();
final Function1<ActorInstance,Boolean> _function_2 = new Function1<ActorInstance,Boolean>() {
- public Boolean apply(final ActorInstance ai) {
- MappedThread _mappedThread = ETMapUtil.getMappedThread(ai);
- PhysicalThread _thread = _mappedThread.getThread();
- boolean _equals = Objects.equal(_thread, thread);
- return Boolean.valueOf(_equals);
- }
- };
+ public Boolean apply(final ActorInstance ai) {
+ MappedThread _mappedThread = ETMapUtil.getMappedThread(ai);
+ PhysicalThread _thread = _mappedThread.getThread();
+ boolean _equals = Objects.equal(_thread, thread);
+ return Boolean.valueOf(_equals);
+ }
+ };
final Iterable<ActorInstance> instancesOnThread = IterableExtensions.<ActorInstance>filter(_allContainedInstances, _function_2);
boolean _isEmpty = IterableExtensions.isEmpty(instancesOnThread);
boolean _not = (!_isEmpty);
@@ -180,24 +180,24 @@ public class NodeGen {
private HashSet<ActorClass> getOptionalActorClasses(final Root root, final StructureInstance si) {
TreeIterator<EObject> _eAllContents = si.eAllContents();
final Function1<EObject,Boolean> _function = new Function1<EObject,Boolean>() {
- public Boolean apply(final EObject i) {
- return Boolean.valueOf((i instanceof ActorInterfaceInstance));
- }
- };
+ public Boolean apply(final EObject i) {
+ return Boolean.valueOf((i instanceof ActorInterfaceInstance));
+ }
+ };
Iterator<EObject> _filter = IteratorExtensions.<EObject>filter(_eAllContents, _function);
final Function1<EObject,ActorInterfaceInstance> _function_1 = new Function1<EObject,ActorInterfaceInstance>() {
- public ActorInterfaceInstance apply(final EObject aii) {
- return ((ActorInterfaceInstance) aii);
- }
- };
+ public ActorInterfaceInstance apply(final EObject aii) {
+ return ((ActorInterfaceInstance) aii);
+ }
+ };
Iterator<ActorInterfaceInstance> _map = IteratorExtensions.<EObject, ActorInterfaceInstance>map(_filter, _function_1);
final ArrayList<ActorInterfaceInstance> aifs = Lists.<ActorInterfaceInstance>newArrayList(_map);
final Function1<ActorInterfaceInstance,ActorClass> _function_2 = new Function1<ActorInterfaceInstance,ActorClass>() {
- public ActorClass apply(final ActorInterfaceInstance aii) {
- ActorClass _actorClass = ((ActorInterfaceInstance) aii).getActorClass();
- return _actorClass;
- }
- };
+ public ActorClass apply(final ActorInterfaceInstance aii) {
+ ActorClass _actorClass = ((ActorInterfaceInstance) aii).getActorClass();
+ return _actorClass;
+ }
+ };
List<ActorClass> _map_1 = ListExtensions.<ActorInterfaceInstance, ActorClass>map(aifs, _function_2);
final HashSet<ActorClass> result = Sets.<ActorClass>newHashSet(_map_1);
for (final ActorInterfaceInstance ai : aifs) {
@@ -220,11 +220,11 @@ public class NodeGen {
NodeClass _type = nr.getType();
EList<PhysicalThread> _threads = _type.getThreads();
final Function1<PhysicalThread,Boolean> _function = new Function1<PhysicalThread,Boolean>() {
- public Boolean apply(final PhysicalThread t) {
- boolean _contains = usedThreads.contains(t);
- return Boolean.valueOf(_contains);
- }
- };
+ public Boolean apply(final PhysicalThread t) {
+ boolean _contains = usedThreads.contains(t);
+ return Boolean.valueOf(_contains);
+ }
+ };
final Iterable<PhysicalThread> threads = IterableExtensions.<PhysicalThread>filter(_threads, _function);
final HashSet<ActorClass> opt = this.getOptionalActorClasses(root, comp);
StringConcatenation _builder = new StringConcatenation();
@@ -522,16 +522,16 @@ public class NodeGen {
{
BasicEList<AbstractInstance> _allSubInstances = this._roomExtensions.getAllSubInstances(comp);
final Function1<AbstractInstance,Boolean> _function_1 = new Function1<AbstractInstance,Boolean>() {
- public Boolean apply(final AbstractInstance inst) {
- return Boolean.valueOf((inst instanceof ActorInterfaceInstance));
- }
- };
+ public Boolean apply(final AbstractInstance inst) {
+ return Boolean.valueOf((inst instanceof ActorInterfaceInstance));
+ }
+ };
Iterable<AbstractInstance> _filter = IterableExtensions.<AbstractInstance>filter(_allSubInstances, _function_1);
final Function1<AbstractInstance,ActorInterfaceInstance> _function_2 = new Function1<AbstractInstance,ActorInterfaceInstance>() {
- public ActorInterfaceInstance apply(final AbstractInstance inst) {
- return ((ActorInterfaceInstance) inst);
- }
- };
+ public ActorInterfaceInstance apply(final AbstractInstance inst) {
+ return ((ActorInterfaceInstance) inst);
+ }
+ };
Iterable<ActorInterfaceInstance> _map = IterableExtensions.<AbstractInstance, ActorInterfaceInstance>map(_filter, _function_2);
for(final ActorInterfaceInstance aii : _map) {
_builder.append("\t\t");
@@ -802,12 +802,12 @@ public class NodeGen {
EList<ActorClass> _subClasses = root.getSubClasses(oa);
List<ActorClass> _union = this._roomExtensions.<ActorClass>union(_subClasses, oa);
final Function1<ActorClass,Boolean> _function_3 = new Function1<ActorClass,Boolean>() {
- public Boolean apply(final ActorClass s) {
- boolean _isAbstract = s.isAbstract();
- boolean _not = (!_isAbstract);
- return Boolean.valueOf(_not);
- }
- };
+ public Boolean apply(final ActorClass s) {
+ boolean _isAbstract = s.isAbstract();
+ boolean _not = (!_isAbstract);
+ return Boolean.valueOf(_not);
+ }
+ };
Iterable<ActorClass> _filter_1 = IterableExtensions.<ActorClass>filter(_union, _function_3);
for(final ActorClass subcls : _filter_1) {
_builder.append("\t\t");
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorFactoryGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorFactoryGen.java
index 8c298247a..453fba870 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorFactoryGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorFactoryGen.java
@@ -39,21 +39,21 @@ public class OptionalActorFactoryGen {
private RoomExtensions _roomExtensions;
public void doGenerate(final Root root) {
- HashMap<ActorClass,WiredActorClass> _hashMap = new HashMap<ActorClass, WiredActorClass>();
+ HashMap<ActorClass,WiredActorClass> _hashMap = new HashMap<ActorClass,WiredActorClass>();
final HashMap<ActorClass,WiredActorClass> ac2wired = _hashMap;
EList<WiredStructureClass> _wiredInstances = root.getWiredInstances();
final Function1<WiredStructureClass,Boolean> _function = new Function1<WiredStructureClass,Boolean>() {
- public Boolean apply(final WiredStructureClass w) {
- return Boolean.valueOf((w instanceof WiredActorClass));
- }
- };
+ public Boolean apply(final WiredStructureClass w) {
+ return Boolean.valueOf((w instanceof WiredActorClass));
+ }
+ };
Iterable<WiredStructureClass> _filter = IterableExtensions.<WiredStructureClass>filter(_wiredInstances, _function);
final Procedure1<WiredStructureClass> _function_1 = new Procedure1<WiredStructureClass>() {
- public void apply(final WiredStructureClass w) {
- ActorClass _actorClass = ((WiredActorClass) w).getActorClass();
- ac2wired.put(_actorClass, ((WiredActorClass) w));
- }
- };
+ public void apply(final WiredStructureClass w) {
+ ActorClass _actorClass = ((WiredActorClass) w).getActorClass();
+ ac2wired.put(_actorClass, ((WiredActorClass) w));
+ }
+ };
IterableExtensions.<WiredStructureClass>forEach(_filter, _function_1);
EList<OptionalActorInstance> _optionalInstances = root.getOptionalInstances();
for (final OptionalActorInstance oi : _optionalInstances) {
@@ -131,11 +131,11 @@ public class OptionalActorFactoryGen {
{
List<Port> _allEndPorts = RoomHelpers.getAllEndPorts(ac);
final Function1<Port,Boolean> _function = new Function1<Port,Boolean>() {
- public Boolean apply(final Port p) {
- boolean _isExternal = RoomHelpers.isExternal(p);
- return Boolean.valueOf(_isExternal);
- }
- };
+ public Boolean apply(final Port p) {
+ boolean _isExternal = RoomHelpers.isExternal(p);
+ return Boolean.valueOf(_isExternal);
+ }
+ };
Iterable<Port> _filter = IterableExtensions.<Port>filter(_allEndPorts, _function);
for(final Port port : _filter) {
_builder.append("\t\t");
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java
index c2724788e..1c8a4e07a 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java
@@ -856,12 +856,12 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
{
List<Message> _allIncomingMessages = RoomHelpers.getAllIncomingMessages(pc);
final Function1<Message,Boolean> _function = new Function1<Message,Boolean>() {
- public Boolean apply(final Message m) {
- VarDecl _data = m.getData();
- boolean _notEquals = (!Objects.equal(_data, null));
- return Boolean.valueOf(_notEquals);
- }
- };
+ public Boolean apply(final Message m) {
+ VarDecl _data = m.getData();
+ boolean _notEquals = (!Objects.equal(_data, null));
+ return Boolean.valueOf(_notEquals);
+ }
+ };
final Iterable<Message> sentMsgs = IterableExtensions.<Message>filter(_allIncomingMessages, _function);
final EList<RoomModel> models = root.getReferencedModels(pc);
StringConcatenation _builder = new StringConcatenation();
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java
index 21026709d..ad8e9f0ec 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java
@@ -97,20 +97,20 @@ public class VariableServiceGen {
{
final NodeRef nr = ETMapUtil.getNodeRef(comp);
final String clsname = this.stdExt.getJavaClassName(nr, comp);
- HashMap<ActorInstance,List<Attribute>> _hashMap = new HashMap<ActorInstance, List<Attribute>>();
+ HashMap<ActorInstance,List<Attribute>> _hashMap = new HashMap<ActorInstance,List<Attribute>>();
final HashMap<ActorInstance,List<Attribute>> aisAttrMap = _hashMap;
EList<ActorInstance> _allContainedInstances = comp.getAllContainedInstances();
final Procedure1<ActorInstance> _function = new Procedure1<ActorInstance>() {
- public void apply(final ActorInstance ai) {
- List<Attribute> _dynConfigReadAttributes = VariableServiceGen.this.configExt.getDynConfigReadAttributes(ai);
- boolean _isEmpty = _dynConfigReadAttributes.isEmpty();
- boolean _not = (!_isEmpty);
- if (_not) {
- List<Attribute> _dynConfigReadAttributes_1 = VariableServiceGen.this.configExt.getDynConfigReadAttributes(ai);
- aisAttrMap.put(ai, _dynConfigReadAttributes_1);
+ public void apply(final ActorInstance ai) {
+ List<Attribute> _dynConfigReadAttributes = VariableServiceGen.this.configExt.getDynConfigReadAttributes(ai);
+ boolean _isEmpty = _dynConfigReadAttributes.isEmpty();
+ boolean _not = (!_isEmpty);
+ if (_not) {
+ List<Attribute> _dynConfigReadAttributes_1 = VariableServiceGen.this.configExt.getDynConfigReadAttributes(ai);
+ aisAttrMap.put(ai, _dynConfigReadAttributes_1);
+ }
}
- }
- };
+ };
IterableExtensions.<ActorInstance>forEach(_allContainedInstances, _function);
StringConcatenation _builder = new StringConcatenation();
_builder.newLine();
@@ -565,23 +565,23 @@ public class VariableServiceGen {
HashSet<DataClass> _hashSet = new HashSet<DataClass>();
final HashSet<DataClass> result = _hashSet;
final Procedure1<ActorInstance> _function = new Procedure1<ActorInstance>() {
- public void apply(final ActorInstance ai) {
- List<Attribute> _dynConfigReadAttributes = VariableServiceGen.this.configExt.getDynConfigReadAttributes(ai);
- final Procedure1<Attribute> _function = new Procedure1<Attribute>() {
- public void apply(final Attribute a) {
- RefableType _type = a.getType();
- DataType _type_1 = _type.getType();
- boolean _isDataClass = VariableServiceGen.this._typeHelpers.isDataClass(_type_1);
- if (_isDataClass) {
- RefableType _type_2 = a.getType();
- DataType _type_3 = _type_2.getType();
- result.add(((DataClass) _type_3));
- }
- }
- };
- IterableExtensions.<Attribute>forEach(_dynConfigReadAttributes, _function);
- }
- };
+ public void apply(final ActorInstance ai) {
+ List<Attribute> _dynConfigReadAttributes = VariableServiceGen.this.configExt.getDynConfigReadAttributes(ai);
+ final Procedure1<Attribute> _function = new Procedure1<Attribute>() {
+ public void apply(final Attribute a) {
+ RefableType _type = a.getType();
+ DataType _type_1 = _type.getType();
+ boolean _isDataClass = VariableServiceGen.this._typeHelpers.isDataClass(_type_1);
+ if (_isDataClass) {
+ RefableType _type_2 = a.getType();
+ DataType _type_3 = _type_2.getType();
+ result.add(((DataClass) _type_3));
+ }
+ }
+ };
+ IterableExtensions.<Attribute>forEach(_dynConfigReadAttributes, _function);
+ }
+ };
IterableExtensions.<ActorInstance>forEach(ais, _function);
return result;
}
@@ -601,17 +601,17 @@ public class VariableServiceGen {
DataClass dc = visit.pop();
List<Attribute> _allAttributes = RoomHelpers.getAllAttributes(dc);
final Procedure1<Attribute> _function = new Procedure1<Attribute>() {
- public void apply(final Attribute a) {
- RefableType _type = a.getType();
- DataType _type_1 = _type.getType();
- boolean _isDataClass = VariableServiceGen.this._typeHelpers.isDataClass(_type_1);
- if (_isDataClass) {
- RefableType _type_2 = a.getType();
- DataType _type_3 = _type_2.getType();
- visit.add(((DataClass) _type_3));
+ public void apply(final Attribute a) {
+ RefableType _type = a.getType();
+ DataType _type_1 = _type.getType();
+ boolean _isDataClass = VariableServiceGen.this._typeHelpers.isDataClass(_type_1);
+ if (_isDataClass) {
+ RefableType _type_2 = a.getType();
+ DataType _type_3 = _type_2.getType();
+ visit.add(((DataClass) _type_3));
+ }
}
- }
- };
+ };
IterableExtensions.<Attribute>forEach(_allAttributes, _function);
}
boolean _isEmpty_1 = visit.isEmpty();
@@ -625,12 +625,12 @@ public class VariableServiceGen {
HashSet<RoomModel> _hashSet = new HashSet<RoomModel>();
final HashSet<RoomModel> models = _hashSet;
final Procedure1<ActorInstance> _function = new Procedure1<ActorInstance>() {
- public void apply(final ActorInstance ai) {
- ActorClass _actorClass = ai.getActorClass();
- EObject _eContainer = _actorClass.eContainer();
- models.add(((RoomModel) _eContainer));
- }
- };
+ public void apply(final ActorInstance ai) {
+ ActorClass _actorClass = ai.getActorClass();
+ EObject _eContainer = _actorClass.eContainer();
+ models.add(((RoomModel) _eContainer));
+ }
+ };
IterableExtensions.<ActorInstance>forEach(ais, _function);
return models;
}
diff --git a/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF
index 41bb9bfce..0f80fb3b2 100644
--- a/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF
@@ -7,6 +7,6 @@ Bundle-Vendor: Eclipse eTrice (Incubation)
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.etrice.generator.ui;bundle-version="0.4.0",
org.eclipse.cdt.core;bundle-version="5.5.0",
- org.eclipse.cdt.managedbuilder.core;bundle-version="8.2.1",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="8.2.0",
org.eclipse.equinox.common;bundle-version="3.6.200"
Import-Package: org.eclipse.core.resources
diff --git a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF
index 1b79a905d..e571dd267 100644
--- a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF
@@ -8,13 +8,13 @@ Bundle-Vendor: Eclipse eTrice (Incubation)
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.core.resources;bundle-version="3.8.101",
- org.eclipse.emf.ecore;bundle-version="2.9.1",
+ org.eclipse.core.resources;bundle-version="3.8.100",
+ org.eclipse.emf.ecore;bundle-version="2.9.0",
org.eclipse.etrice.core.room.ui;bundle-version="0.4.0",
- org.eclipse.jdt.core;bundle-version="3.9.1",
+ org.eclipse.jdt.core;bundle-version="3.9.0",
org.eclipse.jdt.launching;bundle-version="3.7.0",
- org.eclipse.ui.ide;bundle-version="3.9.1",
- org.eclipse.xtext.xbase.lib;bundle-version="2.4.3"
+ org.eclipse.ui.ide;bundle-version="3.9.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.4.2"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.etrice.generator.ui.Activator
Export-Package: org.eclipse.etrice.generator.ui.configurator,
diff --git a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
index ef827ef33..83191b1bf 100644
--- a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Export-Package: org.eclipse.etrice.generator.base,
org.eclipse.etrice.generator.generic
Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.4.0",
org.eclipse.etrice.core.genmodel;bundle-version="0.4.0",
- org.eclipse.ui.ide;bundle-version="3.9.1",
+ org.eclipse.ui.ide;bundle-version="3.9.0",
org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.emf.ecore;bundle-version="2.6.0";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java
index 53b056113..1d355b3b9 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java
@@ -80,7 +80,7 @@ public class GenericActorClassGenerator {
_xifexpression_2 = _allServiceImplementations;
}
final List<ServiceImplementation> svcImpls = _xifexpression_2;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String, String>>();
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
final ArrayList<Pair<String,String>> list = _arrayList;
for (final Port ep : endPorts) {
String _name = ep.getName();
@@ -116,7 +116,7 @@ public class GenericActorClassGenerator {
public String genInterfaceItemConstantsForOptionalActor(final ActorClass ac) {
final List<Port> ports = RoomHelpers.getAllInterfacePorts(ac);
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String, String>>();
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
final ArrayList<Pair<String,String>> list = _arrayList;
Iterable<Indexed<Port>> _indexed = Indexed.<Port>indexed(ports);
for (final Indexed<Port> ep : _indexed) {
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java
index 9e09367cb..c9420b121 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java
@@ -49,7 +49,7 @@ public class GenericProtocolClassGenerator {
*/
public String genMessageIDs(final ProtocolClass pc) {
int offset = 0;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String, String>>();
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
ArrayList<Pair<String,String>> list = _arrayList;
String _name = pc.getName();
String _memberInDeclaration = this._iLanguageExtension.memberInDeclaration(_name, "MSG_MIN");
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 8a490ed40..8a9b903db 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
@@ -102,7 +102,7 @@ public class GenericStateMachineGenerator {
List<State> baseStates = _xifexpression_1;
List<State> _leafStatesLast = this._roomExtensions.getLeafStatesLast(baseStates);
baseStates = _leafStatesLast;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String, String>>();
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
ArrayList<Pair<String,String>> list = _arrayList;
boolean _usesInheritance_2 = this.langExt.usesInheritance();
boolean _not = (!_usesInheritance_2);
@@ -158,7 +158,7 @@ public class GenericStateMachineGenerator {
_xifexpression_1 = 0;
}
int offset = _xifexpression_1;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String, String>>();
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
ArrayList<Pair<String,String>> list = _arrayList;
for (final TransitionChain chain : chains) {
{
@@ -193,7 +193,7 @@ public class GenericStateMachineGenerator {
_xifexpression = _allMessagesFromInterfaces;
}
final List<MessageFromIf> triggers = _xifexpression;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String, String>>();
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
final ArrayList<Pair<String,String>> list = _arrayList;
Pair<String,String> _pair = Tuples.<String, String>pair("POLLING", "0");
list.add(_pair);
@@ -1279,10 +1279,10 @@ public class GenericStateMachineGenerator {
_builder.newLineIfNotEmpty();
List<Transition> _outgoingTransitionsHierarchical = this._roomExtensions.getOutgoingTransitionsHierarchical(xpac, state);
final Function1<Transition,Boolean> _function = new Function1<Transition,Boolean>() {
- public Boolean apply(final Transition t) {
- return Boolean.valueOf((t instanceof GuardedTransition));
- }
- };
+ public Boolean apply(final Transition t) {
+ return Boolean.valueOf((t instanceof GuardedTransition));
+ }
+ };
Iterable<Transition> transitions = IterableExtensions.<Transition>filter(_outgoingTransitionsHierarchical, _function);
_builder.newLineIfNotEmpty();
{
@@ -1544,11 +1544,11 @@ public class GenericStateMachineGenerator {
{
EList<Trigger> _triggers = tt.getTriggers();
final Function1<Trigger,Boolean> _function = new Function1<Trigger,Boolean>() {
- public Boolean apply(final Trigger e) {
- boolean _isMatching = ac.isMatching(e, trigger);
- return Boolean.valueOf(_isMatching);
- }
- };
+ public Boolean apply(final Trigger e) {
+ boolean _isMatching = ac.isMatching(e, trigger);
+ return Boolean.valueOf(_isMatching);
+ }
+ };
final Trigger tr = IterableExtensions.<Trigger>findFirst(_triggers, _function);
StringConcatenation _builder = new StringConcatenation();
{
@@ -2129,17 +2129,17 @@ public class GenericStateMachineGenerator {
StateGraph _stateMachine_1 = xpac.getStateMachine();
List<TrPoint> _allTrPointsRecursive = RoomHelpers.getAllTrPointsRecursive(_stateMachine_1);
final Function1<TrPoint,Boolean> _function = new Function1<TrPoint,Boolean>() {
- public Boolean apply(final TrPoint t) {
- boolean _and = false;
- if (!(t instanceof TransitionPoint)) {
- _and = false;
- } else {
- boolean _isHandler = ((TransitionPoint) t).isHandler();
- _and = ((t instanceof TransitionPoint) && _isHandler);
+ public Boolean apply(final TrPoint t) {
+ boolean _and = false;
+ if (!(t instanceof TransitionPoint)) {
+ _and = false;
+ } else {
+ boolean _isHandler = ((TransitionPoint) t).isHandler();
+ _and = ((t instanceof TransitionPoint) && _isHandler);
+ }
+ return Boolean.valueOf(_and);
}
- return Boolean.valueOf(_and);
- }
- };
+ };
Iterable<TrPoint> _filter = IterableExtensions.<TrPoint>filter(_allTrPointsRecursive, _function);
boolean _isEmpty_1 = IterableExtensions.isEmpty(_filter);
boolean _not = (!_isEmpty_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 412e89285..00a44b721 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
@@ -142,11 +142,11 @@ public class RoomExtensions {
ArrayList<Port> _arrayList = new ArrayList<Port>();
final ArrayList<Port> ret = _arrayList;
final Procedure1<ExternalPort> _function = new Procedure1<ExternalPort>() {
- public void apply(final ExternalPort e) {
- Port _interfacePort = e.getInterfacePort();
- ret.add(_interfacePort);
- }
- };
+ public void apply(final ExternalPort e) {
+ Port _interfacePort = e.getInterfacePort();
+ ret.add(_interfacePort);
+ }
+ };
IterableExtensions.<ExternalPort>forEach(in2, _function);
Iterables.<Port>addAll(ret, in1);
return ret;
@@ -544,12 +544,12 @@ public class RoomExtensions {
EObject _eContainer = m.eContainer();
List<MessageHandler> _sendHandlers = this.getSendHandlers(((ProtocolClass) _eContainer), conj);
final Function1<MessageHandler,Boolean> _function = new Function1<MessageHandler,Boolean>() {
- public Boolean apply(final MessageHandler e) {
- Message _msg = e.getMsg();
- boolean _equals = Objects.equal(_msg, m);
- return Boolean.valueOf(_equals);
- }
- };
+ public Boolean apply(final MessageHandler e) {
+ Message _msg = e.getMsg();
+ boolean _equals = Objects.equal(_msg, m);
+ return Boolean.valueOf(_equals);
+ }
+ };
return IterableExtensions.<MessageHandler>findFirst(_sendHandlers, _function);
}
@@ -587,19 +587,19 @@ public class RoomExtensions {
List<State> _xblockexpression = null;
{
final Function1<State,Boolean> _function = new Function1<State,Boolean>() {
- public Boolean apply(final State s) {
- boolean _isLeaf = RoomHelpers.isLeaf(s);
- return Boolean.valueOf(_isLeaf);
- }
- };
+ public Boolean apply(final State s) {
+ boolean _isLeaf = RoomHelpers.isLeaf(s);
+ return Boolean.valueOf(_isLeaf);
+ }
+ };
final Iterable<State> leaf = IterableExtensions.<State>filter(states, _function);
final Function1<State,Boolean> _function_1 = new Function1<State,Boolean>() {
- public Boolean apply(final State s) {
- boolean _isLeaf = RoomHelpers.isLeaf(s);
- boolean _not = (!_isLeaf);
- return Boolean.valueOf(_not);
- }
- };
+ public Boolean apply(final State s) {
+ boolean _isLeaf = RoomHelpers.isLeaf(s);
+ boolean _not = (!_isLeaf);
+ return Boolean.valueOf(_not);
+ }
+ };
final Iterable<State> nonLeaf = IterableExtensions.<State>filter(states, _function_1);
List<State> _union = this.<State>union(nonLeaf, leaf);
_xblockexpression = (_union);
@@ -636,28 +636,28 @@ public class RoomExtensions {
boolean _or = false;
EList<StandardOperation> _operations = ac.getOperations();
final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {
- public Boolean apply(final StandardOperation e) {
- boolean _and = false;
- boolean _and_1 = false;
- String _name = e.getName();
- boolean _equals = Objects.equal(_name, "stop");
- if (!_equals) {
- _and_1 = false;
- } else {
- EList<VarDecl> _arguments = e.getArguments();
- boolean _isEmpty = _arguments.isEmpty();
- _and_1 = (_equals && _isEmpty);
+ public Boolean apply(final StandardOperation e) {
+ boolean _and = false;
+ boolean _and_1 = false;
+ String _name = e.getName();
+ boolean _equals = Objects.equal(_name, "stop");
+ if (!_equals) {
+ _and_1 = false;
+ } else {
+ EList<VarDecl> _arguments = e.getArguments();
+ boolean _isEmpty = _arguments.isEmpty();
+ _and_1 = (_equals && _isEmpty);
+ }
+ if (!_and_1) {
+ _and = false;
+ } else {
+ RefableType _returnType = e.getReturnType();
+ boolean _equals_1 = Objects.equal(_returnType, null);
+ _and = (_and_1 && _equals_1);
+ }
+ return Boolean.valueOf(_and);
}
- if (!_and_1) {
- _and = false;
- } else {
- RefableType _returnType = e.getReturnType();
- boolean _equals_1 = Objects.equal(_returnType, null);
- _and = (_and_1 && _equals_1);
- }
- return Boolean.valueOf(_and);
- }
- };
+ };
boolean _exists = IterableExtensions.<StandardOperation>exists(_operations, _function);
if (_exists) {
_or = true;
diff --git a/runtime/org.eclipse.etrice.runtime.java.aspects/dist/org.eclipse.etrice.runtime.java.aspects.jar b/runtime/org.eclipse.etrice.runtime.java.aspects/dist/org.eclipse.etrice.runtime.java.aspects.jar
index 7a801cf12..42afd36c4 100644
--- a/runtime/org.eclipse.etrice.runtime.java.aspects/dist/org.eclipse.etrice.runtime.java.aspects.jar
+++ b/runtime/org.eclipse.etrice.runtime.java.aspects/dist/org.eclipse.etrice.runtime.java.aspects.jar
Binary files differ
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/.cproject b/tests/org.eclipse.etrice.runtime.c.tests/.cproject
index 9e7423dea..9aa4383d4 100644
--- a/tests/org.eclipse.etrice.runtime.c.tests/.cproject
+++ b/tests/org.eclipse.etrice.runtime.c.tests/.cproject
@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?>
+
+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.debug.1638834921">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.1638834921" moduleId="org.eclipse.cdt.core.settings" name="PosixDebug">
<externalSettings/>
<extensions>
+ <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
- <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -41,8 +43,8 @@
<listOptionValue builtIn="false" value="rt"/>
</option>
<option id="gnu.c.link.option.paths.1505328291" name="Library search path (-L)" superClass="gnu.c.link.option.paths" valueType="libPaths">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c/DebugMinGW}&quot;"/>
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c/MinGWDebug}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c/Debug}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c/PosixDebug}&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.154971939" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -64,8 +66,8 @@
<externalSettings containerId="org.eclipse.etrice.runtime.c;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier">
<externalSetting>
<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/org.eclipse.etrice.runtime.c"/>
- <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/org.eclipse.etrice.runtime.c/DebugMinGW"/>
- <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/org.eclipse.etrice.runtime.c/MinGWDebug"/>
+ <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/org.eclipse.etrice.runtime.c/Debug"/>
+ <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/org.eclipse.etrice.runtime.c/PosixDebug"/>
<entry flags="RESOLVED" kind="libraryFile" name="org.eclipse.etrice.runtime.c" srcPrefixMapping="" srcRootPath=""/>
</externalSetting>
</externalSettings>
@@ -75,10 +77,10 @@
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.1638834921.786066887" moduleId="org.eclipse.cdt.core.settings" name="MinGWDebug">
<externalSettings/>
<extensions>
+ <extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
- <extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -114,8 +116,8 @@
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="org.eclipse.etrice.runtime.c"/>
</option>
<option id="gnu.c.link.option.paths.714773418" name="Library search path (-L)" superClass="gnu.c.link.option.paths" valueType="libPaths">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c/DebugMinGW}&quot;"/>
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c/MinGWDebug}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c/Debug}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c/PosixDebug}&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1024087368" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -131,8 +133,8 @@
<externalSettings containerId="org.eclipse.etrice.runtime.c;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier">
<externalSetting>
<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/org.eclipse.etrice.runtime.c"/>
- <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/org.eclipse.etrice.runtime.c/DebugMinGW"/>
- <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/org.eclipse.etrice.runtime.c/MinGWDebug"/>
+ <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/org.eclipse.etrice.runtime.c/Debug"/>
+ <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/org.eclipse.etrice.runtime.c/PosixDebug"/>
<entry flags="RESOLVED" kind="libraryFile" name="org.eclipse.etrice.runtime.c" srcPrefixMapping="" srcRootPath=""/>
</externalSetting>
</externalSettings>

Back to the top