diff options
author | Juergen Haug | 2015-08-27 15:51:11 +0000 |
---|---|---|
committer | Juergen Haug | 2015-08-27 15:51:11 +0000 |
commit | cb5b31065192b19f7fc3ab21d56da4a60d0d0ae0 (patch) | |
tree | 293c9b2069ddcf7dbee92776e46729b135467cdf | |
parent | c4bc35b41a8c73b26e83ed94bde74a76a93b5e4d (diff) | |
download | org.eclipse.etrice-cb5b31065192b19f7fc3ab21d56da4a60d0d0ae0.tar.gz org.eclipse.etrice-cb5b31065192b19f7fc3ab21d56da4a60d0d0ae0.tar.xz org.eclipse.etrice-cb5b31065192b19f7fc3ab21d56da4a60d0d0ae0.zip |
[room] reversed order of unordered elements for correct serialization
Change-Id: Icbf3718504abda179355c41c2c9b4a399a19e6fb
24 files changed, 2286 insertions, 2274 deletions
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractRoomProposalProvider.java b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractRoomProposalProvider.java index 6ba9b12e3..e206cbfc7 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractRoomProposalProvider.java +++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractRoomProposalProvider.java @@ -133,13 +133,13 @@ public class AbstractRoomProposalProvider extends org.eclipse.etrice.core.fsm.ui public void completeDataClass_UserCode3(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeDataClass_Attributes(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeDataClass_Operations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } public void completeDataClass_Structors(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeDataClass_Operations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeDataClass_Attributes(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } public void completeAttribute_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { @@ -272,13 +272,13 @@ public class AbstractRoomProposalProvider extends org.eclipse.etrice.core.fsm.ui public void completePortClass_UserCode(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completePortClass_Attributes(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completePortClass_MsgHandlers(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } public void completePortClass_Operations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completePortClass_MsgHandlers(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completePortClass_Attributes(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } public void completeInMessageHandler_Msg(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { @@ -311,10 +311,10 @@ public class AbstractRoomProposalProvider extends org.eclipse.etrice.core.fsm.ui public void completeActorClass_Annotations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeActorClass_InterfacePorts(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeActorClass_ServiceProvisionPoints(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeActorClass_ServiceProvisionPoints(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeActorClass_InterfacePorts(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } public void completeActorClass_StructureDocu(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { @@ -329,13 +329,13 @@ public class AbstractRoomProposalProvider extends org.eclipse.etrice.core.fsm.ui public void completeActorClass_UserCode3(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeActorClass_InternalPorts(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeActorClass_Connections(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeActorClass_ExternalPorts(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeActorClass_Bindings(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeActorClass_ServiceAccessPoints(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeActorClass_ServiceImplementations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } public void completeActorClass_Attributes(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { @@ -344,13 +344,13 @@ public class AbstractRoomProposalProvider extends org.eclipse.etrice.core.fsm.ui public void completeActorClass_ActorRefs(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeActorClass_ServiceImplementations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeActorClass_ServiceAccessPoints(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeActorClass_Bindings(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeActorClass_InternalPorts(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeActorClass_Connections(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeActorClass_ExternalPorts(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } public void completeActorClass_BehaviorDocu(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { @@ -359,10 +359,10 @@ public class AbstractRoomProposalProvider extends org.eclipse.etrice.core.fsm.ui public void completeActorClass_BehaviorAnnotations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeActorClass_Structors(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeActorClass_Operations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeActorClass_Operations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeActorClass_Structors(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } public void completeActorClass_StateMachine(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { @@ -410,13 +410,13 @@ public class AbstractRoomProposalProvider extends org.eclipse.etrice.core.fsm.ui public void completeLogicalSystem_Annotations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeLogicalSystem_SubSystems(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeLogicalSystem_Connections(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } public void completeLogicalSystem_Bindings(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeLogicalSystem_Connections(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeLogicalSystem_SubSystems(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } public void completeSubSystemRef_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { @@ -446,25 +446,25 @@ public class AbstractRoomProposalProvider extends org.eclipse.etrice.core.fsm.ui public void completeSubSystemClass_UserCode3(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeSubSystemClass_RelayPorts(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeSubSystemClass_ActorInstanceMappings(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeSubSystemClass_ServiceProvisionPoints(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeSubSystemClass_Threads(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeSubSystemClass_ActorRefs(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeSubSystemClass_Connections(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } public void completeSubSystemClass_Bindings(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeSubSystemClass_Connections(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeSubSystemClass_ActorRefs(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeSubSystemClass_Threads(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeSubSystemClass_ServiceProvisionPoints(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeSubSystemClass_ActorInstanceMappings(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeSubSystemClass_RelayPorts(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } public void completeLogicalThread_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/RoomParser.java b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/RoomParser.java index e8097bf21..ddd8435a4 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/RoomParser.java +++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/RoomParser.java @@ -298,9 +298,9 @@ public class RoomParser extends AbstractContentAssistParser { put(grammarAccess.getDataClassAccess().getUserCode1Assignment_6_1(), "rule__DataClass__UserCode1Assignment_6_1"); put(grammarAccess.getDataClassAccess().getUserCode2Assignment_7_1(), "rule__DataClass__UserCode2Assignment_7_1"); put(grammarAccess.getDataClassAccess().getUserCode3Assignment_8_1(), "rule__DataClass__UserCode3Assignment_8_1"); - put(grammarAccess.getDataClassAccess().getAttributesAssignment_9_0(), "rule__DataClass__AttributesAssignment_9_0"); + put(grammarAccess.getDataClassAccess().getOperationsAssignment_9_0(), "rule__DataClass__OperationsAssignment_9_0"); put(grammarAccess.getDataClassAccess().getStructorsAssignment_9_1(), "rule__DataClass__StructorsAssignment_9_1"); - put(grammarAccess.getDataClassAccess().getOperationsAssignment_9_2(), "rule__DataClass__OperationsAssignment_9_2"); + put(grammarAccess.getDataClassAccess().getAttributesAssignment_9_2(), "rule__DataClass__AttributesAssignment_9_2"); put(grammarAccess.getAttributeAccess().getNameAssignment_1(), "rule__Attribute__NameAssignment_1"); put(grammarAccess.getAttributeAccess().getSizeAssignment_2_1(), "rule__Attribute__SizeAssignment_2_1"); put(grammarAccess.getAttributeAccess().getTypeAssignment_4(), "rule__Attribute__TypeAssignment_4"); @@ -346,9 +346,9 @@ public class RoomParser extends AbstractContentAssistParser { put(grammarAccess.getMessageAccess().getDataAssignment_4(), "rule__Message__DataAssignment_4"); put(grammarAccess.getMessageAccess().getDocuAssignment_6(), "rule__Message__DocuAssignment_6"); put(grammarAccess.getPortClassAccess().getUserCodeAssignment_2_1(), "rule__PortClass__UserCodeAssignment_2_1"); - put(grammarAccess.getPortClassAccess().getAttributesAssignment_3_0(), "rule__PortClass__AttributesAssignment_3_0"); + put(grammarAccess.getPortClassAccess().getMsgHandlersAssignment_3_0(), "rule__PortClass__MsgHandlersAssignment_3_0"); put(grammarAccess.getPortClassAccess().getOperationsAssignment_3_1(), "rule__PortClass__OperationsAssignment_3_1"); - put(grammarAccess.getPortClassAccess().getMsgHandlersAssignment_3_2(), "rule__PortClass__MsgHandlersAssignment_3_2"); + put(grammarAccess.getPortClassAccess().getAttributesAssignment_3_2(), "rule__PortClass__AttributesAssignment_3_2"); put(grammarAccess.getInMessageHandlerAccess().getMsgAssignment_2(), "rule__InMessageHandler__MsgAssignment_2"); put(grammarAccess.getInMessageHandlerAccess().getDetailCodeAssignment_3(), "rule__InMessageHandler__DetailCodeAssignment_3"); put(grammarAccess.getOutMessageHandlerAccess().getMsgAssignment_2(), "rule__OutMessageHandler__MsgAssignment_2"); @@ -359,24 +359,24 @@ public class RoomParser extends AbstractContentAssistParser { put(grammarAccess.getActorClassAccess().getDocuAssignment_3(), "rule__ActorClass__DocuAssignment_3"); put(grammarAccess.getActorClassAccess().getBaseAssignment_4_1(), "rule__ActorClass__BaseAssignment_4_1"); put(grammarAccess.getActorClassAccess().getAnnotationsAssignment_6(), "rule__ActorClass__AnnotationsAssignment_6"); - put(grammarAccess.getActorClassAccess().getInterfacePortsAssignment_7_2_0(), "rule__ActorClass__InterfacePortsAssignment_7_2_0"); - put(grammarAccess.getActorClassAccess().getServiceProvisionPointsAssignment_7_2_1(), "rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1"); + put(grammarAccess.getActorClassAccess().getServiceProvisionPointsAssignment_7_2_0(), "rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0"); + put(grammarAccess.getActorClassAccess().getInterfacePortsAssignment_7_2_1(), "rule__ActorClass__InterfacePortsAssignment_7_2_1"); put(grammarAccess.getActorClassAccess().getStructureDocuAssignment_8_1(), "rule__ActorClass__StructureDocuAssignment_8_1"); put(grammarAccess.getActorClassAccess().getUserCode1Assignment_8_3_1(), "rule__ActorClass__UserCode1Assignment_8_3_1"); put(grammarAccess.getActorClassAccess().getUserCode2Assignment_8_4_1(), "rule__ActorClass__UserCode2Assignment_8_4_1"); put(grammarAccess.getActorClassAccess().getUserCode3Assignment_8_5_1(), "rule__ActorClass__UserCode3Assignment_8_5_1"); - put(grammarAccess.getActorClassAccess().getInternalPortsAssignment_8_6_0(), "rule__ActorClass__InternalPortsAssignment_8_6_0"); - put(grammarAccess.getActorClassAccess().getExternalPortsAssignment_8_6_1(), "rule__ActorClass__ExternalPortsAssignment_8_6_1"); - put(grammarAccess.getActorClassAccess().getServiceAccessPointsAssignment_8_6_2(), "rule__ActorClass__ServiceAccessPointsAssignment_8_6_2"); + put(grammarAccess.getActorClassAccess().getConnectionsAssignment_8_6_0(), "rule__ActorClass__ConnectionsAssignment_8_6_0"); + put(grammarAccess.getActorClassAccess().getBindingsAssignment_8_6_1(), "rule__ActorClass__BindingsAssignment_8_6_1"); + put(grammarAccess.getActorClassAccess().getServiceImplementationsAssignment_8_6_2(), "rule__ActorClass__ServiceImplementationsAssignment_8_6_2"); put(grammarAccess.getActorClassAccess().getAttributesAssignment_8_6_3(), "rule__ActorClass__AttributesAssignment_8_6_3"); put(grammarAccess.getActorClassAccess().getActorRefsAssignment_8_6_4(), "rule__ActorClass__ActorRefsAssignment_8_6_4"); - put(grammarAccess.getActorClassAccess().getServiceImplementationsAssignment_8_6_5(), "rule__ActorClass__ServiceImplementationsAssignment_8_6_5"); - put(grammarAccess.getActorClassAccess().getBindingsAssignment_8_6_6(), "rule__ActorClass__BindingsAssignment_8_6_6"); - put(grammarAccess.getActorClassAccess().getConnectionsAssignment_8_6_7(), "rule__ActorClass__ConnectionsAssignment_8_6_7"); + put(grammarAccess.getActorClassAccess().getServiceAccessPointsAssignment_8_6_5(), "rule__ActorClass__ServiceAccessPointsAssignment_8_6_5"); + put(grammarAccess.getActorClassAccess().getInternalPortsAssignment_8_6_6(), "rule__ActorClass__InternalPortsAssignment_8_6_6"); + put(grammarAccess.getActorClassAccess().getExternalPortsAssignment_8_6_7(), "rule__ActorClass__ExternalPortsAssignment_8_6_7"); put(grammarAccess.getActorClassAccess().getBehaviorDocuAssignment_9_1(), "rule__ActorClass__BehaviorDocuAssignment_9_1"); put(grammarAccess.getActorClassAccess().getBehaviorAnnotationsAssignment_9_3(), "rule__ActorClass__BehaviorAnnotationsAssignment_9_3"); - put(grammarAccess.getActorClassAccess().getStructorsAssignment_9_4_0(), "rule__ActorClass__StructorsAssignment_9_4_0"); - put(grammarAccess.getActorClassAccess().getOperationsAssignment_9_4_1(), "rule__ActorClass__OperationsAssignment_9_4_1"); + put(grammarAccess.getActorClassAccess().getOperationsAssignment_9_4_0(), "rule__ActorClass__OperationsAssignment_9_4_0"); + put(grammarAccess.getActorClassAccess().getStructorsAssignment_9_4_1(), "rule__ActorClass__StructorsAssignment_9_4_1"); put(grammarAccess.getActorClassAccess().getStateMachineAssignment_9_5(), "rule__ActorClass__StateMachineAssignment_9_5"); put(grammarAccess.getPortAccess().getConjugatedAssignment_0(), "rule__Port__ConjugatedAssignment_0"); put(grammarAccess.getPortAccess().getNameAssignment_2(), "rule__Port__NameAssignment_2"); @@ -392,9 +392,9 @@ public class RoomParser extends AbstractContentAssistParser { put(grammarAccess.getLogicalSystemAccess().getNameAssignment_1(), "rule__LogicalSystem__NameAssignment_1"); put(grammarAccess.getLogicalSystemAccess().getDocuAssignment_2(), "rule__LogicalSystem__DocuAssignment_2"); put(grammarAccess.getLogicalSystemAccess().getAnnotationsAssignment_4(), "rule__LogicalSystem__AnnotationsAssignment_4"); - put(grammarAccess.getLogicalSystemAccess().getSubSystemsAssignment_5_0(), "rule__LogicalSystem__SubSystemsAssignment_5_0"); + put(grammarAccess.getLogicalSystemAccess().getConnectionsAssignment_5_0(), "rule__LogicalSystem__ConnectionsAssignment_5_0"); put(grammarAccess.getLogicalSystemAccess().getBindingsAssignment_5_1(), "rule__LogicalSystem__BindingsAssignment_5_1"); - put(grammarAccess.getLogicalSystemAccess().getConnectionsAssignment_5_2(), "rule__LogicalSystem__ConnectionsAssignment_5_2"); + put(grammarAccess.getLogicalSystemAccess().getSubSystemsAssignment_5_2(), "rule__LogicalSystem__SubSystemsAssignment_5_2"); put(grammarAccess.getSubSystemRefAccess().getNameAssignment_1(), "rule__SubSystemRef__NameAssignment_1"); put(grammarAccess.getSubSystemRefAccess().getTypeAssignment_3(), "rule__SubSystemRef__TypeAssignment_3"); put(grammarAccess.getSubSystemRefAccess().getDocuAssignment_4(), "rule__SubSystemRef__DocuAssignment_4"); @@ -404,13 +404,13 @@ public class RoomParser extends AbstractContentAssistParser { put(grammarAccess.getSubSystemClassAccess().getUserCode1Assignment_5_1(), "rule__SubSystemClass__UserCode1Assignment_5_1"); put(grammarAccess.getSubSystemClassAccess().getUserCode2Assignment_6_1(), "rule__SubSystemClass__UserCode2Assignment_6_1"); put(grammarAccess.getSubSystemClassAccess().getUserCode3Assignment_7_1(), "rule__SubSystemClass__UserCode3Assignment_7_1"); - put(grammarAccess.getSubSystemClassAccess().getRelayPortsAssignment_8_0(), "rule__SubSystemClass__RelayPortsAssignment_8_0"); - put(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsAssignment_8_1(), "rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1"); - put(grammarAccess.getSubSystemClassAccess().getActorRefsAssignment_8_2(), "rule__SubSystemClass__ActorRefsAssignment_8_2"); + put(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsAssignment_8_0(), "rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0"); + put(grammarAccess.getSubSystemClassAccess().getThreadsAssignment_8_1(), "rule__SubSystemClass__ThreadsAssignment_8_1"); + put(grammarAccess.getSubSystemClassAccess().getConnectionsAssignment_8_2(), "rule__SubSystemClass__ConnectionsAssignment_8_2"); put(grammarAccess.getSubSystemClassAccess().getBindingsAssignment_8_3(), "rule__SubSystemClass__BindingsAssignment_8_3"); - put(grammarAccess.getSubSystemClassAccess().getConnectionsAssignment_8_4(), "rule__SubSystemClass__ConnectionsAssignment_8_4"); - put(grammarAccess.getSubSystemClassAccess().getThreadsAssignment_8_5(), "rule__SubSystemClass__ThreadsAssignment_8_5"); - put(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsAssignment_8_6(), "rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6"); + put(grammarAccess.getSubSystemClassAccess().getActorRefsAssignment_8_4(), "rule__SubSystemClass__ActorRefsAssignment_8_4"); + put(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsAssignment_8_5(), "rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5"); + put(grammarAccess.getSubSystemClassAccess().getRelayPortsAssignment_8_6(), "rule__SubSystemClass__RelayPortsAssignment_8_6"); put(grammarAccess.getLogicalThreadAccess().getNameAssignment_1(), "rule__LogicalThread__NameAssignment_1"); put(grammarAccess.getActorInstanceMappingAccess().getPathAssignment_1(), "rule__ActorInstanceMapping__PathAssignment_1"); put(grammarAccess.getActorInstanceMappingAccess().getThreadAssignment_3(), "rule__ActorInstanceMapping__ThreadAssignment_3"); diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g index d3af59295..1a9c35541 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g +++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g @@ -3360,9 +3360,9 @@ rule__DataClass__Alternatives_9 } : ( -{ before(grammarAccess.getDataClassAccess().getAttributesAssignment_9_0()); } -(rule__DataClass__AttributesAssignment_9_0) -{ after(grammarAccess.getDataClassAccess().getAttributesAssignment_9_0()); } +{ before(grammarAccess.getDataClassAccess().getOperationsAssignment_9_0()); } +(rule__DataClass__OperationsAssignment_9_0) +{ after(grammarAccess.getDataClassAccess().getOperationsAssignment_9_0()); } ) |( @@ -3372,9 +3372,9 @@ rule__DataClass__Alternatives_9 ) |( -{ before(grammarAccess.getDataClassAccess().getOperationsAssignment_9_2()); } -(rule__DataClass__OperationsAssignment_9_2) -{ after(grammarAccess.getDataClassAccess().getOperationsAssignment_9_2()); } +{ before(grammarAccess.getDataClassAccess().getAttributesAssignment_9_2()); } +(rule__DataClass__AttributesAssignment_9_2) +{ after(grammarAccess.getDataClassAccess().getAttributesAssignment_9_2()); } ) ; @@ -3507,9 +3507,9 @@ rule__PortClass__Alternatives_3 } : ( -{ before(grammarAccess.getPortClassAccess().getAttributesAssignment_3_0()); } -(rule__PortClass__AttributesAssignment_3_0) -{ after(grammarAccess.getPortClassAccess().getAttributesAssignment_3_0()); } +{ before(grammarAccess.getPortClassAccess().getMsgHandlersAssignment_3_0()); } +(rule__PortClass__MsgHandlersAssignment_3_0) +{ after(grammarAccess.getPortClassAccess().getMsgHandlersAssignment_3_0()); } ) |( @@ -3519,9 +3519,9 @@ rule__PortClass__Alternatives_3 ) |( -{ before(grammarAccess.getPortClassAccess().getMsgHandlersAssignment_3_2()); } -(rule__PortClass__MsgHandlersAssignment_3_2) -{ after(grammarAccess.getPortClassAccess().getMsgHandlersAssignment_3_2()); } +{ before(grammarAccess.getPortClassAccess().getAttributesAssignment_3_2()); } +(rule__PortClass__AttributesAssignment_3_2) +{ after(grammarAccess.getPortClassAccess().getAttributesAssignment_3_2()); } ) ; @@ -3557,15 +3557,15 @@ rule__ActorClass__Alternatives_7_2 } : ( -{ before(grammarAccess.getActorClassAccess().getInterfacePortsAssignment_7_2_0()); } -(rule__ActorClass__InterfacePortsAssignment_7_2_0) -{ after(grammarAccess.getActorClassAccess().getInterfacePortsAssignment_7_2_0()); } +{ before(grammarAccess.getActorClassAccess().getServiceProvisionPointsAssignment_7_2_0()); } +(rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0) +{ after(grammarAccess.getActorClassAccess().getServiceProvisionPointsAssignment_7_2_0()); } ) |( -{ before(grammarAccess.getActorClassAccess().getServiceProvisionPointsAssignment_7_2_1()); } -(rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1) -{ after(grammarAccess.getActorClassAccess().getServiceProvisionPointsAssignment_7_2_1()); } +{ before(grammarAccess.getActorClassAccess().getInterfacePortsAssignment_7_2_1()); } +(rule__ActorClass__InterfacePortsAssignment_7_2_1) +{ after(grammarAccess.getActorClassAccess().getInterfacePortsAssignment_7_2_1()); } ) ; @@ -3579,21 +3579,21 @@ rule__ActorClass__Alternatives_8_6 } : ( -{ before(grammarAccess.getActorClassAccess().getInternalPortsAssignment_8_6_0()); } -(rule__ActorClass__InternalPortsAssignment_8_6_0) -{ after(grammarAccess.getActorClassAccess().getInternalPortsAssignment_8_6_0()); } +{ before(grammarAccess.getActorClassAccess().getConnectionsAssignment_8_6_0()); } +(rule__ActorClass__ConnectionsAssignment_8_6_0) +{ after(grammarAccess.getActorClassAccess().getConnectionsAssignment_8_6_0()); } ) |( -{ before(grammarAccess.getActorClassAccess().getExternalPortsAssignment_8_6_1()); } -(rule__ActorClass__ExternalPortsAssignment_8_6_1) -{ after(grammarAccess.getActorClassAccess().getExternalPortsAssignment_8_6_1()); } +{ before(grammarAccess.getActorClassAccess().getBindingsAssignment_8_6_1()); } +(rule__ActorClass__BindingsAssignment_8_6_1) +{ after(grammarAccess.getActorClassAccess().getBindingsAssignment_8_6_1()); } ) |( -{ before(grammarAccess.getActorClassAccess().getServiceAccessPointsAssignment_8_6_2()); } -(rule__ActorClass__ServiceAccessPointsAssignment_8_6_2) -{ after(grammarAccess.getActorClassAccess().getServiceAccessPointsAssignment_8_6_2()); } +{ before(grammarAccess.getActorClassAccess().getServiceImplementationsAssignment_8_6_2()); } +(rule__ActorClass__ServiceImplementationsAssignment_8_6_2) +{ after(grammarAccess.getActorClassAccess().getServiceImplementationsAssignment_8_6_2()); } ) |( @@ -3609,21 +3609,21 @@ rule__ActorClass__Alternatives_8_6 ) |( -{ before(grammarAccess.getActorClassAccess().getServiceImplementationsAssignment_8_6_5()); } -(rule__ActorClass__ServiceImplementationsAssignment_8_6_5) -{ after(grammarAccess.getActorClassAccess().getServiceImplementationsAssignment_8_6_5()); } +{ before(grammarAccess.getActorClassAccess().getServiceAccessPointsAssignment_8_6_5()); } +(rule__ActorClass__ServiceAccessPointsAssignment_8_6_5) +{ after(grammarAccess.getActorClassAccess().getServiceAccessPointsAssignment_8_6_5()); } ) |( -{ before(grammarAccess.getActorClassAccess().getBindingsAssignment_8_6_6()); } -(rule__ActorClass__BindingsAssignment_8_6_6) -{ after(grammarAccess.getActorClassAccess().getBindingsAssignment_8_6_6()); } +{ before(grammarAccess.getActorClassAccess().getInternalPortsAssignment_8_6_6()); } +(rule__ActorClass__InternalPortsAssignment_8_6_6) +{ after(grammarAccess.getActorClassAccess().getInternalPortsAssignment_8_6_6()); } ) |( -{ before(grammarAccess.getActorClassAccess().getConnectionsAssignment_8_6_7()); } -(rule__ActorClass__ConnectionsAssignment_8_6_7) -{ after(grammarAccess.getActorClassAccess().getConnectionsAssignment_8_6_7()); } +{ before(grammarAccess.getActorClassAccess().getExternalPortsAssignment_8_6_7()); } +(rule__ActorClass__ExternalPortsAssignment_8_6_7) +{ after(grammarAccess.getActorClassAccess().getExternalPortsAssignment_8_6_7()); } ) ; @@ -3637,15 +3637,15 @@ rule__ActorClass__Alternatives_9_4 } : ( -{ before(grammarAccess.getActorClassAccess().getStructorsAssignment_9_4_0()); } -(rule__ActorClass__StructorsAssignment_9_4_0) -{ after(grammarAccess.getActorClassAccess().getStructorsAssignment_9_4_0()); } +{ before(grammarAccess.getActorClassAccess().getOperationsAssignment_9_4_0()); } +(rule__ActorClass__OperationsAssignment_9_4_0) +{ after(grammarAccess.getActorClassAccess().getOperationsAssignment_9_4_0()); } ) |( -{ before(grammarAccess.getActorClassAccess().getOperationsAssignment_9_4_1()); } -(rule__ActorClass__OperationsAssignment_9_4_1) -{ after(grammarAccess.getActorClassAccess().getOperationsAssignment_9_4_1()); } +{ before(grammarAccess.getActorClassAccess().getStructorsAssignment_9_4_1()); } +(rule__ActorClass__StructorsAssignment_9_4_1) +{ after(grammarAccess.getActorClassAccess().getStructorsAssignment_9_4_1()); } ) ; @@ -3687,9 +3687,9 @@ rule__LogicalSystem__Alternatives_5 } : ( -{ before(grammarAccess.getLogicalSystemAccess().getSubSystemsAssignment_5_0()); } -(rule__LogicalSystem__SubSystemsAssignment_5_0) -{ after(grammarAccess.getLogicalSystemAccess().getSubSystemsAssignment_5_0()); } +{ before(grammarAccess.getLogicalSystemAccess().getConnectionsAssignment_5_0()); } +(rule__LogicalSystem__ConnectionsAssignment_5_0) +{ after(grammarAccess.getLogicalSystemAccess().getConnectionsAssignment_5_0()); } ) |( @@ -3699,9 +3699,9 @@ rule__LogicalSystem__Alternatives_5 ) |( -{ before(grammarAccess.getLogicalSystemAccess().getConnectionsAssignment_5_2()); } -(rule__LogicalSystem__ConnectionsAssignment_5_2) -{ after(grammarAccess.getLogicalSystemAccess().getConnectionsAssignment_5_2()); } +{ before(grammarAccess.getLogicalSystemAccess().getSubSystemsAssignment_5_2()); } +(rule__LogicalSystem__SubSystemsAssignment_5_2) +{ after(grammarAccess.getLogicalSystemAccess().getSubSystemsAssignment_5_2()); } ) ; @@ -3716,21 +3716,21 @@ rule__SubSystemClass__Alternatives_8 } : ( -{ before(grammarAccess.getSubSystemClassAccess().getRelayPortsAssignment_8_0()); } -(rule__SubSystemClass__RelayPortsAssignment_8_0) -{ after(grammarAccess.getSubSystemClassAccess().getRelayPortsAssignment_8_0()); } +{ before(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsAssignment_8_0()); } +(rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0) +{ after(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsAssignment_8_0()); } ) |( -{ before(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsAssignment_8_1()); } -(rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1) -{ after(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsAssignment_8_1()); } +{ before(grammarAccess.getSubSystemClassAccess().getThreadsAssignment_8_1()); } +(rule__SubSystemClass__ThreadsAssignment_8_1) +{ after(grammarAccess.getSubSystemClassAccess().getThreadsAssignment_8_1()); } ) |( -{ before(grammarAccess.getSubSystemClassAccess().getActorRefsAssignment_8_2()); } -(rule__SubSystemClass__ActorRefsAssignment_8_2) -{ after(grammarAccess.getSubSystemClassAccess().getActorRefsAssignment_8_2()); } +{ before(grammarAccess.getSubSystemClassAccess().getConnectionsAssignment_8_2()); } +(rule__SubSystemClass__ConnectionsAssignment_8_2) +{ after(grammarAccess.getSubSystemClassAccess().getConnectionsAssignment_8_2()); } ) |( @@ -3740,21 +3740,21 @@ rule__SubSystemClass__Alternatives_8 ) |( -{ before(grammarAccess.getSubSystemClassAccess().getConnectionsAssignment_8_4()); } -(rule__SubSystemClass__ConnectionsAssignment_8_4) -{ after(grammarAccess.getSubSystemClassAccess().getConnectionsAssignment_8_4()); } +{ before(grammarAccess.getSubSystemClassAccess().getActorRefsAssignment_8_4()); } +(rule__SubSystemClass__ActorRefsAssignment_8_4) +{ after(grammarAccess.getSubSystemClassAccess().getActorRefsAssignment_8_4()); } ) |( -{ before(grammarAccess.getSubSystemClassAccess().getThreadsAssignment_8_5()); } -(rule__SubSystemClass__ThreadsAssignment_8_5) -{ after(grammarAccess.getSubSystemClassAccess().getThreadsAssignment_8_5()); } +{ before(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsAssignment_8_5()); } +(rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5) +{ after(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsAssignment_8_5()); } ) |( -{ before(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsAssignment_8_6()); } -(rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6) -{ after(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsAssignment_8_6()); } +{ before(grammarAccess.getSubSystemClassAccess().getRelayPortsAssignment_8_6()); } +(rule__SubSystemClass__RelayPortsAssignment_8_6) +{ after(grammarAccess.getSubSystemClassAccess().getRelayPortsAssignment_8_6()); } ) ; @@ -24105,14 +24105,14 @@ finally { restoreStackSize(stackSize); } -rule__DataClass__AttributesAssignment_9_0 +rule__DataClass__OperationsAssignment_9_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_0_0()); } - ruleAttribute{ after(grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_0_0()); } +{ before(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_0_0()); } + ruleStandardOperation{ after(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_0_0()); } ) ; @@ -24135,14 +24135,14 @@ finally { restoreStackSize(stackSize); } -rule__DataClass__OperationsAssignment_9_2 +rule__DataClass__AttributesAssignment_9_2 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_2_0()); } - ruleStandardOperation{ after(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_2_0()); } +{ before(grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_2_0()); } + ruleAttribute{ after(grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_2_0()); } ) ; @@ -24854,14 +24854,14 @@ finally { restoreStackSize(stackSize); } -rule__PortClass__AttributesAssignment_3_0 +rule__PortClass__MsgHandlersAssignment_3_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_0_0()); } - ruleAttribute{ after(grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_0_0()); } +{ before(grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_0_0()); } + ruleMessageHandler{ after(grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_0_0()); } ) ; @@ -24884,14 +24884,14 @@ finally { restoreStackSize(stackSize); } -rule__PortClass__MsgHandlersAssignment_3_2 +rule__PortClass__AttributesAssignment_3_2 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_2_0()); } - ruleMessageHandler{ after(grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_2_0()); } +{ before(grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_2_0()); } + ruleAttribute{ after(grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_2_0()); } ) ; @@ -25069,14 +25069,14 @@ finally { restoreStackSize(stackSize); } -rule__ActorClass__InterfacePortsAssignment_7_2_0 +rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_0_0()); } - rulePort{ after(grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_0_0()); } +{ before(grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_0_0()); } + ruleSPP{ after(grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_0_0()); } ) ; @@ -25084,14 +25084,14 @@ finally { restoreStackSize(stackSize); } -rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1 +rule__ActorClass__InterfacePortsAssignment_7_2_1 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_1_0()); } - ruleSPP{ after(grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_1_0()); } +{ before(grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_1_0()); } + rulePort{ after(grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_1_0()); } ) ; @@ -25159,14 +25159,14 @@ finally { restoreStackSize(stackSize); } -rule__ActorClass__InternalPortsAssignment_8_6_0 +rule__ActorClass__ConnectionsAssignment_8_6_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_0_0()); } - rulePort{ after(grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_0_0()); } +{ before(grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_0_0()); } + ruleLayerConnection{ after(grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_0_0()); } ) ; @@ -25174,14 +25174,14 @@ finally { restoreStackSize(stackSize); } -rule__ActorClass__ExternalPortsAssignment_8_6_1 +rule__ActorClass__BindingsAssignment_8_6_1 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_1_0()); } - ruleExternalPort{ after(grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_1_0()); } +{ before(grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_1_0()); } + ruleBinding{ after(grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_1_0()); } ) ; @@ -25189,14 +25189,14 @@ finally { restoreStackSize(stackSize); } -rule__ActorClass__ServiceAccessPointsAssignment_8_6_2 +rule__ActorClass__ServiceImplementationsAssignment_8_6_2 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_2_0()); } - ruleSAP{ after(grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_2_0()); } +{ before(grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_2_0()); } + ruleServiceImplementation{ after(grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_2_0()); } ) ; @@ -25234,14 +25234,14 @@ finally { restoreStackSize(stackSize); } -rule__ActorClass__ServiceImplementationsAssignment_8_6_5 +rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_5_0()); } - ruleServiceImplementation{ after(grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_5_0()); } +{ before(grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_5_0()); } + ruleSAP{ after(grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_5_0()); } ) ; @@ -25249,14 +25249,14 @@ finally { restoreStackSize(stackSize); } -rule__ActorClass__BindingsAssignment_8_6_6 +rule__ActorClass__InternalPortsAssignment_8_6_6 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_6_0()); } - ruleBinding{ after(grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_6_0()); } +{ before(grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_6_0()); } + rulePort{ after(grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_6_0()); } ) ; @@ -25264,14 +25264,14 @@ finally { restoreStackSize(stackSize); } -rule__ActorClass__ConnectionsAssignment_8_6_7 +rule__ActorClass__ExternalPortsAssignment_8_6_7 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_7_0()); } - ruleLayerConnection{ after(grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_7_0()); } +{ before(grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_7_0()); } + ruleExternalPort{ after(grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_7_0()); } ) ; @@ -25309,14 +25309,14 @@ finally { restoreStackSize(stackSize); } -rule__ActorClass__StructorsAssignment_9_4_0 +rule__ActorClass__OperationsAssignment_9_4_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_0_0()); } - ruleClassStructor{ after(grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_0_0()); } +{ before(grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_0_0()); } + ruleStandardOperation{ after(grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_0_0()); } ) ; @@ -25324,14 +25324,14 @@ finally { restoreStackSize(stackSize); } -rule__ActorClass__OperationsAssignment_9_4_1 +rule__ActorClass__StructorsAssignment_9_4_1 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_1_0()); } - ruleStandardOperation{ after(grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_1_0()); } +{ before(grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_1_0()); } + ruleClassStructor{ after(grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_1_0()); } ) ; @@ -25592,14 +25592,14 @@ finally { restoreStackSize(stackSize); } -rule__LogicalSystem__SubSystemsAssignment_5_0 +rule__LogicalSystem__ConnectionsAssignment_5_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_0_0()); } - ruleSubSystemRef{ after(grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_0_0()); } +{ before(grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_0_0()); } + ruleLayerConnection{ after(grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_0_0()); } ) ; @@ -25622,14 +25622,14 @@ finally { restoreStackSize(stackSize); } -rule__LogicalSystem__ConnectionsAssignment_5_2 +rule__LogicalSystem__SubSystemsAssignment_5_2 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_2_0()); } - ruleLayerConnection{ after(grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_2_0()); } +{ before(grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_2_0()); } + ruleSubSystemRef{ after(grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_2_0()); } ) ; @@ -25776,14 +25776,14 @@ finally { restoreStackSize(stackSize); } -rule__SubSystemClass__RelayPortsAssignment_8_0 +rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_0_0()); } - rulePort{ after(grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_0_0()); } +{ before(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_0_0()); } + ruleActorInstanceMapping{ after(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_0_0()); } ) ; @@ -25791,14 +25791,14 @@ finally { restoreStackSize(stackSize); } -rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1 +rule__SubSystemClass__ThreadsAssignment_8_1 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_1_0()); } - ruleSPP{ after(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_1_0()); } +{ before(grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_1_0()); } + ruleLogicalThread{ after(grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_1_0()); } ) ; @@ -25806,14 +25806,14 @@ finally { restoreStackSize(stackSize); } -rule__SubSystemClass__ActorRefsAssignment_8_2 +rule__SubSystemClass__ConnectionsAssignment_8_2 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_2_0()); } - ruleActorRef{ after(grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_2_0()); } +{ before(grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_2_0()); } + ruleLayerConnection{ after(grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_2_0()); } ) ; @@ -25836,14 +25836,14 @@ finally { restoreStackSize(stackSize); } -rule__SubSystemClass__ConnectionsAssignment_8_4 +rule__SubSystemClass__ActorRefsAssignment_8_4 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_4_0()); } - ruleLayerConnection{ after(grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_4_0()); } +{ before(grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_4_0()); } + ruleActorRef{ after(grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_4_0()); } ) ; @@ -25851,14 +25851,14 @@ finally { restoreStackSize(stackSize); } -rule__SubSystemClass__ThreadsAssignment_8_5 +rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_5_0()); } - ruleLogicalThread{ after(grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_5_0()); } +{ before(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_5_0()); } + ruleSPP{ after(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_5_0()); } ) ; @@ -25866,14 +25866,14 @@ finally { restoreStackSize(stackSize); } -rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6 +rule__SubSystemClass__RelayPortsAssignment_8_6 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_6_0()); } - ruleActorInstanceMapping{ after(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_6_0()); } +{ before(grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_6_0()); } + rulePort{ after(grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_6_0()); } ) ; diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java index da1583fc3..a68fed4b6 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java +++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java @@ -9248,16 +9248,17 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR start "rule__DataClass__Alternatives_9" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3357:1: rule__DataClass__Alternatives_9 : ( ( ( rule__DataClass__AttributesAssignment_9_0 ) ) | ( ( rule__DataClass__StructorsAssignment_9_1 ) ) | ( ( rule__DataClass__OperationsAssignment_9_2 ) ) ); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3357:1: rule__DataClass__Alternatives_9 : ( ( ( rule__DataClass__OperationsAssignment_9_0 ) ) | ( ( rule__DataClass__StructorsAssignment_9_1 ) ) | ( ( rule__DataClass__AttributesAssignment_9_2 ) ) ); public final void rule__DataClass__Alternatives_9() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3361:1: ( ( ( rule__DataClass__AttributesAssignment_9_0 ) ) | ( ( rule__DataClass__StructorsAssignment_9_1 ) ) | ( ( rule__DataClass__OperationsAssignment_9_2 ) ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3361:1: ( ( ( rule__DataClass__OperationsAssignment_9_0 ) ) | ( ( rule__DataClass__StructorsAssignment_9_1 ) ) | ( ( rule__DataClass__AttributesAssignment_9_2 ) ) ) int alt6=3; switch ( input.LA(1) ) { - case 57: + case 60: + case 126: { alt6=1; } @@ -9268,8 +9269,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { alt6=2; } break; - case 60: - case 126: + case 57: { alt6=3; } @@ -9283,24 +9283,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { switch (alt6) { case 1 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3362:1: ( ( rule__DataClass__AttributesAssignment_9_0 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3362:1: ( ( rule__DataClass__OperationsAssignment_9_0 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3362:1: ( ( rule__DataClass__AttributesAssignment_9_0 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3363:1: ( rule__DataClass__AttributesAssignment_9_0 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3362:1: ( ( rule__DataClass__OperationsAssignment_9_0 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3363:1: ( rule__DataClass__OperationsAssignment_9_0 ) { - before(grammarAccess.getDataClassAccess().getAttributesAssignment_9_0()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3364:1: ( rule__DataClass__AttributesAssignment_9_0 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3364:2: rule__DataClass__AttributesAssignment_9_0 + before(grammarAccess.getDataClassAccess().getOperationsAssignment_9_0()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3364:1: ( rule__DataClass__OperationsAssignment_9_0 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3364:2: rule__DataClass__OperationsAssignment_9_0 { - pushFollow(FOLLOW_rule__DataClass__AttributesAssignment_9_0_in_rule__DataClass__Alternatives_97095); - rule__DataClass__AttributesAssignment_9_0(); + pushFollow(FOLLOW_rule__DataClass__OperationsAssignment_9_0_in_rule__DataClass__Alternatives_97095); + rule__DataClass__OperationsAssignment_9_0(); state._fsp--; } - after(grammarAccess.getDataClassAccess().getAttributesAssignment_9_0()); + after(grammarAccess.getDataClassAccess().getOperationsAssignment_9_0()); } @@ -9333,24 +9333,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 3 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3374:6: ( ( rule__DataClass__OperationsAssignment_9_2 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3374:6: ( ( rule__DataClass__AttributesAssignment_9_2 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3374:6: ( ( rule__DataClass__OperationsAssignment_9_2 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3375:1: ( rule__DataClass__OperationsAssignment_9_2 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3374:6: ( ( rule__DataClass__AttributesAssignment_9_2 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3375:1: ( rule__DataClass__AttributesAssignment_9_2 ) { - before(grammarAccess.getDataClassAccess().getOperationsAssignment_9_2()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3376:1: ( rule__DataClass__OperationsAssignment_9_2 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3376:2: rule__DataClass__OperationsAssignment_9_2 + before(grammarAccess.getDataClassAccess().getAttributesAssignment_9_2()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3376:1: ( rule__DataClass__AttributesAssignment_9_2 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3376:2: rule__DataClass__AttributesAssignment_9_2 { - pushFollow(FOLLOW_rule__DataClass__OperationsAssignment_9_2_in_rule__DataClass__Alternatives_97131); - rule__DataClass__OperationsAssignment_9_2(); + pushFollow(FOLLOW_rule__DataClass__AttributesAssignment_9_2_in_rule__DataClass__Alternatives_97131); + rule__DataClass__AttributesAssignment_9_2(); state._fsp--; } - after(grammarAccess.getDataClassAccess().getOperationsAssignment_9_2()); + after(grammarAccess.getDataClassAccess().getAttributesAssignment_9_2()); } @@ -9778,16 +9778,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR start "rule__PortClass__Alternatives_3" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3504:1: rule__PortClass__Alternatives_3 : ( ( ( rule__PortClass__AttributesAssignment_3_0 ) ) | ( ( rule__PortClass__OperationsAssignment_3_1 ) ) | ( ( rule__PortClass__MsgHandlersAssignment_3_2 ) ) ); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3504:1: rule__PortClass__Alternatives_3 : ( ( ( rule__PortClass__MsgHandlersAssignment_3_0 ) ) | ( ( rule__PortClass__OperationsAssignment_3_1 ) ) | ( ( rule__PortClass__AttributesAssignment_3_2 ) ) ); public final void rule__PortClass__Alternatives_3() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3508:1: ( ( ( rule__PortClass__AttributesAssignment_3_0 ) ) | ( ( rule__PortClass__OperationsAssignment_3_1 ) ) | ( ( rule__PortClass__MsgHandlersAssignment_3_2 ) ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3508:1: ( ( ( rule__PortClass__MsgHandlersAssignment_3_0 ) ) | ( ( rule__PortClass__OperationsAssignment_3_1 ) ) | ( ( rule__PortClass__AttributesAssignment_3_2 ) ) ) int alt12=3; switch ( input.LA(1) ) { - case 57: + case 70: { alt12=1; } @@ -9797,7 +9797,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { alt12=2; } break; - case 70: + case 57: { alt12=3; } @@ -9811,24 +9811,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { switch (alt12) { case 1 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3509:1: ( ( rule__PortClass__AttributesAssignment_3_0 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3509:1: ( ( rule__PortClass__MsgHandlersAssignment_3_0 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3509:1: ( ( rule__PortClass__AttributesAssignment_3_0 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3510:1: ( rule__PortClass__AttributesAssignment_3_0 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3509:1: ( ( rule__PortClass__MsgHandlersAssignment_3_0 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3510:1: ( rule__PortClass__MsgHandlersAssignment_3_0 ) { - before(grammarAccess.getPortClassAccess().getAttributesAssignment_3_0()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3511:1: ( rule__PortClass__AttributesAssignment_3_0 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3511:2: rule__PortClass__AttributesAssignment_3_0 + before(grammarAccess.getPortClassAccess().getMsgHandlersAssignment_3_0()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3511:1: ( rule__PortClass__MsgHandlersAssignment_3_0 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3511:2: rule__PortClass__MsgHandlersAssignment_3_0 { - pushFollow(FOLLOW_rule__PortClass__AttributesAssignment_3_0_in_rule__PortClass__Alternatives_37426); - rule__PortClass__AttributesAssignment_3_0(); + pushFollow(FOLLOW_rule__PortClass__MsgHandlersAssignment_3_0_in_rule__PortClass__Alternatives_37426); + rule__PortClass__MsgHandlersAssignment_3_0(); state._fsp--; } - after(grammarAccess.getPortClassAccess().getAttributesAssignment_3_0()); + after(grammarAccess.getPortClassAccess().getMsgHandlersAssignment_3_0()); } @@ -9861,24 +9861,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 3 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3521:6: ( ( rule__PortClass__MsgHandlersAssignment_3_2 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3521:6: ( ( rule__PortClass__AttributesAssignment_3_2 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3521:6: ( ( rule__PortClass__MsgHandlersAssignment_3_2 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3522:1: ( rule__PortClass__MsgHandlersAssignment_3_2 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3521:6: ( ( rule__PortClass__AttributesAssignment_3_2 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3522:1: ( rule__PortClass__AttributesAssignment_3_2 ) { - before(grammarAccess.getPortClassAccess().getMsgHandlersAssignment_3_2()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3523:1: ( rule__PortClass__MsgHandlersAssignment_3_2 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3523:2: rule__PortClass__MsgHandlersAssignment_3_2 + before(grammarAccess.getPortClassAccess().getAttributesAssignment_3_2()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3523:1: ( rule__PortClass__AttributesAssignment_3_2 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3523:2: rule__PortClass__AttributesAssignment_3_2 { - pushFollow(FOLLOW_rule__PortClass__MsgHandlersAssignment_3_2_in_rule__PortClass__Alternatives_37462); - rule__PortClass__MsgHandlersAssignment_3_2(); + pushFollow(FOLLOW_rule__PortClass__AttributesAssignment_3_2_in_rule__PortClass__Alternatives_37462); + rule__PortClass__AttributesAssignment_3_2(); state._fsp--; } - after(grammarAccess.getPortClassAccess().getMsgHandlersAssignment_3_2()); + after(grammarAccess.getPortClassAccess().getAttributesAssignment_3_2()); } @@ -9992,20 +9992,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR start "rule__ActorClass__Alternatives_7_2" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3554:1: rule__ActorClass__Alternatives_7_2 : ( ( ( rule__ActorClass__InterfacePortsAssignment_7_2_0 ) ) | ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1 ) ) ); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3554:1: rule__ActorClass__Alternatives_7_2 : ( ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 ) ) | ( ( rule__ActorClass__InterfacePortsAssignment_7_2_1 ) ) ); public final void rule__ActorClass__Alternatives_7_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3558:1: ( ( ( rule__ActorClass__InterfacePortsAssignment_7_2_0 ) ) | ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1 ) ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3558:1: ( ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 ) ) | ( ( rule__ActorClass__InterfacePortsAssignment_7_2_1 ) ) ) int alt14=2; int LA14_0 = input.LA(1); - if ( (LA14_0==66||LA14_0==74) ) { + if ( (LA14_0==77) ) { alt14=1; } - else if ( (LA14_0==77) ) { + else if ( (LA14_0==66||LA14_0==74) ) { alt14=2; } else { @@ -10016,24 +10016,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } switch (alt14) { case 1 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3559:1: ( ( rule__ActorClass__InterfacePortsAssignment_7_2_0 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3559:1: ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3559:1: ( ( rule__ActorClass__InterfacePortsAssignment_7_2_0 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3560:1: ( rule__ActorClass__InterfacePortsAssignment_7_2_0 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3559:1: ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3560:1: ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 ) { - before(grammarAccess.getActorClassAccess().getInterfacePortsAssignment_7_2_0()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3561:1: ( rule__ActorClass__InterfacePortsAssignment_7_2_0 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3561:2: rule__ActorClass__InterfacePortsAssignment_7_2_0 + before(grammarAccess.getActorClassAccess().getServiceProvisionPointsAssignment_7_2_0()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3561:1: ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3561:2: rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 { - pushFollow(FOLLOW_rule__ActorClass__InterfacePortsAssignment_7_2_0_in_rule__ActorClass__Alternatives_7_27544); - rule__ActorClass__InterfacePortsAssignment_7_2_0(); + pushFollow(FOLLOW_rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0_in_rule__ActorClass__Alternatives_7_27544); + rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0(); state._fsp--; } - after(grammarAccess.getActorClassAccess().getInterfacePortsAssignment_7_2_0()); + after(grammarAccess.getActorClassAccess().getServiceProvisionPointsAssignment_7_2_0()); } @@ -10041,24 +10041,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 2 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3565:6: ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3565:6: ( ( rule__ActorClass__InterfacePortsAssignment_7_2_1 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3565:6: ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3566:1: ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3565:6: ( ( rule__ActorClass__InterfacePortsAssignment_7_2_1 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3566:1: ( rule__ActorClass__InterfacePortsAssignment_7_2_1 ) { - before(grammarAccess.getActorClassAccess().getServiceProvisionPointsAssignment_7_2_1()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3567:1: ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3567:2: rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1 + before(grammarAccess.getActorClassAccess().getInterfacePortsAssignment_7_2_1()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3567:1: ( rule__ActorClass__InterfacePortsAssignment_7_2_1 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3567:2: rule__ActorClass__InterfacePortsAssignment_7_2_1 { - pushFollow(FOLLOW_rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1_in_rule__ActorClass__Alternatives_7_27562); - rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1(); + pushFollow(FOLLOW_rule__ActorClass__InterfacePortsAssignment_7_2_1_in_rule__ActorClass__Alternatives_7_27562); + rule__ActorClass__InterfacePortsAssignment_7_2_1(); state._fsp--; } - after(grammarAccess.getActorClassAccess().getServiceProvisionPointsAssignment_7_2_1()); + after(grammarAccess.getActorClassAccess().getInterfacePortsAssignment_7_2_1()); } @@ -10083,27 +10083,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR start "rule__ActorClass__Alternatives_8_6" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3576:1: rule__ActorClass__Alternatives_8_6 : ( ( ( rule__ActorClass__InternalPortsAssignment_8_6_0 ) ) | ( ( rule__ActorClass__ExternalPortsAssignment_8_6_1 ) ) | ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_2 ) ) | ( ( rule__ActorClass__AttributesAssignment_8_6_3 ) ) | ( ( rule__ActorClass__ActorRefsAssignment_8_6_4 ) ) | ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_5 ) ) | ( ( rule__ActorClass__BindingsAssignment_8_6_6 ) ) | ( ( rule__ActorClass__ConnectionsAssignment_8_6_7 ) ) ); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3576:1: rule__ActorClass__Alternatives_8_6 : ( ( ( rule__ActorClass__ConnectionsAssignment_8_6_0 ) ) | ( ( rule__ActorClass__BindingsAssignment_8_6_1 ) ) | ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 ) ) | ( ( rule__ActorClass__AttributesAssignment_8_6_3 ) ) | ( ( rule__ActorClass__ActorRefsAssignment_8_6_4 ) ) | ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 ) ) | ( ( rule__ActorClass__InternalPortsAssignment_8_6_6 ) ) | ( ( rule__ActorClass__ExternalPortsAssignment_8_6_7 ) ) ); public final void rule__ActorClass__Alternatives_8_6() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3580:1: ( ( ( rule__ActorClass__InternalPortsAssignment_8_6_0 ) ) | ( ( rule__ActorClass__ExternalPortsAssignment_8_6_1 ) ) | ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_2 ) ) | ( ( rule__ActorClass__AttributesAssignment_8_6_3 ) ) | ( ( rule__ActorClass__ActorRefsAssignment_8_6_4 ) ) | ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_5 ) ) | ( ( rule__ActorClass__BindingsAssignment_8_6_6 ) ) | ( ( rule__ActorClass__ConnectionsAssignment_8_6_7 ) ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3580:1: ( ( ( rule__ActorClass__ConnectionsAssignment_8_6_0 ) ) | ( ( rule__ActorClass__BindingsAssignment_8_6_1 ) ) | ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 ) ) | ( ( rule__ActorClass__AttributesAssignment_8_6_3 ) ) | ( ( rule__ActorClass__ActorRefsAssignment_8_6_4 ) ) | ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 ) ) | ( ( rule__ActorClass__InternalPortsAssignment_8_6_6 ) ) | ( ( rule__ActorClass__ExternalPortsAssignment_8_6_7 ) ) ) int alt15=8; switch ( input.LA(1) ) { - case 66: - case 74: + case 87: { alt15=1; } break; - case 75: + case 83: { alt15=2; } break; - case 76: + case 78: { alt15=3; } @@ -10120,17 +10119,18 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { alt15=5; } break; - case 78: + case 76: { alt15=6; } break; - case 83: + case 66: + case 74: { alt15=7; } break; - case 87: + case 75: { alt15=8; } @@ -10144,24 +10144,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { switch (alt15) { case 1 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3581:1: ( ( rule__ActorClass__InternalPortsAssignment_8_6_0 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3581:1: ( ( rule__ActorClass__ConnectionsAssignment_8_6_0 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3581:1: ( ( rule__ActorClass__InternalPortsAssignment_8_6_0 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3582:1: ( rule__ActorClass__InternalPortsAssignment_8_6_0 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3581:1: ( ( rule__ActorClass__ConnectionsAssignment_8_6_0 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3582:1: ( rule__ActorClass__ConnectionsAssignment_8_6_0 ) { - before(grammarAccess.getActorClassAccess().getInternalPortsAssignment_8_6_0()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3583:1: ( rule__ActorClass__InternalPortsAssignment_8_6_0 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3583:2: rule__ActorClass__InternalPortsAssignment_8_6_0 + before(grammarAccess.getActorClassAccess().getConnectionsAssignment_8_6_0()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3583:1: ( rule__ActorClass__ConnectionsAssignment_8_6_0 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3583:2: rule__ActorClass__ConnectionsAssignment_8_6_0 { - pushFollow(FOLLOW_rule__ActorClass__InternalPortsAssignment_8_6_0_in_rule__ActorClass__Alternatives_8_67595); - rule__ActorClass__InternalPortsAssignment_8_6_0(); + pushFollow(FOLLOW_rule__ActorClass__ConnectionsAssignment_8_6_0_in_rule__ActorClass__Alternatives_8_67595); + rule__ActorClass__ConnectionsAssignment_8_6_0(); state._fsp--; } - after(grammarAccess.getActorClassAccess().getInternalPortsAssignment_8_6_0()); + after(grammarAccess.getActorClassAccess().getConnectionsAssignment_8_6_0()); } @@ -10169,24 +10169,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 2 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3587:6: ( ( rule__ActorClass__ExternalPortsAssignment_8_6_1 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3587:6: ( ( rule__ActorClass__BindingsAssignment_8_6_1 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3587:6: ( ( rule__ActorClass__ExternalPortsAssignment_8_6_1 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3588:1: ( rule__ActorClass__ExternalPortsAssignment_8_6_1 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3587:6: ( ( rule__ActorClass__BindingsAssignment_8_6_1 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3588:1: ( rule__ActorClass__BindingsAssignment_8_6_1 ) { - before(grammarAccess.getActorClassAccess().getExternalPortsAssignment_8_6_1()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3589:1: ( rule__ActorClass__ExternalPortsAssignment_8_6_1 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3589:2: rule__ActorClass__ExternalPortsAssignment_8_6_1 + before(grammarAccess.getActorClassAccess().getBindingsAssignment_8_6_1()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3589:1: ( rule__ActorClass__BindingsAssignment_8_6_1 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3589:2: rule__ActorClass__BindingsAssignment_8_6_1 { - pushFollow(FOLLOW_rule__ActorClass__ExternalPortsAssignment_8_6_1_in_rule__ActorClass__Alternatives_8_67613); - rule__ActorClass__ExternalPortsAssignment_8_6_1(); + pushFollow(FOLLOW_rule__ActorClass__BindingsAssignment_8_6_1_in_rule__ActorClass__Alternatives_8_67613); + rule__ActorClass__BindingsAssignment_8_6_1(); state._fsp--; } - after(grammarAccess.getActorClassAccess().getExternalPortsAssignment_8_6_1()); + after(grammarAccess.getActorClassAccess().getBindingsAssignment_8_6_1()); } @@ -10194,24 +10194,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 3 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3593:6: ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_2 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3593:6: ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3593:6: ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_2 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3594:1: ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_2 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3593:6: ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3594:1: ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 ) { - before(grammarAccess.getActorClassAccess().getServiceAccessPointsAssignment_8_6_2()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3595:1: ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_2 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3595:2: rule__ActorClass__ServiceAccessPointsAssignment_8_6_2 + before(grammarAccess.getActorClassAccess().getServiceImplementationsAssignment_8_6_2()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3595:1: ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3595:2: rule__ActorClass__ServiceImplementationsAssignment_8_6_2 { - pushFollow(FOLLOW_rule__ActorClass__ServiceAccessPointsAssignment_8_6_2_in_rule__ActorClass__Alternatives_8_67631); - rule__ActorClass__ServiceAccessPointsAssignment_8_6_2(); + pushFollow(FOLLOW_rule__ActorClass__ServiceImplementationsAssignment_8_6_2_in_rule__ActorClass__Alternatives_8_67631); + rule__ActorClass__ServiceImplementationsAssignment_8_6_2(); state._fsp--; } - after(grammarAccess.getActorClassAccess().getServiceAccessPointsAssignment_8_6_2()); + after(grammarAccess.getActorClassAccess().getServiceImplementationsAssignment_8_6_2()); } @@ -10269,24 +10269,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 6 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3611:6: ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_5 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3611:6: ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3611:6: ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_5 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3612:1: ( rule__ActorClass__ServiceImplementationsAssignment_8_6_5 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3611:6: ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3612:1: ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 ) { - before(grammarAccess.getActorClassAccess().getServiceImplementationsAssignment_8_6_5()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3613:1: ( rule__ActorClass__ServiceImplementationsAssignment_8_6_5 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3613:2: rule__ActorClass__ServiceImplementationsAssignment_8_6_5 + before(grammarAccess.getActorClassAccess().getServiceAccessPointsAssignment_8_6_5()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3613:1: ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3613:2: rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 { - pushFollow(FOLLOW_rule__ActorClass__ServiceImplementationsAssignment_8_6_5_in_rule__ActorClass__Alternatives_8_67685); - rule__ActorClass__ServiceImplementationsAssignment_8_6_5(); + pushFollow(FOLLOW_rule__ActorClass__ServiceAccessPointsAssignment_8_6_5_in_rule__ActorClass__Alternatives_8_67685); + rule__ActorClass__ServiceAccessPointsAssignment_8_6_5(); state._fsp--; } - after(grammarAccess.getActorClassAccess().getServiceImplementationsAssignment_8_6_5()); + after(grammarAccess.getActorClassAccess().getServiceAccessPointsAssignment_8_6_5()); } @@ -10294,24 +10294,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 7 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3617:6: ( ( rule__ActorClass__BindingsAssignment_8_6_6 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3617:6: ( ( rule__ActorClass__InternalPortsAssignment_8_6_6 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3617:6: ( ( rule__ActorClass__BindingsAssignment_8_6_6 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3618:1: ( rule__ActorClass__BindingsAssignment_8_6_6 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3617:6: ( ( rule__ActorClass__InternalPortsAssignment_8_6_6 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3618:1: ( rule__ActorClass__InternalPortsAssignment_8_6_6 ) { - before(grammarAccess.getActorClassAccess().getBindingsAssignment_8_6_6()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3619:1: ( rule__ActorClass__BindingsAssignment_8_6_6 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3619:2: rule__ActorClass__BindingsAssignment_8_6_6 + before(grammarAccess.getActorClassAccess().getInternalPortsAssignment_8_6_6()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3619:1: ( rule__ActorClass__InternalPortsAssignment_8_6_6 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3619:2: rule__ActorClass__InternalPortsAssignment_8_6_6 { - pushFollow(FOLLOW_rule__ActorClass__BindingsAssignment_8_6_6_in_rule__ActorClass__Alternatives_8_67703); - rule__ActorClass__BindingsAssignment_8_6_6(); + pushFollow(FOLLOW_rule__ActorClass__InternalPortsAssignment_8_6_6_in_rule__ActorClass__Alternatives_8_67703); + rule__ActorClass__InternalPortsAssignment_8_6_6(); state._fsp--; } - after(grammarAccess.getActorClassAccess().getBindingsAssignment_8_6_6()); + after(grammarAccess.getActorClassAccess().getInternalPortsAssignment_8_6_6()); } @@ -10319,24 +10319,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 8 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3623:6: ( ( rule__ActorClass__ConnectionsAssignment_8_6_7 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3623:6: ( ( rule__ActorClass__ExternalPortsAssignment_8_6_7 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3623:6: ( ( rule__ActorClass__ConnectionsAssignment_8_6_7 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3624:1: ( rule__ActorClass__ConnectionsAssignment_8_6_7 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3623:6: ( ( rule__ActorClass__ExternalPortsAssignment_8_6_7 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3624:1: ( rule__ActorClass__ExternalPortsAssignment_8_6_7 ) { - before(grammarAccess.getActorClassAccess().getConnectionsAssignment_8_6_7()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3625:1: ( rule__ActorClass__ConnectionsAssignment_8_6_7 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3625:2: rule__ActorClass__ConnectionsAssignment_8_6_7 + before(grammarAccess.getActorClassAccess().getExternalPortsAssignment_8_6_7()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3625:1: ( rule__ActorClass__ExternalPortsAssignment_8_6_7 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3625:2: rule__ActorClass__ExternalPortsAssignment_8_6_7 { - pushFollow(FOLLOW_rule__ActorClass__ConnectionsAssignment_8_6_7_in_rule__ActorClass__Alternatives_8_67721); - rule__ActorClass__ConnectionsAssignment_8_6_7(); + pushFollow(FOLLOW_rule__ActorClass__ExternalPortsAssignment_8_6_7_in_rule__ActorClass__Alternatives_8_67721); + rule__ActorClass__ExternalPortsAssignment_8_6_7(); state._fsp--; } - after(grammarAccess.getActorClassAccess().getConnectionsAssignment_8_6_7()); + after(grammarAccess.getActorClassAccess().getExternalPortsAssignment_8_6_7()); } @@ -10361,20 +10361,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR start "rule__ActorClass__Alternatives_9_4" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3634:1: rule__ActorClass__Alternatives_9_4 : ( ( ( rule__ActorClass__StructorsAssignment_9_4_0 ) ) | ( ( rule__ActorClass__OperationsAssignment_9_4_1 ) ) ); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3634:1: rule__ActorClass__Alternatives_9_4 : ( ( ( rule__ActorClass__OperationsAssignment_9_4_0 ) ) | ( ( rule__ActorClass__StructorsAssignment_9_4_1 ) ) ); public final void rule__ActorClass__Alternatives_9_4() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3638:1: ( ( ( rule__ActorClass__StructorsAssignment_9_4_0 ) ) | ( ( rule__ActorClass__OperationsAssignment_9_4_1 ) ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3638:1: ( ( ( rule__ActorClass__OperationsAssignment_9_4_0 ) ) | ( ( rule__ActorClass__StructorsAssignment_9_4_1 ) ) ) int alt16=2; int LA16_0 = input.LA(1); - if ( ((LA16_0>=14 && LA16_0<=15)) ) { + if ( (LA16_0==60||LA16_0==126) ) { alt16=1; } - else if ( (LA16_0==60||LA16_0==126) ) { + else if ( ((LA16_0>=14 && LA16_0<=15)) ) { alt16=2; } else { @@ -10385,24 +10385,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } switch (alt16) { case 1 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3639:1: ( ( rule__ActorClass__StructorsAssignment_9_4_0 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3639:1: ( ( rule__ActorClass__OperationsAssignment_9_4_0 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3639:1: ( ( rule__ActorClass__StructorsAssignment_9_4_0 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3640:1: ( rule__ActorClass__StructorsAssignment_9_4_0 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3639:1: ( ( rule__ActorClass__OperationsAssignment_9_4_0 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3640:1: ( rule__ActorClass__OperationsAssignment_9_4_0 ) { - before(grammarAccess.getActorClassAccess().getStructorsAssignment_9_4_0()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3641:1: ( rule__ActorClass__StructorsAssignment_9_4_0 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3641:2: rule__ActorClass__StructorsAssignment_9_4_0 + before(grammarAccess.getActorClassAccess().getOperationsAssignment_9_4_0()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3641:1: ( rule__ActorClass__OperationsAssignment_9_4_0 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3641:2: rule__ActorClass__OperationsAssignment_9_4_0 { - pushFollow(FOLLOW_rule__ActorClass__StructorsAssignment_9_4_0_in_rule__ActorClass__Alternatives_9_47754); - rule__ActorClass__StructorsAssignment_9_4_0(); + pushFollow(FOLLOW_rule__ActorClass__OperationsAssignment_9_4_0_in_rule__ActorClass__Alternatives_9_47754); + rule__ActorClass__OperationsAssignment_9_4_0(); state._fsp--; } - after(grammarAccess.getActorClassAccess().getStructorsAssignment_9_4_0()); + after(grammarAccess.getActorClassAccess().getOperationsAssignment_9_4_0()); } @@ -10410,24 +10410,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 2 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3645:6: ( ( rule__ActorClass__OperationsAssignment_9_4_1 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3645:6: ( ( rule__ActorClass__StructorsAssignment_9_4_1 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3645:6: ( ( rule__ActorClass__OperationsAssignment_9_4_1 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3646:1: ( rule__ActorClass__OperationsAssignment_9_4_1 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3645:6: ( ( rule__ActorClass__StructorsAssignment_9_4_1 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3646:1: ( rule__ActorClass__StructorsAssignment_9_4_1 ) { - before(grammarAccess.getActorClassAccess().getOperationsAssignment_9_4_1()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3647:1: ( rule__ActorClass__OperationsAssignment_9_4_1 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3647:2: rule__ActorClass__OperationsAssignment_9_4_1 + before(grammarAccess.getActorClassAccess().getStructorsAssignment_9_4_1()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3647:1: ( rule__ActorClass__StructorsAssignment_9_4_1 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3647:2: rule__ActorClass__StructorsAssignment_9_4_1 { - pushFollow(FOLLOW_rule__ActorClass__OperationsAssignment_9_4_1_in_rule__ActorClass__Alternatives_9_47772); - rule__ActorClass__OperationsAssignment_9_4_1(); + pushFollow(FOLLOW_rule__ActorClass__StructorsAssignment_9_4_1_in_rule__ActorClass__Alternatives_9_47772); + rule__ActorClass__StructorsAssignment_9_4_1(); state._fsp--; } - after(grammarAccess.getActorClassAccess().getOperationsAssignment_9_4_1()); + after(grammarAccess.getActorClassAccess().getStructorsAssignment_9_4_1()); } @@ -10560,16 +10560,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR start "rule__LogicalSystem__Alternatives_5" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3684:1: rule__LogicalSystem__Alternatives_5 : ( ( ( rule__LogicalSystem__SubSystemsAssignment_5_0 ) ) | ( ( rule__LogicalSystem__BindingsAssignment_5_1 ) ) | ( ( rule__LogicalSystem__ConnectionsAssignment_5_2 ) ) ); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3684:1: rule__LogicalSystem__Alternatives_5 : ( ( ( rule__LogicalSystem__ConnectionsAssignment_5_0 ) ) | ( ( rule__LogicalSystem__BindingsAssignment_5_1 ) ) | ( ( rule__LogicalSystem__SubSystemsAssignment_5_2 ) ) ); public final void rule__LogicalSystem__Alternatives_5() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3688:1: ( ( ( rule__LogicalSystem__SubSystemsAssignment_5_0 ) ) | ( ( rule__LogicalSystem__BindingsAssignment_5_1 ) ) | ( ( rule__LogicalSystem__ConnectionsAssignment_5_2 ) ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3688:1: ( ( ( rule__LogicalSystem__ConnectionsAssignment_5_0 ) ) | ( ( rule__LogicalSystem__BindingsAssignment_5_1 ) ) | ( ( rule__LogicalSystem__SubSystemsAssignment_5_2 ) ) ) int alt18=3; switch ( input.LA(1) ) { - case 79: + case 87: { alt18=1; } @@ -10579,7 +10579,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { alt18=2; } break; - case 87: + case 79: { alt18=3; } @@ -10593,24 +10593,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { switch (alt18) { case 1 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3689:1: ( ( rule__LogicalSystem__SubSystemsAssignment_5_0 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3689:1: ( ( rule__LogicalSystem__ConnectionsAssignment_5_0 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3689:1: ( ( rule__LogicalSystem__SubSystemsAssignment_5_0 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3690:1: ( rule__LogicalSystem__SubSystemsAssignment_5_0 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3689:1: ( ( rule__LogicalSystem__ConnectionsAssignment_5_0 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3690:1: ( rule__LogicalSystem__ConnectionsAssignment_5_0 ) { - before(grammarAccess.getLogicalSystemAccess().getSubSystemsAssignment_5_0()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3691:1: ( rule__LogicalSystem__SubSystemsAssignment_5_0 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3691:2: rule__LogicalSystem__SubSystemsAssignment_5_0 + before(grammarAccess.getLogicalSystemAccess().getConnectionsAssignment_5_0()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3691:1: ( rule__LogicalSystem__ConnectionsAssignment_5_0 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3691:2: rule__LogicalSystem__ConnectionsAssignment_5_0 { - pushFollow(FOLLOW_rule__LogicalSystem__SubSystemsAssignment_5_0_in_rule__LogicalSystem__Alternatives_57871); - rule__LogicalSystem__SubSystemsAssignment_5_0(); + pushFollow(FOLLOW_rule__LogicalSystem__ConnectionsAssignment_5_0_in_rule__LogicalSystem__Alternatives_57871); + rule__LogicalSystem__ConnectionsAssignment_5_0(); state._fsp--; } - after(grammarAccess.getLogicalSystemAccess().getSubSystemsAssignment_5_0()); + after(grammarAccess.getLogicalSystemAccess().getConnectionsAssignment_5_0()); } @@ -10643,24 +10643,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 3 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3701:6: ( ( rule__LogicalSystem__ConnectionsAssignment_5_2 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3701:6: ( ( rule__LogicalSystem__SubSystemsAssignment_5_2 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3701:6: ( ( rule__LogicalSystem__ConnectionsAssignment_5_2 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3702:1: ( rule__LogicalSystem__ConnectionsAssignment_5_2 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3701:6: ( ( rule__LogicalSystem__SubSystemsAssignment_5_2 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3702:1: ( rule__LogicalSystem__SubSystemsAssignment_5_2 ) { - before(grammarAccess.getLogicalSystemAccess().getConnectionsAssignment_5_2()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3703:1: ( rule__LogicalSystem__ConnectionsAssignment_5_2 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3703:2: rule__LogicalSystem__ConnectionsAssignment_5_2 + before(grammarAccess.getLogicalSystemAccess().getSubSystemsAssignment_5_2()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3703:1: ( rule__LogicalSystem__SubSystemsAssignment_5_2 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3703:2: rule__LogicalSystem__SubSystemsAssignment_5_2 { - pushFollow(FOLLOW_rule__LogicalSystem__ConnectionsAssignment_5_2_in_rule__LogicalSystem__Alternatives_57907); - rule__LogicalSystem__ConnectionsAssignment_5_2(); + pushFollow(FOLLOW_rule__LogicalSystem__SubSystemsAssignment_5_2_in_rule__LogicalSystem__Alternatives_57907); + rule__LogicalSystem__SubSystemsAssignment_5_2(); state._fsp--; } - after(grammarAccess.getLogicalSystemAccess().getConnectionsAssignment_5_2()); + after(grammarAccess.getLogicalSystemAccess().getSubSystemsAssignment_5_2()); } @@ -10685,29 +10685,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR start "rule__SubSystemClass__Alternatives_8" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3713:1: rule__SubSystemClass__Alternatives_8 : ( ( ( rule__SubSystemClass__RelayPortsAssignment_8_0 ) ) | ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1 ) ) | ( ( rule__SubSystemClass__ActorRefsAssignment_8_2 ) ) | ( ( rule__SubSystemClass__BindingsAssignment_8_3 ) ) | ( ( rule__SubSystemClass__ConnectionsAssignment_8_4 ) ) | ( ( rule__SubSystemClass__ThreadsAssignment_8_5 ) ) | ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6 ) ) ); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3713:1: rule__SubSystemClass__Alternatives_8 : ( ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 ) ) | ( ( rule__SubSystemClass__ThreadsAssignment_8_1 ) ) | ( ( rule__SubSystemClass__ConnectionsAssignment_8_2 ) ) | ( ( rule__SubSystemClass__BindingsAssignment_8_3 ) ) | ( ( rule__SubSystemClass__ActorRefsAssignment_8_4 ) ) | ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 ) ) | ( ( rule__SubSystemClass__RelayPortsAssignment_8_6 ) ) ); public final void rule__SubSystemClass__Alternatives_8() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3717:1: ( ( ( rule__SubSystemClass__RelayPortsAssignment_8_0 ) ) | ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1 ) ) | ( ( rule__SubSystemClass__ActorRefsAssignment_8_2 ) ) | ( ( rule__SubSystemClass__BindingsAssignment_8_3 ) ) | ( ( rule__SubSystemClass__ConnectionsAssignment_8_4 ) ) | ( ( rule__SubSystemClass__ThreadsAssignment_8_5 ) ) | ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6 ) ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3717:1: ( ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 ) ) | ( ( rule__SubSystemClass__ThreadsAssignment_8_1 ) ) | ( ( rule__SubSystemClass__ConnectionsAssignment_8_2 ) ) | ( ( rule__SubSystemClass__BindingsAssignment_8_3 ) ) | ( ( rule__SubSystemClass__ActorRefsAssignment_8_4 ) ) | ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 ) ) | ( ( rule__SubSystemClass__RelayPortsAssignment_8_6 ) ) ) int alt19=7; switch ( input.LA(1) ) { - case 66: - case 74: + case 81: { alt19=1; } break; - case 77: + case 80: { alt19=2; } break; - case 32: - case 33: - case 91: + case 87: { alt19=3; } @@ -10717,17 +10714,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { alt19=4; } break; - case 87: + case 32: + case 33: + case 91: { alt19=5; } break; - case 80: + case 77: { alt19=6; } break; - case 81: + case 66: + case 74: { alt19=7; } @@ -10741,24 +10741,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { switch (alt19) { case 1 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3718:1: ( ( rule__SubSystemClass__RelayPortsAssignment_8_0 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3718:1: ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3718:1: ( ( rule__SubSystemClass__RelayPortsAssignment_8_0 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3719:1: ( rule__SubSystemClass__RelayPortsAssignment_8_0 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3718:1: ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3719:1: ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 ) { - before(grammarAccess.getSubSystemClassAccess().getRelayPortsAssignment_8_0()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3720:1: ( rule__SubSystemClass__RelayPortsAssignment_8_0 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3720:2: rule__SubSystemClass__RelayPortsAssignment_8_0 + before(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsAssignment_8_0()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3720:1: ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3720:2: rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 { - pushFollow(FOLLOW_rule__SubSystemClass__RelayPortsAssignment_8_0_in_rule__SubSystemClass__Alternatives_87941); - rule__SubSystemClass__RelayPortsAssignment_8_0(); + pushFollow(FOLLOW_rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0_in_rule__SubSystemClass__Alternatives_87941); + rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0(); state._fsp--; } - after(grammarAccess.getSubSystemClassAccess().getRelayPortsAssignment_8_0()); + after(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsAssignment_8_0()); } @@ -10766,24 +10766,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 2 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3724:6: ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3724:6: ( ( rule__SubSystemClass__ThreadsAssignment_8_1 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3724:6: ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3725:1: ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3724:6: ( ( rule__SubSystemClass__ThreadsAssignment_8_1 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3725:1: ( rule__SubSystemClass__ThreadsAssignment_8_1 ) { - before(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsAssignment_8_1()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3726:1: ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3726:2: rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1 + before(grammarAccess.getSubSystemClassAccess().getThreadsAssignment_8_1()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3726:1: ( rule__SubSystemClass__ThreadsAssignment_8_1 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3726:2: rule__SubSystemClass__ThreadsAssignment_8_1 { - pushFollow(FOLLOW_rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1_in_rule__SubSystemClass__Alternatives_87959); - rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1(); + pushFollow(FOLLOW_rule__SubSystemClass__ThreadsAssignment_8_1_in_rule__SubSystemClass__Alternatives_87959); + rule__SubSystemClass__ThreadsAssignment_8_1(); state._fsp--; } - after(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsAssignment_8_1()); + after(grammarAccess.getSubSystemClassAccess().getThreadsAssignment_8_1()); } @@ -10791,24 +10791,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 3 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3730:6: ( ( rule__SubSystemClass__ActorRefsAssignment_8_2 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3730:6: ( ( rule__SubSystemClass__ConnectionsAssignment_8_2 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3730:6: ( ( rule__SubSystemClass__ActorRefsAssignment_8_2 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3731:1: ( rule__SubSystemClass__ActorRefsAssignment_8_2 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3730:6: ( ( rule__SubSystemClass__ConnectionsAssignment_8_2 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3731:1: ( rule__SubSystemClass__ConnectionsAssignment_8_2 ) { - before(grammarAccess.getSubSystemClassAccess().getActorRefsAssignment_8_2()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3732:1: ( rule__SubSystemClass__ActorRefsAssignment_8_2 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3732:2: rule__SubSystemClass__ActorRefsAssignment_8_2 + before(grammarAccess.getSubSystemClassAccess().getConnectionsAssignment_8_2()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3732:1: ( rule__SubSystemClass__ConnectionsAssignment_8_2 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3732:2: rule__SubSystemClass__ConnectionsAssignment_8_2 { - pushFollow(FOLLOW_rule__SubSystemClass__ActorRefsAssignment_8_2_in_rule__SubSystemClass__Alternatives_87977); - rule__SubSystemClass__ActorRefsAssignment_8_2(); + pushFollow(FOLLOW_rule__SubSystemClass__ConnectionsAssignment_8_2_in_rule__SubSystemClass__Alternatives_87977); + rule__SubSystemClass__ConnectionsAssignment_8_2(); state._fsp--; } - after(grammarAccess.getSubSystemClassAccess().getActorRefsAssignment_8_2()); + after(grammarAccess.getSubSystemClassAccess().getConnectionsAssignment_8_2()); } @@ -10841,24 +10841,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 5 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3742:6: ( ( rule__SubSystemClass__ConnectionsAssignment_8_4 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3742:6: ( ( rule__SubSystemClass__ActorRefsAssignment_8_4 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3742:6: ( ( rule__SubSystemClass__ConnectionsAssignment_8_4 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3743:1: ( rule__SubSystemClass__ConnectionsAssignment_8_4 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3742:6: ( ( rule__SubSystemClass__ActorRefsAssignment_8_4 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3743:1: ( rule__SubSystemClass__ActorRefsAssignment_8_4 ) { - before(grammarAccess.getSubSystemClassAccess().getConnectionsAssignment_8_4()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3744:1: ( rule__SubSystemClass__ConnectionsAssignment_8_4 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3744:2: rule__SubSystemClass__ConnectionsAssignment_8_4 + before(grammarAccess.getSubSystemClassAccess().getActorRefsAssignment_8_4()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3744:1: ( rule__SubSystemClass__ActorRefsAssignment_8_4 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3744:2: rule__SubSystemClass__ActorRefsAssignment_8_4 { - pushFollow(FOLLOW_rule__SubSystemClass__ConnectionsAssignment_8_4_in_rule__SubSystemClass__Alternatives_88013); - rule__SubSystemClass__ConnectionsAssignment_8_4(); + pushFollow(FOLLOW_rule__SubSystemClass__ActorRefsAssignment_8_4_in_rule__SubSystemClass__Alternatives_88013); + rule__SubSystemClass__ActorRefsAssignment_8_4(); state._fsp--; } - after(grammarAccess.getSubSystemClassAccess().getConnectionsAssignment_8_4()); + after(grammarAccess.getSubSystemClassAccess().getActorRefsAssignment_8_4()); } @@ -10866,24 +10866,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 6 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3748:6: ( ( rule__SubSystemClass__ThreadsAssignment_8_5 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3748:6: ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3748:6: ( ( rule__SubSystemClass__ThreadsAssignment_8_5 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3749:1: ( rule__SubSystemClass__ThreadsAssignment_8_5 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3748:6: ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3749:1: ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 ) { - before(grammarAccess.getSubSystemClassAccess().getThreadsAssignment_8_5()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3750:1: ( rule__SubSystemClass__ThreadsAssignment_8_5 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3750:2: rule__SubSystemClass__ThreadsAssignment_8_5 + before(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsAssignment_8_5()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3750:1: ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3750:2: rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 { - pushFollow(FOLLOW_rule__SubSystemClass__ThreadsAssignment_8_5_in_rule__SubSystemClass__Alternatives_88031); - rule__SubSystemClass__ThreadsAssignment_8_5(); + pushFollow(FOLLOW_rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5_in_rule__SubSystemClass__Alternatives_88031); + rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5(); state._fsp--; } - after(grammarAccess.getSubSystemClassAccess().getThreadsAssignment_8_5()); + after(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsAssignment_8_5()); } @@ -10891,24 +10891,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } break; case 7 : - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3754:6: ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3754:6: ( ( rule__SubSystemClass__RelayPortsAssignment_8_6 ) ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3754:6: ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6 ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3755:1: ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3754:6: ( ( rule__SubSystemClass__RelayPortsAssignment_8_6 ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3755:1: ( rule__SubSystemClass__RelayPortsAssignment_8_6 ) { - before(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsAssignment_8_6()); - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3756:1: ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6 ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3756:2: rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6 + before(grammarAccess.getSubSystemClassAccess().getRelayPortsAssignment_8_6()); + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3756:1: ( rule__SubSystemClass__RelayPortsAssignment_8_6 ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3756:2: rule__SubSystemClass__RelayPortsAssignment_8_6 { - pushFollow(FOLLOW_rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6_in_rule__SubSystemClass__Alternatives_88049); - rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6(); + pushFollow(FOLLOW_rule__SubSystemClass__RelayPortsAssignment_8_6_in_rule__SubSystemClass__Alternatives_88049); + rule__SubSystemClass__RelayPortsAssignment_8_6(); state._fsp--; } - after(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsAssignment_8_6()); + after(grammarAccess.getSubSystemClassAccess().getRelayPortsAssignment_8_6()); } @@ -65025,26 +65025,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__DataClass__UserCode3Assignment_8_1" - // $ANTLR start "rule__DataClass__AttributesAssignment_9_0" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24108:1: rule__DataClass__AttributesAssignment_9_0 : ( ruleAttribute ) ; - public final void rule__DataClass__AttributesAssignment_9_0() throws RecognitionException { + // $ANTLR start "rule__DataClass__OperationsAssignment_9_0" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24108:1: rule__DataClass__OperationsAssignment_9_0 : ( ruleStandardOperation ) ; + public final void rule__DataClass__OperationsAssignment_9_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24112:1: ( ( ruleAttribute ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24113:1: ( ruleAttribute ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24112:1: ( ( ruleStandardOperation ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24113:1: ( ruleStandardOperation ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24113:1: ( ruleAttribute ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24114:1: ruleAttribute + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24113:1: ( ruleStandardOperation ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24114:1: ruleStandardOperation { - before(grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_0_0()); - pushFollow(FOLLOW_ruleAttribute_in_rule__DataClass__AttributesAssignment_9_048667); - ruleAttribute(); + before(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_0_0()); + pushFollow(FOLLOW_ruleStandardOperation_in_rule__DataClass__OperationsAssignment_9_048667); + ruleStandardOperation(); state._fsp--; - after(grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_0_0()); + after(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_0_0()); } @@ -65063,7 +65063,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__DataClass__AttributesAssignment_9_0" + // $ANTLR end "rule__DataClass__OperationsAssignment_9_0" // $ANTLR start "rule__DataClass__StructorsAssignment_9_1" @@ -65107,26 +65107,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__DataClass__StructorsAssignment_9_1" - // $ANTLR start "rule__DataClass__OperationsAssignment_9_2" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24138:1: rule__DataClass__OperationsAssignment_9_2 : ( ruleStandardOperation ) ; - public final void rule__DataClass__OperationsAssignment_9_2() throws RecognitionException { + // $ANTLR start "rule__DataClass__AttributesAssignment_9_2" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24138:1: rule__DataClass__AttributesAssignment_9_2 : ( ruleAttribute ) ; + public final void rule__DataClass__AttributesAssignment_9_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24142:1: ( ( ruleStandardOperation ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24143:1: ( ruleStandardOperation ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24142:1: ( ( ruleAttribute ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24143:1: ( ruleAttribute ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24143:1: ( ruleStandardOperation ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24144:1: ruleStandardOperation + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24143:1: ( ruleAttribute ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24144:1: ruleAttribute { - before(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_2_0()); - pushFollow(FOLLOW_ruleStandardOperation_in_rule__DataClass__OperationsAssignment_9_248729); - ruleStandardOperation(); + before(grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_2_0()); + pushFollow(FOLLOW_ruleAttribute_in_rule__DataClass__AttributesAssignment_9_248729); + ruleAttribute(); state._fsp--; - after(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_2_0()); + after(grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_2_0()); } @@ -65145,7 +65145,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__DataClass__OperationsAssignment_9_2" + // $ANTLR end "rule__DataClass__AttributesAssignment_9_2" // $ANTLR start "rule__Attribute__NameAssignment_1" @@ -66991,26 +66991,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__PortClass__UserCodeAssignment_2_1" - // $ANTLR start "rule__PortClass__AttributesAssignment_3_0" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24857:1: rule__PortClass__AttributesAssignment_3_0 : ( ruleAttribute ) ; - public final void rule__PortClass__AttributesAssignment_3_0() throws RecognitionException { + // $ANTLR start "rule__PortClass__MsgHandlersAssignment_3_0" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24857:1: rule__PortClass__MsgHandlersAssignment_3_0 : ( ruleMessageHandler ) ; + public final void rule__PortClass__MsgHandlersAssignment_3_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24861:1: ( ( ruleAttribute ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24862:1: ( ruleAttribute ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24861:1: ( ( ruleMessageHandler ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24862:1: ( ruleMessageHandler ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24862:1: ( ruleAttribute ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24863:1: ruleAttribute + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24862:1: ( ruleMessageHandler ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24863:1: ruleMessageHandler { - before(grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_0_0()); - pushFollow(FOLLOW_ruleAttribute_in_rule__PortClass__AttributesAssignment_3_050207); - ruleAttribute(); + before(grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_0_0()); + pushFollow(FOLLOW_ruleMessageHandler_in_rule__PortClass__MsgHandlersAssignment_3_050207); + ruleMessageHandler(); state._fsp--; - after(grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_0_0()); + after(grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_0_0()); } @@ -67029,7 +67029,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__PortClass__AttributesAssignment_3_0" + // $ANTLR end "rule__PortClass__MsgHandlersAssignment_3_0" // $ANTLR start "rule__PortClass__OperationsAssignment_3_1" @@ -67073,26 +67073,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__PortClass__OperationsAssignment_3_1" - // $ANTLR start "rule__PortClass__MsgHandlersAssignment_3_2" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24887:1: rule__PortClass__MsgHandlersAssignment_3_2 : ( ruleMessageHandler ) ; - public final void rule__PortClass__MsgHandlersAssignment_3_2() throws RecognitionException { + // $ANTLR start "rule__PortClass__AttributesAssignment_3_2" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24887:1: rule__PortClass__AttributesAssignment_3_2 : ( ruleAttribute ) ; + public final void rule__PortClass__AttributesAssignment_3_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24891:1: ( ( ruleMessageHandler ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24892:1: ( ruleMessageHandler ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24891:1: ( ( ruleAttribute ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24892:1: ( ruleAttribute ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24892:1: ( ruleMessageHandler ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24893:1: ruleMessageHandler + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24892:1: ( ruleAttribute ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24893:1: ruleAttribute { - before(grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_2_0()); - pushFollow(FOLLOW_ruleMessageHandler_in_rule__PortClass__MsgHandlersAssignment_3_250269); - ruleMessageHandler(); + before(grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_2_0()); + pushFollow(FOLLOW_ruleAttribute_in_rule__PortClass__AttributesAssignment_3_250269); + ruleAttribute(); state._fsp--; - after(grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_2_0()); + after(grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_2_0()); } @@ -67111,7 +67111,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__PortClass__MsgHandlersAssignment_3_2" + // $ANTLR end "rule__PortClass__AttributesAssignment_3_2" // $ANTLR start "rule__InMessageHandler__MsgAssignment_2" @@ -67540,26 +67540,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__ActorClass__AnnotationsAssignment_6" - // $ANTLR start "rule__ActorClass__InterfacePortsAssignment_7_2_0" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25072:1: rule__ActorClass__InterfacePortsAssignment_7_2_0 : ( rulePort ) ; - public final void rule__ActorClass__InterfacePortsAssignment_7_2_0() throws RecognitionException { + // $ANTLR start "rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25072:1: rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 : ( ruleSPP ) ; + public final void rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25076:1: ( ( rulePort ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25077:1: ( rulePort ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25076:1: ( ( ruleSPP ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25077:1: ( ruleSPP ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25077:1: ( rulePort ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25078:1: rulePort + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25077:1: ( ruleSPP ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25078:1: ruleSPP { - before(grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_0_0()); - pushFollow(FOLLOW_rulePort_in_rule__ActorClass__InterfacePortsAssignment_7_2_050647); - rulePort(); + before(grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_0_0()); + pushFollow(FOLLOW_ruleSPP_in_rule__ActorClass__ServiceProvisionPointsAssignment_7_2_050647); + ruleSPP(); state._fsp--; - after(grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_0_0()); + after(grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_0_0()); } @@ -67578,29 +67578,29 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__ActorClass__InterfacePortsAssignment_7_2_0" + // $ANTLR end "rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0" - // $ANTLR start "rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25087:1: rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1 : ( ruleSPP ) ; - public final void rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1() throws RecognitionException { + // $ANTLR start "rule__ActorClass__InterfacePortsAssignment_7_2_1" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25087:1: rule__ActorClass__InterfacePortsAssignment_7_2_1 : ( rulePort ) ; + public final void rule__ActorClass__InterfacePortsAssignment_7_2_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25091:1: ( ( ruleSPP ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25092:1: ( ruleSPP ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25091:1: ( ( rulePort ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25092:1: ( rulePort ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25092:1: ( ruleSPP ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25093:1: ruleSPP + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25092:1: ( rulePort ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25093:1: rulePort { - before(grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_1_0()); - pushFollow(FOLLOW_ruleSPP_in_rule__ActorClass__ServiceProvisionPointsAssignment_7_2_150678); - ruleSPP(); + before(grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_1_0()); + pushFollow(FOLLOW_rulePort_in_rule__ActorClass__InterfacePortsAssignment_7_2_150678); + rulePort(); state._fsp--; - after(grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_1_0()); + after(grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_1_0()); } @@ -67619,7 +67619,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1" + // $ANTLR end "rule__ActorClass__InterfacePortsAssignment_7_2_1" // $ANTLR start "rule__ActorClass__StructureDocuAssignment_8_1" @@ -67786,26 +67786,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__ActorClass__UserCode3Assignment_8_5_1" - // $ANTLR start "rule__ActorClass__InternalPortsAssignment_8_6_0" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25162:1: rule__ActorClass__InternalPortsAssignment_8_6_0 : ( rulePort ) ; - public final void rule__ActorClass__InternalPortsAssignment_8_6_0() throws RecognitionException { + // $ANTLR start "rule__ActorClass__ConnectionsAssignment_8_6_0" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25162:1: rule__ActorClass__ConnectionsAssignment_8_6_0 : ( ruleLayerConnection ) ; + public final void rule__ActorClass__ConnectionsAssignment_8_6_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25166:1: ( ( rulePort ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25167:1: ( rulePort ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25166:1: ( ( ruleLayerConnection ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25167:1: ( ruleLayerConnection ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25167:1: ( rulePort ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25168:1: rulePort + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25167:1: ( ruleLayerConnection ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25168:1: ruleLayerConnection { - before(grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_0_0()); - pushFollow(FOLLOW_rulePort_in_rule__ActorClass__InternalPortsAssignment_8_6_050833); - rulePort(); + before(grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_0_0()); + pushFollow(FOLLOW_ruleLayerConnection_in_rule__ActorClass__ConnectionsAssignment_8_6_050833); + ruleLayerConnection(); state._fsp--; - after(grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_0_0()); + after(grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_0_0()); } @@ -67824,29 +67824,29 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__ActorClass__InternalPortsAssignment_8_6_0" + // $ANTLR end "rule__ActorClass__ConnectionsAssignment_8_6_0" - // $ANTLR start "rule__ActorClass__ExternalPortsAssignment_8_6_1" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25177:1: rule__ActorClass__ExternalPortsAssignment_8_6_1 : ( ruleExternalPort ) ; - public final void rule__ActorClass__ExternalPortsAssignment_8_6_1() throws RecognitionException { + // $ANTLR start "rule__ActorClass__BindingsAssignment_8_6_1" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25177:1: rule__ActorClass__BindingsAssignment_8_6_1 : ( ruleBinding ) ; + public final void rule__ActorClass__BindingsAssignment_8_6_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25181:1: ( ( ruleExternalPort ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25182:1: ( ruleExternalPort ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25181:1: ( ( ruleBinding ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25182:1: ( ruleBinding ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25182:1: ( ruleExternalPort ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25183:1: ruleExternalPort + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25182:1: ( ruleBinding ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25183:1: ruleBinding { - before(grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_1_0()); - pushFollow(FOLLOW_ruleExternalPort_in_rule__ActorClass__ExternalPortsAssignment_8_6_150864); - ruleExternalPort(); + before(grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_1_0()); + pushFollow(FOLLOW_ruleBinding_in_rule__ActorClass__BindingsAssignment_8_6_150864); + ruleBinding(); state._fsp--; - after(grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_1_0()); + after(grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_1_0()); } @@ -67865,29 +67865,29 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__ActorClass__ExternalPortsAssignment_8_6_1" + // $ANTLR end "rule__ActorClass__BindingsAssignment_8_6_1" - // $ANTLR start "rule__ActorClass__ServiceAccessPointsAssignment_8_6_2" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25192:1: rule__ActorClass__ServiceAccessPointsAssignment_8_6_2 : ( ruleSAP ) ; - public final void rule__ActorClass__ServiceAccessPointsAssignment_8_6_2() throws RecognitionException { + // $ANTLR start "rule__ActorClass__ServiceImplementationsAssignment_8_6_2" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25192:1: rule__ActorClass__ServiceImplementationsAssignment_8_6_2 : ( ruleServiceImplementation ) ; + public final void rule__ActorClass__ServiceImplementationsAssignment_8_6_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25196:1: ( ( ruleSAP ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25197:1: ( ruleSAP ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25196:1: ( ( ruleServiceImplementation ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25197:1: ( ruleServiceImplementation ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25197:1: ( ruleSAP ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25198:1: ruleSAP + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25197:1: ( ruleServiceImplementation ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25198:1: ruleServiceImplementation { - before(grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_2_0()); - pushFollow(FOLLOW_ruleSAP_in_rule__ActorClass__ServiceAccessPointsAssignment_8_6_250895); - ruleSAP(); + before(grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_2_0()); + pushFollow(FOLLOW_ruleServiceImplementation_in_rule__ActorClass__ServiceImplementationsAssignment_8_6_250895); + ruleServiceImplementation(); state._fsp--; - after(grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_2_0()); + after(grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_2_0()); } @@ -67906,7 +67906,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__ActorClass__ServiceAccessPointsAssignment_8_6_2" + // $ANTLR end "rule__ActorClass__ServiceImplementationsAssignment_8_6_2" // $ANTLR start "rule__ActorClass__AttributesAssignment_8_6_3" @@ -67991,26 +67991,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__ActorClass__ActorRefsAssignment_8_6_4" - // $ANTLR start "rule__ActorClass__ServiceImplementationsAssignment_8_6_5" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25237:1: rule__ActorClass__ServiceImplementationsAssignment_8_6_5 : ( ruleServiceImplementation ) ; - public final void rule__ActorClass__ServiceImplementationsAssignment_8_6_5() throws RecognitionException { + // $ANTLR start "rule__ActorClass__ServiceAccessPointsAssignment_8_6_5" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25237:1: rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 : ( ruleSAP ) ; + public final void rule__ActorClass__ServiceAccessPointsAssignment_8_6_5() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25241:1: ( ( ruleServiceImplementation ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25242:1: ( ruleServiceImplementation ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25241:1: ( ( ruleSAP ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25242:1: ( ruleSAP ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25242:1: ( ruleServiceImplementation ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25243:1: ruleServiceImplementation + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25242:1: ( ruleSAP ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25243:1: ruleSAP { - before(grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_5_0()); - pushFollow(FOLLOW_ruleServiceImplementation_in_rule__ActorClass__ServiceImplementationsAssignment_8_6_550988); - ruleServiceImplementation(); + before(grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_5_0()); + pushFollow(FOLLOW_ruleSAP_in_rule__ActorClass__ServiceAccessPointsAssignment_8_6_550988); + ruleSAP(); state._fsp--; - after(grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_5_0()); + after(grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_5_0()); } @@ -68029,29 +68029,29 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__ActorClass__ServiceImplementationsAssignment_8_6_5" + // $ANTLR end "rule__ActorClass__ServiceAccessPointsAssignment_8_6_5" - // $ANTLR start "rule__ActorClass__BindingsAssignment_8_6_6" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25252:1: rule__ActorClass__BindingsAssignment_8_6_6 : ( ruleBinding ) ; - public final void rule__ActorClass__BindingsAssignment_8_6_6() throws RecognitionException { + // $ANTLR start "rule__ActorClass__InternalPortsAssignment_8_6_6" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25252:1: rule__ActorClass__InternalPortsAssignment_8_6_6 : ( rulePort ) ; + public final void rule__ActorClass__InternalPortsAssignment_8_6_6() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25256:1: ( ( ruleBinding ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25257:1: ( ruleBinding ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25256:1: ( ( rulePort ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25257:1: ( rulePort ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25257:1: ( ruleBinding ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25258:1: ruleBinding + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25257:1: ( rulePort ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25258:1: rulePort { - before(grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_6_0()); - pushFollow(FOLLOW_ruleBinding_in_rule__ActorClass__BindingsAssignment_8_6_651019); - ruleBinding(); + before(grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_6_0()); + pushFollow(FOLLOW_rulePort_in_rule__ActorClass__InternalPortsAssignment_8_6_651019); + rulePort(); state._fsp--; - after(grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_6_0()); + after(grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_6_0()); } @@ -68070,29 +68070,29 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__ActorClass__BindingsAssignment_8_6_6" + // $ANTLR end "rule__ActorClass__InternalPortsAssignment_8_6_6" - // $ANTLR start "rule__ActorClass__ConnectionsAssignment_8_6_7" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25267:1: rule__ActorClass__ConnectionsAssignment_8_6_7 : ( ruleLayerConnection ) ; - public final void rule__ActorClass__ConnectionsAssignment_8_6_7() throws RecognitionException { + // $ANTLR start "rule__ActorClass__ExternalPortsAssignment_8_6_7" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25267:1: rule__ActorClass__ExternalPortsAssignment_8_6_7 : ( ruleExternalPort ) ; + public final void rule__ActorClass__ExternalPortsAssignment_8_6_7() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25271:1: ( ( ruleLayerConnection ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25272:1: ( ruleLayerConnection ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25271:1: ( ( ruleExternalPort ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25272:1: ( ruleExternalPort ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25272:1: ( ruleLayerConnection ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25273:1: ruleLayerConnection + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25272:1: ( ruleExternalPort ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25273:1: ruleExternalPort { - before(grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_7_0()); - pushFollow(FOLLOW_ruleLayerConnection_in_rule__ActorClass__ConnectionsAssignment_8_6_751050); - ruleLayerConnection(); + before(grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_7_0()); + pushFollow(FOLLOW_ruleExternalPort_in_rule__ActorClass__ExternalPortsAssignment_8_6_751050); + ruleExternalPort(); state._fsp--; - after(grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_7_0()); + after(grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_7_0()); } @@ -68111,7 +68111,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__ActorClass__ConnectionsAssignment_8_6_7" + // $ANTLR end "rule__ActorClass__ExternalPortsAssignment_8_6_7" // $ANTLR start "rule__ActorClass__BehaviorDocuAssignment_9_1" @@ -68196,26 +68196,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__ActorClass__BehaviorAnnotationsAssignment_9_3" - // $ANTLR start "rule__ActorClass__StructorsAssignment_9_4_0" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25312:1: rule__ActorClass__StructorsAssignment_9_4_0 : ( ruleClassStructor ) ; - public final void rule__ActorClass__StructorsAssignment_9_4_0() throws RecognitionException { + // $ANTLR start "rule__ActorClass__OperationsAssignment_9_4_0" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25312:1: rule__ActorClass__OperationsAssignment_9_4_0 : ( ruleStandardOperation ) ; + public final void rule__ActorClass__OperationsAssignment_9_4_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25316:1: ( ( ruleClassStructor ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25317:1: ( ruleClassStructor ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25316:1: ( ( ruleStandardOperation ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25317:1: ( ruleStandardOperation ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25317:1: ( ruleClassStructor ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25318:1: ruleClassStructor + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25317:1: ( ruleStandardOperation ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25318:1: ruleStandardOperation { - before(grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_0_0()); - pushFollow(FOLLOW_ruleClassStructor_in_rule__ActorClass__StructorsAssignment_9_4_051143); - ruleClassStructor(); + before(grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_0_0()); + pushFollow(FOLLOW_ruleStandardOperation_in_rule__ActorClass__OperationsAssignment_9_4_051143); + ruleStandardOperation(); state._fsp--; - after(grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_0_0()); + after(grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_0_0()); } @@ -68234,29 +68234,29 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__ActorClass__StructorsAssignment_9_4_0" + // $ANTLR end "rule__ActorClass__OperationsAssignment_9_4_0" - // $ANTLR start "rule__ActorClass__OperationsAssignment_9_4_1" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25327:1: rule__ActorClass__OperationsAssignment_9_4_1 : ( ruleStandardOperation ) ; - public final void rule__ActorClass__OperationsAssignment_9_4_1() throws RecognitionException { + // $ANTLR start "rule__ActorClass__StructorsAssignment_9_4_1" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25327:1: rule__ActorClass__StructorsAssignment_9_4_1 : ( ruleClassStructor ) ; + public final void rule__ActorClass__StructorsAssignment_9_4_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25331:1: ( ( ruleStandardOperation ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25332:1: ( ruleStandardOperation ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25331:1: ( ( ruleClassStructor ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25332:1: ( ruleClassStructor ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25332:1: ( ruleStandardOperation ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25333:1: ruleStandardOperation + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25332:1: ( ruleClassStructor ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25333:1: ruleClassStructor { - before(grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_1_0()); - pushFollow(FOLLOW_ruleStandardOperation_in_rule__ActorClass__OperationsAssignment_9_4_151174); - ruleStandardOperation(); + before(grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_1_0()); + pushFollow(FOLLOW_ruleClassStructor_in_rule__ActorClass__StructorsAssignment_9_4_151174); + ruleClassStructor(); state._fsp--; - after(grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_1_0()); + after(grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_1_0()); } @@ -68275,7 +68275,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__ActorClass__OperationsAssignment_9_4_1" + // $ANTLR end "rule__ActorClass__StructorsAssignment_9_4_1" // $ANTLR start "rule__ActorClass__StateMachineAssignment_9_5" @@ -68913,26 +68913,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__LogicalSystem__AnnotationsAssignment_4" - // $ANTLR start "rule__LogicalSystem__SubSystemsAssignment_5_0" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25595:1: rule__LogicalSystem__SubSystemsAssignment_5_0 : ( ruleSubSystemRef ) ; - public final void rule__LogicalSystem__SubSystemsAssignment_5_0() throws RecognitionException { + // $ANTLR start "rule__LogicalSystem__ConnectionsAssignment_5_0" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25595:1: rule__LogicalSystem__ConnectionsAssignment_5_0 : ( ruleLayerConnection ) ; + public final void rule__LogicalSystem__ConnectionsAssignment_5_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25599:1: ( ( ruleSubSystemRef ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25600:1: ( ruleSubSystemRef ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25599:1: ( ( ruleLayerConnection ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25600:1: ( ruleLayerConnection ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25600:1: ( ruleSubSystemRef ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25601:1: ruleSubSystemRef + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25600:1: ( ruleLayerConnection ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25601:1: ruleLayerConnection { - before(grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_0_0()); - pushFollow(FOLLOW_ruleSubSystemRef_in_rule__LogicalSystem__SubSystemsAssignment_5_051723); - ruleSubSystemRef(); + before(grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_0_0()); + pushFollow(FOLLOW_ruleLayerConnection_in_rule__LogicalSystem__ConnectionsAssignment_5_051723); + ruleLayerConnection(); state._fsp--; - after(grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_0_0()); + after(grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_0_0()); } @@ -68951,7 +68951,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__LogicalSystem__SubSystemsAssignment_5_0" + // $ANTLR end "rule__LogicalSystem__ConnectionsAssignment_5_0" // $ANTLR start "rule__LogicalSystem__BindingsAssignment_5_1" @@ -68995,26 +68995,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__LogicalSystem__BindingsAssignment_5_1" - // $ANTLR start "rule__LogicalSystem__ConnectionsAssignment_5_2" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25625:1: rule__LogicalSystem__ConnectionsAssignment_5_2 : ( ruleLayerConnection ) ; - public final void rule__LogicalSystem__ConnectionsAssignment_5_2() throws RecognitionException { + // $ANTLR start "rule__LogicalSystem__SubSystemsAssignment_5_2" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25625:1: rule__LogicalSystem__SubSystemsAssignment_5_2 : ( ruleSubSystemRef ) ; + public final void rule__LogicalSystem__SubSystemsAssignment_5_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25629:1: ( ( ruleLayerConnection ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25630:1: ( ruleLayerConnection ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25629:1: ( ( ruleSubSystemRef ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25630:1: ( ruleSubSystemRef ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25630:1: ( ruleLayerConnection ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25631:1: ruleLayerConnection + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25630:1: ( ruleSubSystemRef ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25631:1: ruleSubSystemRef { - before(grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_2_0()); - pushFollow(FOLLOW_ruleLayerConnection_in_rule__LogicalSystem__ConnectionsAssignment_5_251785); - ruleLayerConnection(); + before(grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_2_0()); + pushFollow(FOLLOW_ruleSubSystemRef_in_rule__LogicalSystem__SubSystemsAssignment_5_251785); + ruleSubSystemRef(); state._fsp--; - after(grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_2_0()); + after(grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_2_0()); } @@ -69033,7 +69033,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__LogicalSystem__ConnectionsAssignment_5_2" + // $ANTLR end "rule__LogicalSystem__SubSystemsAssignment_5_2" // $ANTLR start "rule__SubSystemRef__NameAssignment_1" @@ -69405,26 +69405,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__SubSystemClass__UserCode3Assignment_7_1" - // $ANTLR start "rule__SubSystemClass__RelayPortsAssignment_8_0" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25779:1: rule__SubSystemClass__RelayPortsAssignment_8_0 : ( rulePort ) ; - public final void rule__SubSystemClass__RelayPortsAssignment_8_0() throws RecognitionException { + // $ANTLR start "rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25779:1: rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 : ( ruleActorInstanceMapping ) ; + public final void rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25783:1: ( ( rulePort ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25784:1: ( rulePort ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25783:1: ( ( ruleActorInstanceMapping ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25784:1: ( ruleActorInstanceMapping ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25784:1: ( rulePort ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25785:1: rulePort + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25784:1: ( ruleActorInstanceMapping ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25785:1: ruleActorInstanceMapping { - before(grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_0_0()); - pushFollow(FOLLOW_rulePort_in_rule__SubSystemClass__RelayPortsAssignment_8_052103); - rulePort(); + before(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_0_0()); + pushFollow(FOLLOW_ruleActorInstanceMapping_in_rule__SubSystemClass__ActorInstanceMappingsAssignment_8_052103); + ruleActorInstanceMapping(); state._fsp--; - after(grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_0_0()); + after(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_0_0()); } @@ -69443,29 +69443,29 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__SubSystemClass__RelayPortsAssignment_8_0" + // $ANTLR end "rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0" - // $ANTLR start "rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25794:1: rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1 : ( ruleSPP ) ; - public final void rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1() throws RecognitionException { + // $ANTLR start "rule__SubSystemClass__ThreadsAssignment_8_1" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25794:1: rule__SubSystemClass__ThreadsAssignment_8_1 : ( ruleLogicalThread ) ; + public final void rule__SubSystemClass__ThreadsAssignment_8_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25798:1: ( ( ruleSPP ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25799:1: ( ruleSPP ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25798:1: ( ( ruleLogicalThread ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25799:1: ( ruleLogicalThread ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25799:1: ( ruleSPP ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25800:1: ruleSPP + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25799:1: ( ruleLogicalThread ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25800:1: ruleLogicalThread { - before(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_1_0()); - pushFollow(FOLLOW_ruleSPP_in_rule__SubSystemClass__ServiceProvisionPointsAssignment_8_152134); - ruleSPP(); + before(grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_1_0()); + pushFollow(FOLLOW_ruleLogicalThread_in_rule__SubSystemClass__ThreadsAssignment_8_152134); + ruleLogicalThread(); state._fsp--; - after(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_1_0()); + after(grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_1_0()); } @@ -69484,29 +69484,29 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1" + // $ANTLR end "rule__SubSystemClass__ThreadsAssignment_8_1" - // $ANTLR start "rule__SubSystemClass__ActorRefsAssignment_8_2" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25809:1: rule__SubSystemClass__ActorRefsAssignment_8_2 : ( ruleActorRef ) ; - public final void rule__SubSystemClass__ActorRefsAssignment_8_2() throws RecognitionException { + // $ANTLR start "rule__SubSystemClass__ConnectionsAssignment_8_2" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25809:1: rule__SubSystemClass__ConnectionsAssignment_8_2 : ( ruleLayerConnection ) ; + public final void rule__SubSystemClass__ConnectionsAssignment_8_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25813:1: ( ( ruleActorRef ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25814:1: ( ruleActorRef ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25813:1: ( ( ruleLayerConnection ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25814:1: ( ruleLayerConnection ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25814:1: ( ruleActorRef ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25815:1: ruleActorRef + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25814:1: ( ruleLayerConnection ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25815:1: ruleLayerConnection { - before(grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_2_0()); - pushFollow(FOLLOW_ruleActorRef_in_rule__SubSystemClass__ActorRefsAssignment_8_252165); - ruleActorRef(); + before(grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_2_0()); + pushFollow(FOLLOW_ruleLayerConnection_in_rule__SubSystemClass__ConnectionsAssignment_8_252165); + ruleLayerConnection(); state._fsp--; - after(grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_2_0()); + after(grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_2_0()); } @@ -69525,7 +69525,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__SubSystemClass__ActorRefsAssignment_8_2" + // $ANTLR end "rule__SubSystemClass__ConnectionsAssignment_8_2" // $ANTLR start "rule__SubSystemClass__BindingsAssignment_8_3" @@ -69569,26 +69569,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__SubSystemClass__BindingsAssignment_8_3" - // $ANTLR start "rule__SubSystemClass__ConnectionsAssignment_8_4" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25839:1: rule__SubSystemClass__ConnectionsAssignment_8_4 : ( ruleLayerConnection ) ; - public final void rule__SubSystemClass__ConnectionsAssignment_8_4() throws RecognitionException { + // $ANTLR start "rule__SubSystemClass__ActorRefsAssignment_8_4" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25839:1: rule__SubSystemClass__ActorRefsAssignment_8_4 : ( ruleActorRef ) ; + public final void rule__SubSystemClass__ActorRefsAssignment_8_4() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25843:1: ( ( ruleLayerConnection ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25844:1: ( ruleLayerConnection ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25843:1: ( ( ruleActorRef ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25844:1: ( ruleActorRef ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25844:1: ( ruleLayerConnection ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25845:1: ruleLayerConnection + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25844:1: ( ruleActorRef ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25845:1: ruleActorRef { - before(grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_4_0()); - pushFollow(FOLLOW_ruleLayerConnection_in_rule__SubSystemClass__ConnectionsAssignment_8_452227); - ruleLayerConnection(); + before(grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_4_0()); + pushFollow(FOLLOW_ruleActorRef_in_rule__SubSystemClass__ActorRefsAssignment_8_452227); + ruleActorRef(); state._fsp--; - after(grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_4_0()); + after(grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_4_0()); } @@ -69607,29 +69607,29 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__SubSystemClass__ConnectionsAssignment_8_4" + // $ANTLR end "rule__SubSystemClass__ActorRefsAssignment_8_4" - // $ANTLR start "rule__SubSystemClass__ThreadsAssignment_8_5" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25854:1: rule__SubSystemClass__ThreadsAssignment_8_5 : ( ruleLogicalThread ) ; - public final void rule__SubSystemClass__ThreadsAssignment_8_5() throws RecognitionException { + // $ANTLR start "rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25854:1: rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 : ( ruleSPP ) ; + public final void rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25858:1: ( ( ruleLogicalThread ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25859:1: ( ruleLogicalThread ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25858:1: ( ( ruleSPP ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25859:1: ( ruleSPP ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25859:1: ( ruleLogicalThread ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25860:1: ruleLogicalThread + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25859:1: ( ruleSPP ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25860:1: ruleSPP { - before(grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_5_0()); - pushFollow(FOLLOW_ruleLogicalThread_in_rule__SubSystemClass__ThreadsAssignment_8_552258); - ruleLogicalThread(); + before(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_5_0()); + pushFollow(FOLLOW_ruleSPP_in_rule__SubSystemClass__ServiceProvisionPointsAssignment_8_552258); + ruleSPP(); state._fsp--; - after(grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_5_0()); + after(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_5_0()); } @@ -69648,29 +69648,29 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__SubSystemClass__ThreadsAssignment_8_5" + // $ANTLR end "rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5" - // $ANTLR start "rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6" - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25869:1: rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6 : ( ruleActorInstanceMapping ) ; - public final void rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6() throws RecognitionException { + // $ANTLR start "rule__SubSystemClass__RelayPortsAssignment_8_6" + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25869:1: rule__SubSystemClass__RelayPortsAssignment_8_6 : ( rulePort ) ; + public final void rule__SubSystemClass__RelayPortsAssignment_8_6() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25873:1: ( ( ruleActorInstanceMapping ) ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25874:1: ( ruleActorInstanceMapping ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25873:1: ( ( rulePort ) ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25874:1: ( rulePort ) { - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25874:1: ( ruleActorInstanceMapping ) - // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25875:1: ruleActorInstanceMapping + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25874:1: ( rulePort ) + // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25875:1: rulePort { - before(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_6_0()); - pushFollow(FOLLOW_ruleActorInstanceMapping_in_rule__SubSystemClass__ActorInstanceMappingsAssignment_8_652289); - ruleActorInstanceMapping(); + before(grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_6_0()); + pushFollow(FOLLOW_rulePort_in_rule__SubSystemClass__RelayPortsAssignment_8_652289); + rulePort(); state._fsp--; - after(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_6_0()); + after(grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_6_0()); } @@ -69689,7 +69689,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6" + // $ANTLR end "rule__SubSystemClass__RelayPortsAssignment_8_6" // $ANTLR start "rule__LogicalThread__NameAssignment_1" @@ -75677,9 +75677,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_ruleComplexType_in_rule__DataType__Alternatives7014 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDataClass_in_rule__ComplexType__Alternatives7046 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleExternalType_in_rule__ComplexType__Alternatives7063 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__DataClass__AttributesAssignment_9_0_in_rule__DataClass__Alternatives_97095 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__DataClass__OperationsAssignment_9_0_in_rule__DataClass__Alternatives_97095 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__DataClass__StructorsAssignment_9_1_in_rule__DataClass__Alternatives_97113 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__DataClass__OperationsAssignment_9_2_in_rule__DataClass__Alternatives_97131 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__DataClass__AttributesAssignment_9_2_in_rule__DataClass__Alternatives_97131 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_13_in_rule__StandardOperation__Alternatives_6_17166 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__StandardOperation__ReturnTypeAssignment_6_1_1_in_rule__StandardOperation__Alternatives_6_17185 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__PortOperation__Group_5_0__0_in_rule__PortOperation__Alternatives_57218 = new BitSet(new long[]{0x0000000000000002L}); @@ -75690,36 +75690,36 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_15_in_rule__ClassStructor__NameAlternatives_0_07343 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleProtocolClass_in_rule__GeneralProtocolClass__Alternatives7377 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleCompoundProtocolClass_in_rule__GeneralProtocolClass__Alternatives7394 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__PortClass__AttributesAssignment_3_0_in_rule__PortClass__Alternatives_37426 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__PortClass__MsgHandlersAssignment_3_0_in_rule__PortClass__Alternatives_37426 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__PortClass__OperationsAssignment_3_1_in_rule__PortClass__Alternatives_37444 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__PortClass__MsgHandlersAssignment_3_2_in_rule__PortClass__Alternatives_37462 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__PortClass__AttributesAssignment_3_2_in_rule__PortClass__Alternatives_37462 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleInMessageHandler_in_rule__MessageHandler__Alternatives7495 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleOutMessageHandler_in_rule__MessageHandler__Alternatives7512 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__InterfacePortsAssignment_7_2_0_in_rule__ActorClass__Alternatives_7_27544 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__ServiceProvisionPointsAssignment_7_2_1_in_rule__ActorClass__Alternatives_7_27562 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__InternalPortsAssignment_8_6_0_in_rule__ActorClass__Alternatives_8_67595 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__ExternalPortsAssignment_8_6_1_in_rule__ActorClass__Alternatives_8_67613 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__ServiceAccessPointsAssignment_8_6_2_in_rule__ActorClass__Alternatives_8_67631 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0_in_rule__ActorClass__Alternatives_7_27544 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__ActorClass__InterfacePortsAssignment_7_2_1_in_rule__ActorClass__Alternatives_7_27562 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__ActorClass__ConnectionsAssignment_8_6_0_in_rule__ActorClass__Alternatives_8_67595 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__ActorClass__BindingsAssignment_8_6_1_in_rule__ActorClass__Alternatives_8_67613 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__ActorClass__ServiceImplementationsAssignment_8_6_2_in_rule__ActorClass__Alternatives_8_67631 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__ActorClass__AttributesAssignment_8_6_3_in_rule__ActorClass__Alternatives_8_67649 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__ActorClass__ActorRefsAssignment_8_6_4_in_rule__ActorClass__Alternatives_8_67667 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__ServiceImplementationsAssignment_8_6_5_in_rule__ActorClass__Alternatives_8_67685 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__BindingsAssignment_8_6_6_in_rule__ActorClass__Alternatives_8_67703 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__ConnectionsAssignment_8_6_7_in_rule__ActorClass__Alternatives_8_67721 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__StructorsAssignment_9_4_0_in_rule__ActorClass__Alternatives_9_47754 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__OperationsAssignment_9_4_1_in_rule__ActorClass__Alternatives_9_47772 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__ActorClass__ServiceAccessPointsAssignment_8_6_5_in_rule__ActorClass__Alternatives_8_67685 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__ActorClass__InternalPortsAssignment_8_6_6_in_rule__ActorClass__Alternatives_8_67703 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__ActorClass__ExternalPortsAssignment_8_6_7_in_rule__ActorClass__Alternatives_8_67721 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__ActorClass__OperationsAssignment_9_4_0_in_rule__ActorClass__Alternatives_9_47754 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__ActorClass__StructorsAssignment_9_4_1_in_rule__ActorClass__Alternatives_9_47772 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rulePort_in_rule__InterfaceItem__Alternatives7805 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleSAP_in_rule__InterfaceItem__Alternatives7822 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleSPP_in_rule__InterfaceItem__Alternatives7839 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__LogicalSystem__SubSystemsAssignment_5_0_in_rule__LogicalSystem__Alternatives_57871 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__LogicalSystem__ConnectionsAssignment_5_0_in_rule__LogicalSystem__Alternatives_57871 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__LogicalSystem__BindingsAssignment_5_1_in_rule__LogicalSystem__Alternatives_57889 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__LogicalSystem__ConnectionsAssignment_5_2_in_rule__LogicalSystem__Alternatives_57907 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__SubSystemClass__RelayPortsAssignment_8_0_in_rule__SubSystemClass__Alternatives_87941 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__SubSystemClass__ServiceProvisionPointsAssignment_8_1_in_rule__SubSystemClass__Alternatives_87959 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__SubSystemClass__ActorRefsAssignment_8_2_in_rule__SubSystemClass__Alternatives_87977 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__LogicalSystem__SubSystemsAssignment_5_2_in_rule__LogicalSystem__Alternatives_57907 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0_in_rule__SubSystemClass__Alternatives_87941 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__SubSystemClass__ThreadsAssignment_8_1_in_rule__SubSystemClass__Alternatives_87959 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__SubSystemClass__ConnectionsAssignment_8_2_in_rule__SubSystemClass__Alternatives_87977 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__SubSystemClass__BindingsAssignment_8_3_in_rule__SubSystemClass__Alternatives_87995 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__SubSystemClass__ConnectionsAssignment_8_4_in_rule__SubSystemClass__Alternatives_88013 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__SubSystemClass__ThreadsAssignment_8_5_in_rule__SubSystemClass__Alternatives_88031 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__SubSystemClass__ActorInstanceMappingsAssignment_8_6_in_rule__SubSystemClass__Alternatives_88049 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__SubSystemClass__ActorRefsAssignment_8_4_in_rule__SubSystemClass__Alternatives_88013 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5_in_rule__SubSystemClass__Alternatives_88031 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__SubSystemClass__RelayPortsAssignment_8_6_in_rule__SubSystemClass__Alternatives_88049 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleRefSAPoint_in_rule__SAPoint__Alternatives8082 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleRelaySAPoint_in_rule__SAPoint__Alternatives8099 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_16_in_rule__MULTIPLICITY__Alternatives_18132 = new BitSet(new long[]{0x0000000000000002L}); @@ -76034,7 +76034,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_51_in_rule__Attribute__Group_5__0__Impl15247 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__Attribute__Group_5__1__Impl_in_rule__Attribute__Group_5__115278 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__Attribute__DefaultValueLiteralAssignment_5_1_in_rule__Attribute__Group_5__1__Impl15305 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__StandardOperation__Group__0__Impl_in_rule__StandardOperation__Group__015339 = new BitSet(new long[]{0x120000000000C000L,0x4000000000000000L}); + public static final BitSet FOLLOW_rule__StandardOperation__Group__0__Impl_in_rule__StandardOperation__Group__015339 = new BitSet(new long[]{0x1000000000000000L,0x4000000000000000L}); public static final BitSet FOLLOW_rule__StandardOperation__Group__1_in_rule__StandardOperation__Group__015342 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__StandardOperation__OverrideAssignment_0_in_rule__StandardOperation__Group__0__Impl15369 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__StandardOperation__Group__1__Impl_in_rule__StandardOperation__Group__115400 = new BitSet(new long[]{0x0000000000000080L}); @@ -76281,15 +76281,15 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_rule__Message__DocuAssignment_6_in_rule__Message__Group__6__Impl20847 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__PortClass__Group__0__Impl_in_rule__PortClass__Group__020892 = new BitSet(new long[]{0x0000010000000000L}); public static final BitSet FOLLOW_rule__PortClass__Group__1_in_rule__PortClass__Group__020895 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__PortClass__Group__1__Impl_in_rule__PortClass__Group__120953 = new BitSet(new long[]{0x1200020000000000L,0x0000000000000060L}); + public static final BitSet FOLLOW_rule__PortClass__Group__1__Impl_in_rule__PortClass__Group__120953 = new BitSet(new long[]{0x120002000000C000L,0x4000000000000060L}); public static final BitSet FOLLOW_rule__PortClass__Group__2_in_rule__PortClass__Group__120956 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_40_in_rule__PortClass__Group__1__Impl20984 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__PortClass__Group__2__Impl_in_rule__PortClass__Group__221015 = new BitSet(new long[]{0x1200020000000000L,0x0000000000000060L}); + public static final BitSet FOLLOW_rule__PortClass__Group__2__Impl_in_rule__PortClass__Group__221015 = new BitSet(new long[]{0x120002000000C000L,0x4000000000000060L}); public static final BitSet FOLLOW_rule__PortClass__Group__3_in_rule__PortClass__Group__221018 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__PortClass__Group_2__0_in_rule__PortClass__Group__2__Impl21045 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__PortClass__Group__3__Impl_in_rule__PortClass__Group__321076 = new BitSet(new long[]{0x1200020000000000L,0x0000000000000060L}); + public static final BitSet FOLLOW_rule__PortClass__Group__3__Impl_in_rule__PortClass__Group__321076 = new BitSet(new long[]{0x120002000000C000L,0x4000000000000060L}); public static final BitSet FOLLOW_rule__PortClass__Group__4_in_rule__PortClass__Group__321079 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__PortClass__Alternatives_3_in_rule__PortClass__Group__3__Impl21106 = new BitSet(new long[]{0x1200000000000002L,0x0000000000000040L}); + public static final BitSet FOLLOW_rule__PortClass__Alternatives_3_in_rule__PortClass__Group__3__Impl21106 = new BitSet(new long[]{0x120000000000C002L,0x4000000000000040L}); public static final BitSet FOLLOW_rule__PortClass__Group__4__Impl_in_rule__PortClass__Group__421137 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_41_in_rule__PortClass__Group__4__Impl21165 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__PortClass__Group_2__0__Impl_in_rule__PortClass__Group_2__021206 = new BitSet(new long[]{0x0000010000000000L}); @@ -76373,21 +76373,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_rule__ActorClass__Group_8__1__Impl_in_rule__ActorClass__Group_8__122955 = new BitSet(new long[]{0x0400010000000000L}); public static final BitSet FOLLOW_rule__ActorClass__Group_8__2_in_rule__ActorClass__Group_8__122958 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__ActorClass__StructureDocuAssignment_8_1_in_rule__ActorClass__Group_8__1__Impl22985 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__Group_8__2__Impl_in_rule__ActorClass__Group_8__223016 = new BitSet(new long[]{0x03C0020300000000L,0x0000000008885C04L}); + public static final BitSet FOLLOW_rule__ActorClass__Group_8__2__Impl_in_rule__ActorClass__Group_8__223016 = new BitSet(new long[]{0x13C002030000C000L,0x4000000008887C04L}); public static final BitSet FOLLOW_rule__ActorClass__Group_8__3_in_rule__ActorClass__Group_8__223019 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_40_in_rule__ActorClass__Group_8__2__Impl23047 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__Group_8__3__Impl_in_rule__ActorClass__Group_8__323078 = new BitSet(new long[]{0x03C0020300000000L,0x0000000008885C04L}); + public static final BitSet FOLLOW_rule__ActorClass__Group_8__3__Impl_in_rule__ActorClass__Group_8__323078 = new BitSet(new long[]{0x13C002030000C000L,0x4000000008887C04L}); public static final BitSet FOLLOW_rule__ActorClass__Group_8__4_in_rule__ActorClass__Group_8__323081 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__ActorClass__Group_8_3__0_in_rule__ActorClass__Group_8__3__Impl23108 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__Group_8__4__Impl_in_rule__ActorClass__Group_8__423139 = new BitSet(new long[]{0x03C0020300000000L,0x0000000008885C04L}); + public static final BitSet FOLLOW_rule__ActorClass__Group_8__4__Impl_in_rule__ActorClass__Group_8__423139 = new BitSet(new long[]{0x13C002030000C000L,0x4000000008887C04L}); public static final BitSet FOLLOW_rule__ActorClass__Group_8__5_in_rule__ActorClass__Group_8__423142 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__ActorClass__Group_8_4__0_in_rule__ActorClass__Group_8__4__Impl23169 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__Group_8__5__Impl_in_rule__ActorClass__Group_8__523200 = new BitSet(new long[]{0x03C0020300000000L,0x0000000008885C04L}); + public static final BitSet FOLLOW_rule__ActorClass__Group_8__5__Impl_in_rule__ActorClass__Group_8__523200 = new BitSet(new long[]{0x13C002030000C000L,0x4000000008887C04L}); public static final BitSet FOLLOW_rule__ActorClass__Group_8__6_in_rule__ActorClass__Group_8__523203 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__ActorClass__Group_8_5__0_in_rule__ActorClass__Group_8__5__Impl23230 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__Group_8__6__Impl_in_rule__ActorClass__Group_8__623261 = new BitSet(new long[]{0x03C0020300000000L,0x0000000008885C04L}); + public static final BitSet FOLLOW_rule__ActorClass__Group_8__6__Impl_in_rule__ActorClass__Group_8__623261 = new BitSet(new long[]{0x13C002030000C000L,0x4000000008887C04L}); public static final BitSet FOLLOW_rule__ActorClass__Group_8__7_in_rule__ActorClass__Group_8__623264 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__Alternatives_8_6_in_rule__ActorClass__Group_8__6__Impl23291 = new BitSet(new long[]{0x0200000300000002L,0x0000000008885C04L}); + public static final BitSet FOLLOW_rule__ActorClass__Alternatives_8_6_in_rule__ActorClass__Group_8__6__Impl23291 = new BitSet(new long[]{0x120000030000C002L,0x4000000008887C04L}); public static final BitSet FOLLOW_rule__ActorClass__Group_8__7__Impl_in_rule__ActorClass__Group_8__723322 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_41_in_rule__ActorClass__Group_8__7__Impl23350 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__ActorClass__Group_8_3__0__Impl_in_rule__ActorClass__Group_8_3__023397 = new BitSet(new long[]{0x0000010000000000L}); @@ -76411,21 +76411,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_rule__ActorClass__Group_9__1__Impl_in_rule__ActorClass__Group_9__123828 = new BitSet(new long[]{0x0400010000000000L}); public static final BitSet FOLLOW_rule__ActorClass__Group_9__2_in_rule__ActorClass__Group_9__123831 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__ActorClass__BehaviorDocuAssignment_9_1_in_rule__ActorClass__Group_9__1__Impl23858 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__Group_9__2__Impl_in_rule__ActorClass__Group_9__223889 = new BitSet(new long[]{0x120002000000C000L,0x4080000010000000L}); + public static final BitSet FOLLOW_rule__ActorClass__Group_9__2__Impl_in_rule__ActorClass__Group_9__223889 = new BitSet(new long[]{0x100002000000C000L,0x4080000010000000L}); public static final BitSet FOLLOW_rule__ActorClass__Group_9__3_in_rule__ActorClass__Group_9__223892 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_40_in_rule__ActorClass__Group_9__2__Impl23920 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__Group_9__3__Impl_in_rule__ActorClass__Group_9__323951 = new BitSet(new long[]{0x120002000000C000L,0x4080000010000000L}); + public static final BitSet FOLLOW_rule__ActorClass__Group_9__3__Impl_in_rule__ActorClass__Group_9__323951 = new BitSet(new long[]{0x100002000000C000L,0x4080000010000000L}); public static final BitSet FOLLOW_rule__ActorClass__Group_9__4_in_rule__ActorClass__Group_9__323954 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__ActorClass__BehaviorAnnotationsAssignment_9_3_in_rule__ActorClass__Group_9__3__Impl23981 = new BitSet(new long[]{0x0000000000000002L,0x0080000000000000L}); - public static final BitSet FOLLOW_rule__ActorClass__Group_9__4__Impl_in_rule__ActorClass__Group_9__424012 = new BitSet(new long[]{0x120002000000C000L,0x4080000010000000L}); + public static final BitSet FOLLOW_rule__ActorClass__Group_9__4__Impl_in_rule__ActorClass__Group_9__424012 = new BitSet(new long[]{0x100002000000C000L,0x4080000010000000L}); public static final BitSet FOLLOW_rule__ActorClass__Group_9__5_in_rule__ActorClass__Group_9__424015 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorClass__Alternatives_9_4_in_rule__ActorClass__Group_9__4__Impl24042 = new BitSet(new long[]{0x120000000000C002L,0x4000000000000000L}); - public static final BitSet FOLLOW_rule__ActorClass__Group_9__5__Impl_in_rule__ActorClass__Group_9__524073 = new BitSet(new long[]{0x120002000000C000L,0x4080000010000000L}); + public static final BitSet FOLLOW_rule__ActorClass__Alternatives_9_4_in_rule__ActorClass__Group_9__4__Impl24042 = new BitSet(new long[]{0x100000000000C002L,0x4000000000000000L}); + public static final BitSet FOLLOW_rule__ActorClass__Group_9__5__Impl_in_rule__ActorClass__Group_9__524073 = new BitSet(new long[]{0x100002000000C000L,0x4080000010000000L}); public static final BitSet FOLLOW_rule__ActorClass__Group_9__6_in_rule__ActorClass__Group_9__524076 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__ActorClass__StateMachineAssignment_9_5_in_rule__ActorClass__Group_9__5__Impl24103 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__ActorClass__Group_9__6__Impl_in_rule__ActorClass__Group_9__624134 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_41_in_rule__ActorClass__Group_9__6__Impl24162 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__Port__Group__0__Impl_in_rule__Port__Group__024207 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000404L}); + public static final BitSet FOLLOW_rule__Port__Group__0__Impl_in_rule__Port__Group__024207 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002404L}); public static final BitSet FOLLOW_rule__Port__Group__1_in_rule__Port__Group__024210 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__Port__ConjugatedAssignment_0_in_rule__Port__Group__0__Impl24237 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__Port__Group__1__Impl_in_rule__Port__Group__124268 = new BitSet(new long[]{0x0000000000000080L}); @@ -76492,15 +76492,15 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_rule__LogicalSystem__Group__2__Impl_in_rule__LogicalSystem__Group__225639 = new BitSet(new long[]{0x0400010000000000L}); public static final BitSet FOLLOW_rule__LogicalSystem__Group__3_in_rule__LogicalSystem__Group__225642 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__LogicalSystem__DocuAssignment_2_in_rule__LogicalSystem__Group__2__Impl25669 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__LogicalSystem__Group__3__Impl_in_rule__LogicalSystem__Group__325700 = new BitSet(new long[]{0x0200020300000000L,0x008000000888DC04L}); + public static final BitSet FOLLOW_rule__LogicalSystem__Group__3__Impl_in_rule__LogicalSystem__Group__325700 = new BitSet(new long[]{0x0000020000000000L,0x0080000000888000L}); public static final BitSet FOLLOW_rule__LogicalSystem__Group__4_in_rule__LogicalSystem__Group__325703 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_40_in_rule__LogicalSystem__Group__3__Impl25731 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__LogicalSystem__Group__4__Impl_in_rule__LogicalSystem__Group__425762 = new BitSet(new long[]{0x0200020300000000L,0x008000000888DC04L}); + public static final BitSet FOLLOW_rule__LogicalSystem__Group__4__Impl_in_rule__LogicalSystem__Group__425762 = new BitSet(new long[]{0x0000020000000000L,0x0080000000888000L}); public static final BitSet FOLLOW_rule__LogicalSystem__Group__5_in_rule__LogicalSystem__Group__425765 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__LogicalSystem__AnnotationsAssignment_4_in_rule__LogicalSystem__Group__4__Impl25792 = new BitSet(new long[]{0x0000000000000002L,0x0080000000000000L}); - public static final BitSet FOLLOW_rule__LogicalSystem__Group__5__Impl_in_rule__LogicalSystem__Group__525823 = new BitSet(new long[]{0x0200020300000000L,0x008000000888DC04L}); + public static final BitSet FOLLOW_rule__LogicalSystem__Group__5__Impl_in_rule__LogicalSystem__Group__525823 = new BitSet(new long[]{0x0000020000000000L,0x0080000000888000L}); public static final BitSet FOLLOW_rule__LogicalSystem__Group__6_in_rule__LogicalSystem__Group__525826 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__LogicalSystem__Alternatives_5_in_rule__LogicalSystem__Group__5__Impl25853 = new BitSet(new long[]{0x0200000300000002L,0x000000000888DC04L}); + public static final BitSet FOLLOW_rule__LogicalSystem__Alternatives_5_in_rule__LogicalSystem__Group__5__Impl25853 = new BitSet(new long[]{0x0000000000000002L,0x0000000000888000L}); public static final BitSet FOLLOW_rule__LogicalSystem__Group__6__Impl_in_rule__LogicalSystem__Group__625884 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_41_in_rule__LogicalSystem__Group__6__Impl25912 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__SubSystemRef__Group__0__Impl_in_rule__SubSystemRef__Group__025957 = new BitSet(new long[]{0x0000000000000080L}); @@ -76526,24 +76526,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_rule__SubSystemClass__Group__2__Impl_in_rule__SubSystemClass__Group__226391 = new BitSet(new long[]{0x0400010000000000L}); public static final BitSet FOLLOW_rule__SubSystemClass__Group__3_in_rule__SubSystemClass__Group__226394 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__SubSystemClass__DocuAssignment_2_in_rule__SubSystemClass__Group__2__Impl26421 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__SubSystemClass__Group__3__Impl_in_rule__SubSystemClass__Group__326452 = new BitSet(new long[]{0x03C0020300000000L,0x00800000088B7C04L}); + public static final BitSet FOLLOW_rule__SubSystemClass__Group__3__Impl_in_rule__SubSystemClass__Group__326452 = new BitSet(new long[]{0x01C0020300000000L,0x00800000088B2404L}); public static final BitSet FOLLOW_rule__SubSystemClass__Group__4_in_rule__SubSystemClass__Group__326455 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_40_in_rule__SubSystemClass__Group__3__Impl26483 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__SubSystemClass__Group__4__Impl_in_rule__SubSystemClass__Group__426514 = new BitSet(new long[]{0x03C0020300000000L,0x00800000088B7C04L}); + public static final BitSet FOLLOW_rule__SubSystemClass__Group__4__Impl_in_rule__SubSystemClass__Group__426514 = new BitSet(new long[]{0x01C0020300000000L,0x00800000088B2404L}); public static final BitSet FOLLOW_rule__SubSystemClass__Group__5_in_rule__SubSystemClass__Group__426517 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__SubSystemClass__AnnotationsAssignment_4_in_rule__SubSystemClass__Group__4__Impl26544 = new BitSet(new long[]{0x0000000000000002L,0x0080000000000000L}); - public static final BitSet FOLLOW_rule__SubSystemClass__Group__5__Impl_in_rule__SubSystemClass__Group__526575 = new BitSet(new long[]{0x03C0020300000000L,0x00800000088B7C04L}); + public static final BitSet FOLLOW_rule__SubSystemClass__Group__5__Impl_in_rule__SubSystemClass__Group__526575 = new BitSet(new long[]{0x01C0020300000000L,0x00800000088B2404L}); public static final BitSet FOLLOW_rule__SubSystemClass__Group__6_in_rule__SubSystemClass__Group__526578 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__SubSystemClass__Group_5__0_in_rule__SubSystemClass__Group__5__Impl26605 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__SubSystemClass__Group__6__Impl_in_rule__SubSystemClass__Group__626636 = new BitSet(new long[]{0x03C0020300000000L,0x00800000088B7C04L}); + public static final BitSet FOLLOW_rule__SubSystemClass__Group__6__Impl_in_rule__SubSystemClass__Group__626636 = new BitSet(new long[]{0x01C0020300000000L,0x00800000088B2404L}); public static final BitSet FOLLOW_rule__SubSystemClass__Group__7_in_rule__SubSystemClass__Group__626639 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__SubSystemClass__Group_6__0_in_rule__SubSystemClass__Group__6__Impl26666 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__SubSystemClass__Group__7__Impl_in_rule__SubSystemClass__Group__726697 = new BitSet(new long[]{0x03C0020300000000L,0x00800000088B7C04L}); + public static final BitSet FOLLOW_rule__SubSystemClass__Group__7__Impl_in_rule__SubSystemClass__Group__726697 = new BitSet(new long[]{0x01C0020300000000L,0x00800000088B2404L}); public static final BitSet FOLLOW_rule__SubSystemClass__Group__8_in_rule__SubSystemClass__Group__726700 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__SubSystemClass__Group_7__0_in_rule__SubSystemClass__Group__7__Impl26727 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__SubSystemClass__Group__8__Impl_in_rule__SubSystemClass__Group__826758 = new BitSet(new long[]{0x03C0020300000000L,0x00800000088B7C04L}); + public static final BitSet FOLLOW_rule__SubSystemClass__Group__8__Impl_in_rule__SubSystemClass__Group__826758 = new BitSet(new long[]{0x01C0020300000000L,0x00800000088B2404L}); public static final BitSet FOLLOW_rule__SubSystemClass__Group__9_in_rule__SubSystemClass__Group__826761 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__SubSystemClass__Alternatives_8_in_rule__SubSystemClass__Group__8__Impl26788 = new BitSet(new long[]{0x0200000300000002L,0x00000000088B7C04L}); + public static final BitSet FOLLOW_rule__SubSystemClass__Alternatives_8_in_rule__SubSystemClass__Group__8__Impl26788 = new BitSet(new long[]{0x0000000300000002L,0x00000000088B2404L}); public static final BitSet FOLLOW_rule__SubSystemClass__Group__9__Impl_in_rule__SubSystemClass__Group__926819 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_41_in_rule__SubSystemClass__Group__9__Impl26847 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__SubSystemClass__Group_5__0__Impl_in_rule__SubSystemClass__Group_5__026898 = new BitSet(new long[]{0x0000010000000000L}); @@ -76580,12 +76580,12 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_rule__ActorInstanceMapping__ThreadAssignment_3_in_rule__ActorInstanceMapping__Group__3__Impl27604 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group__4__Impl_in_rule__ActorInstanceMapping__Group__427634 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group_4__0_in_rule__ActorInstanceMapping__Group__4__Impl27661 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group_4__0__Impl_in_rule__ActorInstanceMapping__Group_4__027702 = new BitSet(new long[]{0x0200020300000000L,0x00000000088B7C04L}); + public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group_4__0__Impl_in_rule__ActorInstanceMapping__Group_4__027702 = new BitSet(new long[]{0x0000020000000000L,0x0000000000020000L}); public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group_4__1_in_rule__ActorInstanceMapping__Group_4__027705 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_40_in_rule__ActorInstanceMapping__Group_4__0__Impl27733 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group_4__1__Impl_in_rule__ActorInstanceMapping__Group_4__127764 = new BitSet(new long[]{0x0200020300000000L,0x00000000088B7C04L}); + public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group_4__1__Impl_in_rule__ActorInstanceMapping__Group_4__127764 = new BitSet(new long[]{0x0000020000000000L,0x0000000000020000L}); public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group_4__2_in_rule__ActorInstanceMapping__Group_4__127767 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1_in_rule__ActorInstanceMapping__Group_4__1__Impl27794 = new BitSet(new long[]{0x0200000300000002L,0x00000000088B7C04L}); + public static final BitSet FOLLOW_rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1_in_rule__ActorInstanceMapping__Group_4__1__Impl27794 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L}); public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group_4__2__Impl_in_rule__ActorInstanceMapping__Group_4__227825 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_41_in_rule__ActorInstanceMapping__Group_4__2__Impl27853 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__RefPath__Group__0__Impl_in_rule__RefPath__Group__027890 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L}); @@ -77464,9 +77464,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_ruleDetailCode_in_rule__DataClass__UserCode1Assignment_6_148574 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDetailCode_in_rule__DataClass__UserCode2Assignment_7_148605 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDetailCode_in_rule__DataClass__UserCode3Assignment_8_148636 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleAttribute_in_rule__DataClass__AttributesAssignment_9_048667 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleStandardOperation_in_rule__DataClass__OperationsAssignment_9_048667 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleClassStructor_in_rule__DataClass__StructorsAssignment_9_148698 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleStandardOperation_in_rule__DataClass__OperationsAssignment_9_248729 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleAttribute_in_rule__DataClass__AttributesAssignment_9_248729 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_RULE_ID_in_rule__Attribute__NameAssignment_148760 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_RULE_INT_in_rule__Attribute__SizeAssignment_2_148791 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleRefableType_in_rule__Attribute__TypeAssignment_448822 = new BitSet(new long[]{0x0000000000000002L}); @@ -77512,9 +77512,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_ruleVarDecl_in_rule__Message__DataAssignment_450114 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDocumentation_in_rule__Message__DocuAssignment_650145 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDetailCode_in_rule__PortClass__UserCodeAssignment_2_150176 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleAttribute_in_rule__PortClass__AttributesAssignment_3_050207 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleMessageHandler_in_rule__PortClass__MsgHandlersAssignment_3_050207 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rulePortOperation_in_rule__PortClass__OperationsAssignment_3_150238 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleMessageHandler_in_rule__PortClass__MsgHandlersAssignment_3_250269 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleAttribute_in_rule__PortClass__AttributesAssignment_3_250269 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_RULE_ID_in_rule__InMessageHandler__MsgAssignment_250304 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDetailCode_in_rule__InMessageHandler__DetailCodeAssignment_350339 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_RULE_ID_in_rule__OutMessageHandler__MsgAssignment_250374 = new BitSet(new long[]{0x0000000000000002L}); @@ -77525,24 +77525,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_ruleDocumentation_in_rule__ActorClass__DocuAssignment_350546 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleFQN_in_rule__ActorClass__BaseAssignment_4_150581 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleAnnotation_in_rule__ActorClass__AnnotationsAssignment_650616 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePort_in_rule__ActorClass__InterfacePortsAssignment_7_2_050647 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleSPP_in_rule__ActorClass__ServiceProvisionPointsAssignment_7_2_150678 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleSPP_in_rule__ActorClass__ServiceProvisionPointsAssignment_7_2_050647 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePort_in_rule__ActorClass__InterfacePortsAssignment_7_2_150678 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDocumentation_in_rule__ActorClass__StructureDocuAssignment_8_150709 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDetailCode_in_rule__ActorClass__UserCode1Assignment_8_3_150740 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDetailCode_in_rule__ActorClass__UserCode2Assignment_8_4_150771 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDetailCode_in_rule__ActorClass__UserCode3Assignment_8_5_150802 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePort_in_rule__ActorClass__InternalPortsAssignment_8_6_050833 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleExternalPort_in_rule__ActorClass__ExternalPortsAssignment_8_6_150864 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleSAP_in_rule__ActorClass__ServiceAccessPointsAssignment_8_6_250895 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLayerConnection_in_rule__ActorClass__ConnectionsAssignment_8_6_050833 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleBinding_in_rule__ActorClass__BindingsAssignment_8_6_150864 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleServiceImplementation_in_rule__ActorClass__ServiceImplementationsAssignment_8_6_250895 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleAttribute_in_rule__ActorClass__AttributesAssignment_8_6_350926 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleActorRef_in_rule__ActorClass__ActorRefsAssignment_8_6_450957 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleServiceImplementation_in_rule__ActorClass__ServiceImplementationsAssignment_8_6_550988 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleBinding_in_rule__ActorClass__BindingsAssignment_8_6_651019 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLayerConnection_in_rule__ActorClass__ConnectionsAssignment_8_6_751050 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleSAP_in_rule__ActorClass__ServiceAccessPointsAssignment_8_6_550988 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePort_in_rule__ActorClass__InternalPortsAssignment_8_6_651019 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleExternalPort_in_rule__ActorClass__ExternalPortsAssignment_8_6_751050 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDocumentation_in_rule__ActorClass__BehaviorDocuAssignment_9_151081 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleAnnotation_in_rule__ActorClass__BehaviorAnnotationsAssignment_9_351112 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleClassStructor_in_rule__ActorClass__StructorsAssignment_9_4_051143 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleStandardOperation_in_rule__ActorClass__OperationsAssignment_9_4_151174 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleStandardOperation_in_rule__ActorClass__OperationsAssignment_9_4_051143 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleClassStructor_in_rule__ActorClass__StructorsAssignment_9_4_151174 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleStateMachine_in_rule__ActorClass__StateMachineAssignment_9_551205 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_66_in_rule__Port__ConjugatedAssignment_051241 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_RULE_ID_in_rule__Port__NameAssignment_251280 = new BitSet(new long[]{0x0000000000000002L}); @@ -77558,9 +77558,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_RULE_ID_in_rule__LogicalSystem__NameAssignment_151630 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDocumentation_in_rule__LogicalSystem__DocuAssignment_251661 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleAnnotation_in_rule__LogicalSystem__AnnotationsAssignment_451692 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleSubSystemRef_in_rule__LogicalSystem__SubSystemsAssignment_5_051723 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLayerConnection_in_rule__LogicalSystem__ConnectionsAssignment_5_051723 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleBinding_in_rule__LogicalSystem__BindingsAssignment_5_151754 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLayerConnection_in_rule__LogicalSystem__ConnectionsAssignment_5_251785 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleSubSystemRef_in_rule__LogicalSystem__SubSystemsAssignment_5_251785 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_RULE_ID_in_rule__SubSystemRef__NameAssignment_151816 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleFQN_in_rule__SubSystemRef__TypeAssignment_351851 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDocumentation_in_rule__SubSystemRef__DocuAssignment_451886 = new BitSet(new long[]{0x0000000000000002L}); @@ -77570,13 +77570,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_ruleDetailCode_in_rule__SubSystemClass__UserCode1Assignment_5_152010 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDetailCode_in_rule__SubSystemClass__UserCode2Assignment_6_152041 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleDetailCode_in_rule__SubSystemClass__UserCode3Assignment_7_152072 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePort_in_rule__SubSystemClass__RelayPortsAssignment_8_052103 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleSPP_in_rule__SubSystemClass__ServiceProvisionPointsAssignment_8_152134 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleActorRef_in_rule__SubSystemClass__ActorRefsAssignment_8_252165 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleActorInstanceMapping_in_rule__SubSystemClass__ActorInstanceMappingsAssignment_8_052103 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLogicalThread_in_rule__SubSystemClass__ThreadsAssignment_8_152134 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLayerConnection_in_rule__SubSystemClass__ConnectionsAssignment_8_252165 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleBinding_in_rule__SubSystemClass__BindingsAssignment_8_352196 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLayerConnection_in_rule__SubSystemClass__ConnectionsAssignment_8_452227 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLogicalThread_in_rule__SubSystemClass__ThreadsAssignment_8_552258 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleActorInstanceMapping_in_rule__SubSystemClass__ActorInstanceMappingsAssignment_8_652289 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleActorRef_in_rule__SubSystemClass__ActorRefsAssignment_8_452227 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleSPP_in_rule__SubSystemClass__ServiceProvisionPointsAssignment_8_552258 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePort_in_rule__SubSystemClass__RelayPortsAssignment_8_652289 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_RULE_ID_in_rule__LogicalThread__NameAssignment_152320 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleRefPath_in_rule__ActorInstanceMapping__PathAssignment_152351 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_RULE_ID_in_rule__ActorInstanceMapping__ThreadAssignment_352386 = new BitSet(new long[]{0x0000000000000002L}); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore index 3a37807a6..5deb80bee 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore @@ -98,18 +98,18 @@ <details key="documentation" value="<br>This is a list of structure class annotations.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="bindings" upperBound="-1" - eType="#//Binding" containment="true"> - <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="<br>This is a list of structure class bindings.
"/> - </eAnnotations> - </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="connections" upperBound="-1" eType="#//LayerConnection" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a list of structure class connections.
"/> </eAnnotations> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="bindings" upperBound="-1" + eType="#//Binding" containment="true"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="<br>This is a list of structure class bindings.
"/> + </eAnnotations> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ActorContainerClass" eSuperTypes="#//StructureClass"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> @@ -299,18 +299,18 @@ <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1" - eType="#//Attribute" containment="true"> + <eStructuralFeatures xsi:type="ecore:EReference" name="operations" upperBound="-1" + eType="#//StandardOperation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="<br>Attributes are the data members of the data class.
"/> + <details key="documentation" value="<br>Operations are the methods of the data class.
"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="structors" upperBound="-1" eType="#//ClassStructor" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="operations" upperBound="-1" - eType="#//StandardOperation" containment="true"> + <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1" + eType="#//Attribute" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="<br>Operations are the methods of the data class.
"/> + <details key="documentation" value="<br>Attributes are the data members of the data class.
"/> </eAnnotations> </eStructuralFeatures> </eClassifiers> @@ -552,10 +552,10 @@ <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1" - eType="#//Attribute" containment="true"> + <eStructuralFeatures xsi:type="ecore:EReference" name="msgHandlers" upperBound="-1" + eType="#//MessageHandler" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="<br>This is a list of attributes of this nested class.
"/> + <details key="documentation" value="<br>This is a list of message handlers.
"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="operations" upperBound="-1" @@ -564,10 +564,10 @@ <details key="documentation" value="<br>This is a list of operations of this nested class.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="msgHandlers" upperBound="-1" - eType="#//MessageHandler" containment="true"> + <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1" + eType="#//Attribute" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="<br>This is a list of message handlers.
"/> + <details key="documentation" value="<br>This is a list of attributes of this nested class.
"/> </eAnnotations> </eStructuralFeatures> </eClassifiers> @@ -648,16 +648,16 @@ <details key="documentation" value="<br>This is an optional documentation of the actor structure.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="internalPorts" upperBound="-1" - eType="#//Port" containment="true"> + <eStructuralFeatures xsi:type="ecore:EReference" name="serviceImplementations" + upperBound="-1" eType="#//ServiceImplementation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="<br>This is a list containing all ports of the actor structure (internal end ports).
"/> + <details key="documentation" value="<br>This is a list of all service implementations.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="externalPorts" upperBound="-1" - eType="#//ExternalPort" containment="true"> + <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1" + eType="#//Attribute" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="<br>This is a list containing all ports of the actor interface that are end ports.
"/> + <details key="documentation" value="<br>This is a list of all actor class private attributes.
"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="serviceAccessPoints" upperBound="-1" @@ -666,16 +666,16 @@ <details key="documentation" value="<br>This is a list of all SAPs.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1" - eType="#//Attribute" containment="true"> + <eStructuralFeatures xsi:type="ecore:EReference" name="internalPorts" upperBound="-1" + eType="#//Port" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="<br>This is a list of all actor class private attributes.
"/> + <details key="documentation" value="<br>This is a list containing all ports of the actor structure (internal end ports).
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="serviceImplementations" - upperBound="-1" eType="#//ServiceImplementation" containment="true"> + <eStructuralFeatures xsi:type="ecore:EReference" name="externalPorts" upperBound="-1" + eType="#//ExternalPort" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="<br>This is a list of all service implementations.
"/> + <details key="documentation" value="<br>This is a list containing all ports of the actor interface that are end ports.
"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="behaviorDocu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" @@ -691,14 +691,14 @@ <details key="documentation" value="<br>This is a list of annotations to the actor behavior.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="structors" upperBound="-1" - eType="#//ClassStructor" containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="operations" upperBound="-1" eType="#//StandardOperation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a list of all private operations of this actor class.
"/> </eAnnotations> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="structors" upperBound="-1" + eType="#//ClassStructor" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="InterfaceItem" eSuperTypes="platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//AbstractInterfaceItem"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> @@ -848,10 +848,10 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>A sub system class corresponds to a process with a separate address space.
It has no behavior of its own and is composed of {@link ActorClass}es.

<p>
Sub systems can be connected using {@link Port}s and {@link Binding}s.
All ports of a sub system are relay ports.
</p>

<p>
Sub systems can define an arbitrary number of logical threads onto which their actor
instances are mapped.
</p>
"/> </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EReference" name="relayPorts" upperBound="-1" - eType="#//Port" containment="true"> + <eStructuralFeatures xsi:type="ecore:EReference" name="actorInstanceMappings" + upperBound="-1" eType="#//ActorInstanceMapping" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="<br>This is a list of all relay ports of the sub system.
"/> + <details key="documentation" value="<br>This is a list of actor instance mappings.
"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="threads" upperBound="-1" @@ -860,10 +860,10 @@ <details key="documentation" value="<br>This is a list of all actor instance mappings of the sub system.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="actorInstanceMappings" - upperBound="-1" eType="#//ActorInstanceMapping" containment="true"> + <eStructuralFeatures xsi:type="ecore:EReference" name="relayPorts" upperBound="-1" + eType="#//Port" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="<br>This is a list of actor instance mappings.
"/> + <details key="documentation" value="<br>This is a list of all relay ports of the sub system.
"/> </eAnnotations> </eStructuralFeatures> </eClassifiers> diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel index 694acaf8b..575b3de23 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel @@ -45,8 +45,8 @@ </genClasses> <genClasses ecoreClass="Room.ecore#//StructureClass"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//StructureClass/annotations"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//StructureClass/bindings"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//StructureClass/connections"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//StructureClass/bindings"/> </genClasses> <genClasses ecoreClass="Room.ecore#//ActorContainerClass"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorContainerClass/serviceProvisionPoints"/> @@ -91,9 +91,9 @@ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//DataClass/userCode1"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//DataClass/userCode2"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//DataClass/userCode3"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//DataClass/attributes"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//DataClass/structors"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//DataClass/operations"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//DataClass/structors"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//DataClass/attributes"/> </genClasses> <genClasses ecoreClass="Room.ecore#//Attribute"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Room.ecore#//Attribute/name"/> @@ -150,9 +150,9 @@ </genClasses> <genClasses ecoreClass="Room.ecore#//PortClass"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//PortClass/userCode"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//PortClass/attributes"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//PortClass/operations"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//PortClass/msgHandlers"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//PortClass/operations"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//PortClass/attributes"/> </genClasses> <genClasses ecoreClass="Room.ecore#//MessageHandler"> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Room.ecore#//MessageHandler/msg"/> @@ -163,15 +163,15 @@ <genClasses ecoreClass="Room.ecore#//ActorClass"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/interfacePorts"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/structureDocu"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/serviceImplementations"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/attributes"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/serviceAccessPoints"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/internalPorts"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/externalPorts"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/serviceAccessPoints"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/attributes"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/serviceImplementations"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/behaviorDocu"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/behaviorAnnotations"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/structors"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/operations"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//ActorClass/structors"/> <genOperations ecoreOperation="Room.ecore#//ActorClass/getExternalEndPorts"/> <genOperations ecoreOperation="Room.ecore#//ActorClass/getRelayPorts"/> <genOperations ecoreOperation="Room.ecore#//ActorClass/getImplementedSPPs"/> @@ -218,9 +218,9 @@ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Room.ecore#//SubSystemRef/type"/> </genClasses> <genClasses ecoreClass="Room.ecore#//SubSystemClass"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//SubSystemClass/relayPorts"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//SubSystemClass/threads"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//SubSystemClass/actorInstanceMappings"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//SubSystemClass/threads"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Room.ecore#//SubSystemClass/relayPorts"/> </genClasses> <genClasses ecoreClass="Room.ecore#//LogicalThread"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Room.ecore#//LogicalThread/name"/> diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xtextbin b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xtextbin Binary files differindex a19074ddd..f6549a252 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xtextbin +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xtextbin diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java index 374e712dd..7b159a549 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java @@ -3058,14 +3058,14 @@ protected class ExternalType_DocuAssignment_5 extends AssignmentToken { * // TODOHRR: define detail level language? * DataClass: * "DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1" - * userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (attributes+=Attribute - * | structors+=ClassStructor | operations+=StandardOperation)* "}"; + * userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? + * (operations+=StandardOperation | structors+=ClassStructor | attributes+=Attribute)* "}"; * **/ // "DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1" -// userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (attributes+=Attribute -// | structors+=ClassStructor | operations+=StandardOperation)* "}" +// userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? +// (operations+=StandardOperation | structors+=ClassStructor | attributes+=Attribute)* "}" protected class DataClass_Group extends GroupToken { public DataClass_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -3628,7 +3628,7 @@ protected class DataClass_UserCode3Assignment_8_1 extends AssignmentToken { } -// (attributes+=Attribute | structors+=ClassStructor | operations+=StandardOperation)* +// (operations+=StandardOperation | structors+=ClassStructor | attributes+=Attribute)* protected class DataClass_Alternatives_9 extends AlternativesToken { public DataClass_Alternatives_9(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -3643,44 +3643,44 @@ protected class DataClass_Alternatives_9 extends AlternativesToken { @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new DataClass_AttributesAssignment_9_0(lastRuleCallOrigin, this, 0, inst); + case 0: return new DataClass_OperationsAssignment_9_0(lastRuleCallOrigin, this, 0, inst); case 1: return new DataClass_StructorsAssignment_9_1(lastRuleCallOrigin, this, 1, inst); - case 2: return new DataClass_OperationsAssignment_9_2(lastRuleCallOrigin, this, 2, inst); + case 2: return new DataClass_AttributesAssignment_9_2(lastRuleCallOrigin, this, 2, inst); default: return null; } } } -// attributes+=Attribute -protected class DataClass_AttributesAssignment_9_0 extends AssignmentToken { +// operations+=StandardOperation +protected class DataClass_OperationsAssignment_9_0 extends AssignmentToken { - public DataClass_AttributesAssignment_9_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public DataClass_OperationsAssignment_9_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getDataClassAccess().getAttributesAssignment_9_0(); + return grammarAccess.getDataClassAccess().getOperationsAssignment_9_0(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new Attribute_Group(this, this, 0, inst); + case 0: return new StandardOperation_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("attributes",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("attributes"); + if((value = eObjectConsumer.getConsumable("operations",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("operations"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getAttributeRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getStandardOperationRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_0_0(); + element = grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_0_0(); consumed = obj; return param; } @@ -3754,35 +3754,35 @@ protected class DataClass_StructorsAssignment_9_1 extends AssignmentToken { } } -// operations+=StandardOperation -protected class DataClass_OperationsAssignment_9_2 extends AssignmentToken { +// attributes+=Attribute +protected class DataClass_AttributesAssignment_9_2 extends AssignmentToken { - public DataClass_OperationsAssignment_9_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public DataClass_AttributesAssignment_9_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getDataClassAccess().getOperationsAssignment_9_2(); + return grammarAccess.getDataClassAccess().getAttributesAssignment_9_2(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new StandardOperation_Group(this, this, 0, inst); + case 0: return new Attribute_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("operations",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("operations"); + if((value = eObjectConsumer.getConsumable("attributes",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("attributes"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getStandardOperationRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getAttributeRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_2_0(); + element = grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_2_0(); consumed = obj; return param; } @@ -7676,13 +7676,13 @@ protected class Message_DocuAssignment_6 extends AssignmentToken { /************ begin Rule PortClass **************** * * PortClass: - * {PortClass} "{" ("usercode" userCode=DetailCode)? (attributes+=Attribute | operations+=PortOperation | - * msgHandlers+=MessageHandler)* "}"; + * {PortClass} "{" ("usercode" userCode=DetailCode)? (msgHandlers+=MessageHandler | operations+=PortOperation | + * attributes+=Attribute)* "}"; * **/ -// {PortClass} "{" ("usercode" userCode=DetailCode)? (attributes+=Attribute | operations+=PortOperation | -// msgHandlers+=MessageHandler)* "}" +// {PortClass} "{" ("usercode" userCode=DetailCode)? (msgHandlers+=MessageHandler | operations+=PortOperation | +// attributes+=Attribute)* "}" protected class PortClass_Group extends GroupToken { public PortClass_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -7850,7 +7850,7 @@ protected class PortClass_UserCodeAssignment_2_1 extends AssignmentToken { } -// (attributes+=Attribute | operations+=PortOperation | msgHandlers+=MessageHandler)* +// (msgHandlers+=MessageHandler | operations+=PortOperation | attributes+=Attribute)* protected class PortClass_Alternatives_3 extends AlternativesToken { public PortClass_Alternatives_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -7865,44 +7865,44 @@ protected class PortClass_Alternatives_3 extends AlternativesToken { @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new PortClass_AttributesAssignment_3_0(lastRuleCallOrigin, this, 0, inst); + case 0: return new PortClass_MsgHandlersAssignment_3_0(lastRuleCallOrigin, this, 0, inst); case 1: return new PortClass_OperationsAssignment_3_1(lastRuleCallOrigin, this, 1, inst); - case 2: return new PortClass_MsgHandlersAssignment_3_2(lastRuleCallOrigin, this, 2, inst); + case 2: return new PortClass_AttributesAssignment_3_2(lastRuleCallOrigin, this, 2, inst); default: return null; } } } -// attributes+=Attribute -protected class PortClass_AttributesAssignment_3_0 extends AssignmentToken { +// msgHandlers+=MessageHandler +protected class PortClass_MsgHandlersAssignment_3_0 extends AssignmentToken { - public PortClass_AttributesAssignment_3_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public PortClass_MsgHandlersAssignment_3_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getPortClassAccess().getAttributesAssignment_3_0(); + return grammarAccess.getPortClassAccess().getMsgHandlersAssignment_3_0(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new Attribute_Group(this, this, 0, inst); + case 0: return new MessageHandler_Alternatives(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("attributes",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("attributes"); + if((value = eObjectConsumer.getConsumable("msgHandlers",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("msgHandlers"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getAttributeRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getMessageHandlerRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_0_0(); + element = grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_0_0(); consumed = obj; return param; } @@ -7970,35 +7970,35 @@ protected class PortClass_OperationsAssignment_3_1 extends AssignmentToken { } } -// msgHandlers+=MessageHandler -protected class PortClass_MsgHandlersAssignment_3_2 extends AssignmentToken { +// attributes+=Attribute +protected class PortClass_AttributesAssignment_3_2 extends AssignmentToken { - public PortClass_MsgHandlersAssignment_3_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public PortClass_AttributesAssignment_3_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getPortClassAccess().getMsgHandlersAssignment_3_2(); + return grammarAccess.getPortClassAccess().getAttributesAssignment_3_2(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new MessageHandler_Alternatives(this, this, 0, inst); + case 0: return new Attribute_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("msgHandlers",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("msgHandlers"); + if((value = eObjectConsumer.getConsumable("attributes",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("attributes"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getMessageHandlerRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getAttributeRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_2_0(); + element = grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_2_0(); consumed = obj; return param; } @@ -8552,24 +8552,24 @@ protected class ModelComponent_ActorClassParserRuleCall extends RuleCallToken { * // since double containment is not supported we decided to define external ports as reference to interface ports * ActorClass: * (abstract?="abstract"? & commType=ComponentCommunicationType?) "ActorClass" name=ID docu=Documentation? ("extends" - * base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" (interfacePorts+=Port | - * serviceProvisionPoints+=SPP)* "}")? ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? - * ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (internalPorts+=Port | - * externalPorts+=ExternalPort | serviceAccessPoints+=SAP | attributes+=Attribute | actorRefs+=ActorRef | - * serviceImplementations+=ServiceImplementation | bindings+=Binding | connections+=LayerConnection)* "}")? ("Behavior" - * behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* (structors+=ClassStructor | - * operations+=StandardOperation)* stateMachine=StateMachine? "}")? "}"; + * base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" (serviceProvisionPoints+=SPP | + * interfacePorts+=Port)* "}")? ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? + * ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer + * (connections+=LayerConnection | bindings+=Binding | serviceImplementations+=ServiceImplementation | + * attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP | internalPorts+=Port | + * externalPorts+=ExternalPort)* "}")? ("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* + * (operations+=StandardOperation | structors+=ClassStructor)* stateMachine=StateMachine? "}")? "}"; * **/ // (abstract?="abstract"? & commType=ComponentCommunicationType?) "ActorClass" name=ID docu=Documentation? ("extends" -// base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" (interfacePorts+=Port | -// serviceProvisionPoints+=SPP)* "}")? ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? -// ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (internalPorts+=Port | -// externalPorts+=ExternalPort | serviceAccessPoints+=SAP | attributes+=Attribute | actorRefs+=ActorRef | -// serviceImplementations+=ServiceImplementation | bindings+=Binding | connections+=LayerConnection)* "}")? ("Behavior" -// behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* (structors+=ClassStructor | -// operations+=StandardOperation)* stateMachine=StateMachine? "}")? "}" +// base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" (serviceProvisionPoints+=SPP | +// interfacePorts+=Port)* "}")? ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? +// ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer +// (connections+=LayerConnection | bindings+=Binding | serviceImplementations+=ServiceImplementation | +// attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP | internalPorts+=Port | +// externalPorts+=ExternalPort)* "}")? ("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* +// (operations+=StandardOperation | structors+=ClassStructor)* stateMachine=StateMachine? "}")? "}" protected class ActorClass_Group extends GroupToken { public ActorClass_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -8945,7 +8945,7 @@ protected class ActorClass_AnnotationsAssignment_6 extends AssignmentToken { } } -// ("Interface" "{" (interfacePorts+=Port | serviceProvisionPoints+=SPP)* "}")? +// ("Interface" "{" (serviceProvisionPoints+=SPP | interfacePorts+=Port)* "}")? protected class ActorClass_Group_7 extends GroupToken { public ActorClass_Group_7(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -9012,7 +9012,7 @@ protected class ActorClass_LeftCurlyBracketKeyword_7_1 extends KeywordToken { } -// (interfacePorts+=Port | serviceProvisionPoints+=SPP)* +// (serviceProvisionPoints+=SPP | interfacePorts+=Port)* protected class ActorClass_Alternatives_7_2 extends AlternativesToken { public ActorClass_Alternatives_7_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -9027,43 +9027,43 @@ protected class ActorClass_Alternatives_7_2 extends AlternativesToken { @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new ActorClass_InterfacePortsAssignment_7_2_0(lastRuleCallOrigin, this, 0, inst); - case 1: return new ActorClass_ServiceProvisionPointsAssignment_7_2_1(lastRuleCallOrigin, this, 1, inst); + case 0: return new ActorClass_ServiceProvisionPointsAssignment_7_2_0(lastRuleCallOrigin, this, 0, inst); + case 1: return new ActorClass_InterfacePortsAssignment_7_2_1(lastRuleCallOrigin, this, 1, inst); default: return null; } } } -// interfacePorts+=Port -protected class ActorClass_InterfacePortsAssignment_7_2_0 extends AssignmentToken { +// serviceProvisionPoints+=SPP +protected class ActorClass_ServiceProvisionPointsAssignment_7_2_0 extends AssignmentToken { - public ActorClass_InterfacePortsAssignment_7_2_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public ActorClass_ServiceProvisionPointsAssignment_7_2_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getActorClassAccess().getInterfacePortsAssignment_7_2_0(); + return grammarAccess.getActorClassAccess().getServiceProvisionPointsAssignment_7_2_0(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new Port_Group(this, this, 0, inst); + case 0: return new SPP_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("interfacePorts",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("interfacePorts"); + if((value = eObjectConsumer.getConsumable("serviceProvisionPoints",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("serviceProvisionPoints"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getPortRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getSPPRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_0_0(); + element = grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_0_0(); consumed = obj; return param; } @@ -9082,35 +9082,35 @@ protected class ActorClass_InterfacePortsAssignment_7_2_0 extends AssignmentToke } } -// serviceProvisionPoints+=SPP -protected class ActorClass_ServiceProvisionPointsAssignment_7_2_1 extends AssignmentToken { +// interfacePorts+=Port +protected class ActorClass_InterfacePortsAssignment_7_2_1 extends AssignmentToken { - public ActorClass_ServiceProvisionPointsAssignment_7_2_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public ActorClass_InterfacePortsAssignment_7_2_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getActorClassAccess().getServiceProvisionPointsAssignment_7_2_1(); + return grammarAccess.getActorClassAccess().getInterfacePortsAssignment_7_2_1(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new SPP_Group(this, this, 0, inst); + case 0: return new Port_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("serviceProvisionPoints",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("serviceProvisionPoints"); + if((value = eObjectConsumer.getConsumable("interfacePorts",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("interfacePorts"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getSPPRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getPortRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_1_0(); + element = grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_1_0(); consumed = obj; return param; } @@ -9154,9 +9154,10 @@ protected class ActorClass_RightCurlyBracketKeyword_7_3 extends KeywordToken { // ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? -// ("usercode3" userCode3=DetailCode)? (internalPorts+=Port | externalPorts+=ExternalPort | serviceAccessPoints+=SAP | -// attributes+=Attribute | actorRefs+=ActorRef | serviceImplementations+=ServiceImplementation | bindings+=Binding | -// connections+=LayerConnection)* "}")? +// ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer +// (connections+=LayerConnection | bindings+=Binding | serviceImplementations+=ServiceImplementation | +// attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP | internalPorts+=Port | +// externalPorts+=ExternalPort)* "}")? protected class ActorClass_Group_8 extends GroupToken { public ActorClass_Group_8(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -9547,9 +9548,10 @@ protected class ActorClass_UserCode3Assignment_8_5_1 extends AssignmentToken { } -// (internalPorts+=Port | externalPorts+=ExternalPort | serviceAccessPoints+=SAP | attributes+=Attribute | -// actorRefs+=ActorRef | serviceImplementations+=ServiceImplementation | bindings+=Binding | -// connections+=LayerConnection)* +// // workaround: reverse the order for serializer +// (connections+=LayerConnection | bindings+=Binding | serviceImplementations+=ServiceImplementation | +// attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP | internalPorts+=Port | +// externalPorts+=ExternalPort)* protected class ActorClass_Alternatives_8_6 extends AlternativesToken { public ActorClass_Alternatives_8_6(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -9564,49 +9566,50 @@ protected class ActorClass_Alternatives_8_6 extends AlternativesToken { @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new ActorClass_InternalPortsAssignment_8_6_0(lastRuleCallOrigin, this, 0, inst); - case 1: return new ActorClass_ExternalPortsAssignment_8_6_1(lastRuleCallOrigin, this, 1, inst); - case 2: return new ActorClass_ServiceAccessPointsAssignment_8_6_2(lastRuleCallOrigin, this, 2, inst); + case 0: return new ActorClass_ConnectionsAssignment_8_6_0(lastRuleCallOrigin, this, 0, inst); + case 1: return new ActorClass_BindingsAssignment_8_6_1(lastRuleCallOrigin, this, 1, inst); + case 2: return new ActorClass_ServiceImplementationsAssignment_8_6_2(lastRuleCallOrigin, this, 2, inst); case 3: return new ActorClass_AttributesAssignment_8_6_3(lastRuleCallOrigin, this, 3, inst); case 4: return new ActorClass_ActorRefsAssignment_8_6_4(lastRuleCallOrigin, this, 4, inst); - case 5: return new ActorClass_ServiceImplementationsAssignment_8_6_5(lastRuleCallOrigin, this, 5, inst); - case 6: return new ActorClass_BindingsAssignment_8_6_6(lastRuleCallOrigin, this, 6, inst); - case 7: return new ActorClass_ConnectionsAssignment_8_6_7(lastRuleCallOrigin, this, 7, inst); + case 5: return new ActorClass_ServiceAccessPointsAssignment_8_6_5(lastRuleCallOrigin, this, 5, inst); + case 6: return new ActorClass_InternalPortsAssignment_8_6_6(lastRuleCallOrigin, this, 6, inst); + case 7: return new ActorClass_ExternalPortsAssignment_8_6_7(lastRuleCallOrigin, this, 7, inst); default: return null; } } } -// internalPorts+=Port -protected class ActorClass_InternalPortsAssignment_8_6_0 extends AssignmentToken { +// // workaround: reverse the order for serializer +// connections+=LayerConnection +protected class ActorClass_ConnectionsAssignment_8_6_0 extends AssignmentToken { - public ActorClass_InternalPortsAssignment_8_6_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public ActorClass_ConnectionsAssignment_8_6_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getActorClassAccess().getInternalPortsAssignment_8_6_0(); + return grammarAccess.getActorClassAccess().getConnectionsAssignment_8_6_0(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new Port_Group(this, this, 0, inst); + case 0: return new LayerConnection_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("internalPorts",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("internalPorts"); + if((value = eObjectConsumer.getConsumable("connections",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("connections"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getPortRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getLayerConnectionRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_0_0(); + element = grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_0_0(); consumed = obj; return param; } @@ -9628,35 +9631,35 @@ protected class ActorClass_InternalPortsAssignment_8_6_0 extends AssignmentToken } } -// externalPorts+=ExternalPort -protected class ActorClass_ExternalPortsAssignment_8_6_1 extends AssignmentToken { +// bindings+=Binding +protected class ActorClass_BindingsAssignment_8_6_1 extends AssignmentToken { - public ActorClass_ExternalPortsAssignment_8_6_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public ActorClass_BindingsAssignment_8_6_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getActorClassAccess().getExternalPortsAssignment_8_6_1(); + return grammarAccess.getActorClassAccess().getBindingsAssignment_8_6_1(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new ExternalPort_Group(this, this, 0, inst); + case 0: return new Binding_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("externalPorts",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("externalPorts"); + if((value = eObjectConsumer.getConsumable("bindings",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("bindings"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getExternalPortRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getBindingRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_1_0(); + element = grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_1_0(); consumed = obj; return param; } @@ -9678,35 +9681,35 @@ protected class ActorClass_ExternalPortsAssignment_8_6_1 extends AssignmentToken } } -// serviceAccessPoints+=SAP -protected class ActorClass_ServiceAccessPointsAssignment_8_6_2 extends AssignmentToken { +// serviceImplementations+=ServiceImplementation +protected class ActorClass_ServiceImplementationsAssignment_8_6_2 extends AssignmentToken { - public ActorClass_ServiceAccessPointsAssignment_8_6_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public ActorClass_ServiceImplementationsAssignment_8_6_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getActorClassAccess().getServiceAccessPointsAssignment_8_6_2(); + return grammarAccess.getActorClassAccess().getServiceImplementationsAssignment_8_6_2(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new SAP_Group(this, this, 0, inst); + case 0: return new ServiceImplementation_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("serviceAccessPoints",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("serviceAccessPoints"); + if((value = eObjectConsumer.getConsumable("serviceImplementations",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("serviceImplementations"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getSAPRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getServiceImplementationRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_2_0(); + element = grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_2_0(); consumed = obj; return param; } @@ -9828,35 +9831,35 @@ protected class ActorClass_ActorRefsAssignment_8_6_4 extends AssignmentToken { } } -// serviceImplementations+=ServiceImplementation -protected class ActorClass_ServiceImplementationsAssignment_8_6_5 extends AssignmentToken { +// serviceAccessPoints+=SAP +protected class ActorClass_ServiceAccessPointsAssignment_8_6_5 extends AssignmentToken { - public ActorClass_ServiceImplementationsAssignment_8_6_5(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public ActorClass_ServiceAccessPointsAssignment_8_6_5(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getActorClassAccess().getServiceImplementationsAssignment_8_6_5(); + return grammarAccess.getActorClassAccess().getServiceAccessPointsAssignment_8_6_5(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new ServiceImplementation_Group(this, this, 0, inst); + case 0: return new SAP_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("serviceImplementations",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("serviceImplementations"); + if((value = eObjectConsumer.getConsumable("serviceAccessPoints",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("serviceAccessPoints"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getServiceImplementationRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getSAPRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_5_0(); + element = grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_5_0(); consumed = obj; return param; } @@ -9878,35 +9881,35 @@ protected class ActorClass_ServiceImplementationsAssignment_8_6_5 extends Assign } } -// bindings+=Binding -protected class ActorClass_BindingsAssignment_8_6_6 extends AssignmentToken { +// internalPorts+=Port +protected class ActorClass_InternalPortsAssignment_8_6_6 extends AssignmentToken { - public ActorClass_BindingsAssignment_8_6_6(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public ActorClass_InternalPortsAssignment_8_6_6(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getActorClassAccess().getBindingsAssignment_8_6_6(); + return grammarAccess.getActorClassAccess().getInternalPortsAssignment_8_6_6(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new Binding_Group(this, this, 0, inst); + case 0: return new Port_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("bindings",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("bindings"); + if((value = eObjectConsumer.getConsumable("internalPorts",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("internalPorts"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getBindingRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getPortRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_6_0(); + element = grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_6_0(); consumed = obj; return param; } @@ -9928,35 +9931,35 @@ protected class ActorClass_BindingsAssignment_8_6_6 extends AssignmentToken { } } -// connections+=LayerConnection -protected class ActorClass_ConnectionsAssignment_8_6_7 extends AssignmentToken { +// externalPorts+=ExternalPort +protected class ActorClass_ExternalPortsAssignment_8_6_7 extends AssignmentToken { - public ActorClass_ConnectionsAssignment_8_6_7(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public ActorClass_ExternalPortsAssignment_8_6_7(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getActorClassAccess().getConnectionsAssignment_8_6_7(); + return grammarAccess.getActorClassAccess().getExternalPortsAssignment_8_6_7(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new LayerConnection_Group(this, this, 0, inst); + case 0: return new ExternalPort_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("connections",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("connections"); + if((value = eObjectConsumer.getConsumable("externalPorts",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("externalPorts"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getLayerConnectionRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getExternalPortRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_7_0(); + element = grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_7_0(); consumed = obj; return param; } @@ -10006,8 +10009,8 @@ protected class ActorClass_RightCurlyBracketKeyword_8_7 extends KeywordToken { } -// ("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* (structors+=ClassStructor | -// operations+=StandardOperation)* stateMachine=StateMachine? "}")? +// ("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* (operations+=StandardOperation | +// structors+=ClassStructor)* stateMachine=StateMachine? "}")? protected class ActorClass_Group_9 extends GroupToken { public ActorClass_Group_9(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -10170,7 +10173,7 @@ protected class ActorClass_BehaviorAnnotationsAssignment_9_3 extends AssignmentT } } -// (structors+=ClassStructor | operations+=StandardOperation)* +// (operations+=StandardOperation | structors+=ClassStructor)* protected class ActorClass_Alternatives_9_4 extends AlternativesToken { public ActorClass_Alternatives_9_4(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -10185,43 +10188,43 @@ protected class ActorClass_Alternatives_9_4 extends AlternativesToken { @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new ActorClass_StructorsAssignment_9_4_0(lastRuleCallOrigin, this, 0, inst); - case 1: return new ActorClass_OperationsAssignment_9_4_1(lastRuleCallOrigin, this, 1, inst); + case 0: return new ActorClass_OperationsAssignment_9_4_0(lastRuleCallOrigin, this, 0, inst); + case 1: return new ActorClass_StructorsAssignment_9_4_1(lastRuleCallOrigin, this, 1, inst); default: return null; } } } -// structors+=ClassStructor -protected class ActorClass_StructorsAssignment_9_4_0 extends AssignmentToken { +// operations+=StandardOperation +protected class ActorClass_OperationsAssignment_9_4_0 extends AssignmentToken { - public ActorClass_StructorsAssignment_9_4_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public ActorClass_OperationsAssignment_9_4_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getActorClassAccess().getStructorsAssignment_9_4_0(); + return grammarAccess.getActorClassAccess().getOperationsAssignment_9_4_0(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new ClassStructor_Group(this, this, 0, inst); + case 0: return new StandardOperation_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("structors",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("structors"); + if((value = eObjectConsumer.getConsumable("operations",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("operations"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getClassStructorRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getStandardOperationRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_0_0(); + element = grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_0_0(); consumed = obj; return param; } @@ -10241,35 +10244,35 @@ protected class ActorClass_StructorsAssignment_9_4_0 extends AssignmentToken { } } -// operations+=StandardOperation -protected class ActorClass_OperationsAssignment_9_4_1 extends AssignmentToken { +// structors+=ClassStructor +protected class ActorClass_StructorsAssignment_9_4_1 extends AssignmentToken { - public ActorClass_OperationsAssignment_9_4_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public ActorClass_StructorsAssignment_9_4_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getActorClassAccess().getOperationsAssignment_9_4_1(); + return grammarAccess.getActorClassAccess().getStructorsAssignment_9_4_1(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new StandardOperation_Group(this, this, 0, inst); + case 0: return new ClassStructor_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("operations",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("operations"); + if((value = eObjectConsumer.getConsumable("structors",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("structors"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getStandardOperationRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getClassStructorRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_1_0(); + element = grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_1_0(); consumed = obj; return param; } @@ -11369,13 +11372,13 @@ protected class ServiceImplementation_SppAssignment_2 extends AssignmentToken { /************ begin Rule LogicalSystem **************** * * LogicalSystem: - * "LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* (subSystems+=SubSystemRef | - * bindings+=Binding | connections+=LayerConnection)* "}"; + * "LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* (connections+=LayerConnection | + * bindings+=Binding | subSystems+=SubSystemRef)* "}"; * **/ -// "LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* (subSystems+=SubSystemRef | bindings+=Binding | -// connections+=LayerConnection)* "}" +// "LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* (connections+=LayerConnection | +// bindings+=Binding | subSystems+=SubSystemRef)* "}" protected class LogicalSystem_Group extends GroupToken { public LogicalSystem_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -11575,7 +11578,7 @@ protected class LogicalSystem_AnnotationsAssignment_4 extends AssignmentToken { } } -// (subSystems+=SubSystemRef | bindings+=Binding | connections+=LayerConnection)* +// (connections+=LayerConnection | bindings+=Binding | subSystems+=SubSystemRef)* protected class LogicalSystem_Alternatives_5 extends AlternativesToken { public LogicalSystem_Alternatives_5(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -11590,44 +11593,44 @@ protected class LogicalSystem_Alternatives_5 extends AlternativesToken { @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new LogicalSystem_SubSystemsAssignment_5_0(lastRuleCallOrigin, this, 0, inst); + case 0: return new LogicalSystem_ConnectionsAssignment_5_0(lastRuleCallOrigin, this, 0, inst); case 1: return new LogicalSystem_BindingsAssignment_5_1(lastRuleCallOrigin, this, 1, inst); - case 2: return new LogicalSystem_ConnectionsAssignment_5_2(lastRuleCallOrigin, this, 2, inst); + case 2: return new LogicalSystem_SubSystemsAssignment_5_2(lastRuleCallOrigin, this, 2, inst); default: return null; } } } -// subSystems+=SubSystemRef -protected class LogicalSystem_SubSystemsAssignment_5_0 extends AssignmentToken { +// connections+=LayerConnection +protected class LogicalSystem_ConnectionsAssignment_5_0 extends AssignmentToken { - public LogicalSystem_SubSystemsAssignment_5_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public LogicalSystem_ConnectionsAssignment_5_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getLogicalSystemAccess().getSubSystemsAssignment_5_0(); + return grammarAccess.getLogicalSystemAccess().getConnectionsAssignment_5_0(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new SubSystemRef_Group(this, this, 0, inst); + case 0: return new LayerConnection_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("subSystems",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("subSystems"); + if((value = eObjectConsumer.getConsumable("connections",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("connections"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getSubSystemRefRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getLayerConnectionRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_0_0(); + element = grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_0_0(); consumed = obj; return param; } @@ -11695,35 +11698,35 @@ protected class LogicalSystem_BindingsAssignment_5_1 extends AssignmentToken { } } -// connections+=LayerConnection -protected class LogicalSystem_ConnectionsAssignment_5_2 extends AssignmentToken { +// subSystems+=SubSystemRef +protected class LogicalSystem_SubSystemsAssignment_5_2 extends AssignmentToken { - public LogicalSystem_ConnectionsAssignment_5_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public LogicalSystem_SubSystemsAssignment_5_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getLogicalSystemAccess().getConnectionsAssignment_5_2(); + return grammarAccess.getLogicalSystemAccess().getSubSystemsAssignment_5_2(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new LayerConnection_Group(this, this, 0, inst); + case 0: return new SubSystemRef_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("connections",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("connections"); + if((value = eObjectConsumer.getConsumable("subSystems",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("subSystems"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getLayerConnectionRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getSubSystemRefRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_2_0(); + element = grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_2_0(); consumed = obj; return param; } @@ -12091,16 +12094,16 @@ protected class SubSystemRef_DocuAssignment_4 extends AssignmentToken { * * SubSystemClass: * "SubSystemClass" name=ID docu=Documentation? "{" annotations+=Annotation* ("usercode1" userCode1=DetailCode)? - * ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (relayPorts+=Port | - * serviceProvisionPoints+=SPP | actorRefs+=ActorRef | bindings+=Binding | connections+=LayerConnection | - * threads+=LogicalThread | actorInstanceMappings+=ActorInstanceMapping)* "}"; + * ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer + * (actorInstanceMappings+=ActorInstanceMapping | threads+=LogicalThread | connections+=LayerConnection | + * bindings+=Binding | actorRefs+=ActorRef | serviceProvisionPoints+=SPP | relayPorts+=Port)* "}"; * **/ // "SubSystemClass" name=ID docu=Documentation? "{" annotations+=Annotation* ("usercode1" userCode1=DetailCode)? -// ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (relayPorts+=Port | -// serviceProvisionPoints+=SPP | actorRefs+=ActorRef | bindings+=Binding | connections+=LayerConnection | -// threads+=LogicalThread | actorInstanceMappings+=ActorInstanceMapping)* "}" +// ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer +// (actorInstanceMappings+=ActorInstanceMapping | threads+=LogicalThread | connections+=LayerConnection | bindings+=Binding +// | actorRefs+=ActorRef | serviceProvisionPoints+=SPP | relayPorts+=Port)* "}" protected class SubSystemClass_Group extends GroupToken { public SubSystemClass_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -12579,8 +12582,9 @@ protected class SubSystemClass_UserCode3Assignment_7_1 extends AssignmentToken } -// (relayPorts+=Port | serviceProvisionPoints+=SPP | actorRefs+=ActorRef | bindings+=Binding | connections+=LayerConnection -// | threads+=LogicalThread | actorInstanceMappings+=ActorInstanceMapping)* +// // workaround: reverse the order for serializer +// (actorInstanceMappings+=ActorInstanceMapping | threads+=LogicalThread | connections+=LayerConnection | bindings+=Binding +// | actorRefs+=ActorRef | serviceProvisionPoints+=SPP | relayPorts+=Port)* protected class SubSystemClass_Alternatives_8 extends AlternativesToken { public SubSystemClass_Alternatives_8(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -12595,48 +12599,49 @@ protected class SubSystemClass_Alternatives_8 extends AlternativesToken { @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new SubSystemClass_RelayPortsAssignment_8_0(lastRuleCallOrigin, this, 0, inst); - case 1: return new SubSystemClass_ServiceProvisionPointsAssignment_8_1(lastRuleCallOrigin, this, 1, inst); - case 2: return new SubSystemClass_ActorRefsAssignment_8_2(lastRuleCallOrigin, this, 2, inst); + case 0: return new SubSystemClass_ActorInstanceMappingsAssignment_8_0(lastRuleCallOrigin, this, 0, inst); + case 1: return new SubSystemClass_ThreadsAssignment_8_1(lastRuleCallOrigin, this, 1, inst); + case 2: return new SubSystemClass_ConnectionsAssignment_8_2(lastRuleCallOrigin, this, 2, inst); case 3: return new SubSystemClass_BindingsAssignment_8_3(lastRuleCallOrigin, this, 3, inst); - case 4: return new SubSystemClass_ConnectionsAssignment_8_4(lastRuleCallOrigin, this, 4, inst); - case 5: return new SubSystemClass_ThreadsAssignment_8_5(lastRuleCallOrigin, this, 5, inst); - case 6: return new SubSystemClass_ActorInstanceMappingsAssignment_8_6(lastRuleCallOrigin, this, 6, inst); + case 4: return new SubSystemClass_ActorRefsAssignment_8_4(lastRuleCallOrigin, this, 4, inst); + case 5: return new SubSystemClass_ServiceProvisionPointsAssignment_8_5(lastRuleCallOrigin, this, 5, inst); + case 6: return new SubSystemClass_RelayPortsAssignment_8_6(lastRuleCallOrigin, this, 6, inst); default: return null; } } } -// relayPorts+=Port -protected class SubSystemClass_RelayPortsAssignment_8_0 extends AssignmentToken { +// // workaround: reverse the order for serializer +// actorInstanceMappings+=ActorInstanceMapping +protected class SubSystemClass_ActorInstanceMappingsAssignment_8_0 extends AssignmentToken { - public SubSystemClass_RelayPortsAssignment_8_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public SubSystemClass_ActorInstanceMappingsAssignment_8_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getSubSystemClassAccess().getRelayPortsAssignment_8_0(); + return grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsAssignment_8_0(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new Port_Group(this, this, 0, inst); + case 0: return new ActorInstanceMapping_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("relayPorts",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("relayPorts"); + if((value = eObjectConsumer.getConsumable("actorInstanceMappings",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("actorInstanceMappings"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getPortRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getActorInstanceMappingRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_0_0(); + element = grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_0_0(); consumed = obj; return param; } @@ -12659,35 +12664,35 @@ protected class SubSystemClass_RelayPortsAssignment_8_0 extends AssignmentToken } } -// serviceProvisionPoints+=SPP -protected class SubSystemClass_ServiceProvisionPointsAssignment_8_1 extends AssignmentToken { +// threads+=LogicalThread +protected class SubSystemClass_ThreadsAssignment_8_1 extends AssignmentToken { - public SubSystemClass_ServiceProvisionPointsAssignment_8_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public SubSystemClass_ThreadsAssignment_8_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsAssignment_8_1(); + return grammarAccess.getSubSystemClassAccess().getThreadsAssignment_8_1(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new SPP_Group(this, this, 0, inst); + case 0: return new LogicalThread_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("serviceProvisionPoints",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("serviceProvisionPoints"); + if((value = eObjectConsumer.getConsumable("threads",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("threads"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getSPPRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getLogicalThreadRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_1_0(); + element = grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_1_0(); consumed = obj; return param; } @@ -12710,35 +12715,35 @@ protected class SubSystemClass_ServiceProvisionPointsAssignment_8_1 extends Assi } } -// actorRefs+=ActorRef -protected class SubSystemClass_ActorRefsAssignment_8_2 extends AssignmentToken { +// connections+=LayerConnection +protected class SubSystemClass_ConnectionsAssignment_8_2 extends AssignmentToken { - public SubSystemClass_ActorRefsAssignment_8_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public SubSystemClass_ConnectionsAssignment_8_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getSubSystemClassAccess().getActorRefsAssignment_8_2(); + return grammarAccess.getSubSystemClassAccess().getConnectionsAssignment_8_2(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new ActorRef_Group(this, this, 0, inst); + case 0: return new LayerConnection_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("actorRefs",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("actorRefs"); + if((value = eObjectConsumer.getConsumable("connections",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("connections"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getActorRefRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getLayerConnectionRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_2_0(); + element = grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_2_0(); consumed = obj; return param; } @@ -12812,35 +12817,35 @@ protected class SubSystemClass_BindingsAssignment_8_3 extends AssignmentToken { } } -// connections+=LayerConnection -protected class SubSystemClass_ConnectionsAssignment_8_4 extends AssignmentToken { +// actorRefs+=ActorRef +protected class SubSystemClass_ActorRefsAssignment_8_4 extends AssignmentToken { - public SubSystemClass_ConnectionsAssignment_8_4(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public SubSystemClass_ActorRefsAssignment_8_4(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getSubSystemClassAccess().getConnectionsAssignment_8_4(); + return grammarAccess.getSubSystemClassAccess().getActorRefsAssignment_8_4(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new LayerConnection_Group(this, this, 0, inst); + case 0: return new ActorRef_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("connections",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("connections"); + if((value = eObjectConsumer.getConsumable("actorRefs",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("actorRefs"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getLayerConnectionRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getActorRefRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_4_0(); + element = grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_4_0(); consumed = obj; return param; } @@ -12863,35 +12868,35 @@ protected class SubSystemClass_ConnectionsAssignment_8_4 extends AssignmentToken } } -// threads+=LogicalThread -protected class SubSystemClass_ThreadsAssignment_8_5 extends AssignmentToken { +// serviceProvisionPoints+=SPP +protected class SubSystemClass_ServiceProvisionPointsAssignment_8_5 extends AssignmentToken { - public SubSystemClass_ThreadsAssignment_8_5(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public SubSystemClass_ServiceProvisionPointsAssignment_8_5(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getSubSystemClassAccess().getThreadsAssignment_8_5(); + return grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsAssignment_8_5(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new LogicalThread_Group(this, this, 0, inst); + case 0: return new SPP_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("threads",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("threads"); + if((value = eObjectConsumer.getConsumable("serviceProvisionPoints",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("serviceProvisionPoints"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getLogicalThreadRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getSPPRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_5_0(); + element = grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_5_0(); consumed = obj; return param; } @@ -12914,35 +12919,35 @@ protected class SubSystemClass_ThreadsAssignment_8_5 extends AssignmentToken { } } -// actorInstanceMappings+=ActorInstanceMapping -protected class SubSystemClass_ActorInstanceMappingsAssignment_8_6 extends AssignmentToken { +// relayPorts+=Port +protected class SubSystemClass_RelayPortsAssignment_8_6 extends AssignmentToken { - public SubSystemClass_ActorInstanceMappingsAssignment_8_6(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { + public SubSystemClass_RelayPortsAssignment_8_6(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer); } @Override public Assignment getGrammarElement() { - return grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsAssignment_8_6(); + return grammarAccess.getSubSystemClassAccess().getRelayPortsAssignment_8_6(); } @Override public AbstractToken createFollower(int index, IEObjectConsumer inst) { switch(index) { - case 0: return new ActorInstanceMapping_Group(this, this, 0, inst); + case 0: return new Port_Group(this, this, 0, inst); default: return null; } } @Override public IEObjectConsumer tryConsume() { - if((value = eObjectConsumer.getConsumable("actorInstanceMappings",true)) == null) return null; - IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("actorInstanceMappings"); + if((value = eObjectConsumer.getConsumable("relayPorts",true)) == null) return null; + IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("relayPorts"); if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl IEObjectConsumer param = createEObjectConsumer((EObject)value); - if(param.isInstanceOf(grammarAccess.getActorInstanceMappingRule().getType().getClassifier())) { + if(param.isInstanceOf(grammarAccess.getPortRule().getType().getClassifier())) { type = AssignmentType.PARSER_RULE_CALL; - element = grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_6_0(); + element = grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_6_0(); consumed = obj; return param; } diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g index 0daf6e0f7..4c5a41ea6 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g @@ -1216,17 +1216,17 @@ ruleDataClass returns [EObject current=null] ))?(( ( { - newCompositeNode(grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_0_0()); + newCompositeNode(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_0_0()); } - lv_attributes_13_0=ruleAttribute { + lv_operations_13_0=ruleStandardOperation { if ($current==null) { $current = createModelElementForParent(grammarAccess.getDataClassRule()); } add( $current, - "attributes", - lv_attributes_13_0, - "Attribute"); + "operations", + lv_operations_13_0, + "StandardOperation"); afterParserOrEnumRuleCall(); } @@ -1254,17 +1254,17 @@ ruleDataClass returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_2_0()); + newCompositeNode(grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_2_0()); } - lv_operations_15_0=ruleStandardOperation { + lv_attributes_15_0=ruleAttribute { if ($current==null) { $current = createModelElementForParent(grammarAccess.getDataClassRule()); } add( $current, - "operations", - lv_operations_15_0, - "StandardOperation"); + "attributes", + lv_attributes_15_0, + "Attribute"); afterParserOrEnumRuleCall(); } @@ -2501,17 +2501,17 @@ rulePortClass returns [EObject current=null] ))?(( ( { - newCompositeNode(grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_0_0()); + newCompositeNode(grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_0_0()); } - lv_attributes_4_0=ruleAttribute { + lv_msgHandlers_4_0=ruleMessageHandler { if ($current==null) { $current = createModelElementForParent(grammarAccess.getPortClassRule()); } add( $current, - "attributes", - lv_attributes_4_0, - "Attribute"); + "msgHandlers", + lv_msgHandlers_4_0, + "MessageHandler"); afterParserOrEnumRuleCall(); } @@ -2539,17 +2539,17 @@ rulePortClass returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_2_0()); + newCompositeNode(grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_2_0()); } - lv_msgHandlers_6_0=ruleMessageHandler { + lv_attributes_6_0=ruleAttribute { if ($current==null) { $current = createModelElementForParent(grammarAccess.getPortClassRule()); } add( $current, - "msgHandlers", - lv_msgHandlers_6_0, - "MessageHandler"); + "attributes", + lv_attributes_6_0, + "Attribute"); afterParserOrEnumRuleCall(); } @@ -2934,17 +2934,17 @@ ruleActorClass returns [EObject current=null] (( ( { - newCompositeNode(grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_0_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_0_0()); } - lv_interfacePorts_12_0=rulePort { + lv_serviceProvisionPoints_12_0=ruleSPP { if ($current==null) { $current = createModelElementForParent(grammarAccess.getActorClassRule()); } add( $current, - "interfacePorts", - lv_interfacePorts_12_0, - "Port"); + "serviceProvisionPoints", + lv_serviceProvisionPoints_12_0, + "SPP"); afterParserOrEnumRuleCall(); } @@ -2953,17 +2953,17 @@ ruleActorClass returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_1_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_1_0()); } - lv_serviceProvisionPoints_13_0=ruleSPP { + lv_interfacePorts_13_0=rulePort { if ($current==null) { $current = createModelElementForParent(grammarAccess.getActorClassRule()); } add( $current, - "serviceProvisionPoints", - lv_serviceProvisionPoints_13_0, - "SPP"); + "interfacePorts", + lv_interfacePorts_13_0, + "Port"); afterParserOrEnumRuleCall(); } @@ -3067,17 +3067,17 @@ ruleActorClass returns [EObject current=null] ))?(( ( { - newCompositeNode(grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_0_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_0_0()); } - lv_internalPorts_24_0=rulePort { + lv_connections_24_0=ruleLayerConnection { if ($current==null) { $current = createModelElementForParent(grammarAccess.getActorClassRule()); } add( $current, - "internalPorts", - lv_internalPorts_24_0, - "Port"); + "connections", + lv_connections_24_0, + "LayerConnection"); afterParserOrEnumRuleCall(); } @@ -3086,17 +3086,17 @@ ruleActorClass returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_1_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_1_0()); } - lv_externalPorts_25_0=ruleExternalPort { + lv_bindings_25_0=ruleBinding { if ($current==null) { $current = createModelElementForParent(grammarAccess.getActorClassRule()); } add( $current, - "externalPorts", - lv_externalPorts_25_0, - "ExternalPort"); + "bindings", + lv_bindings_25_0, + "Binding"); afterParserOrEnumRuleCall(); } @@ -3105,17 +3105,17 @@ ruleActorClass returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_2_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_2_0()); } - lv_serviceAccessPoints_26_0=ruleSAP { + lv_serviceImplementations_26_0=ruleServiceImplementation { if ($current==null) { $current = createModelElementForParent(grammarAccess.getActorClassRule()); } add( $current, - "serviceAccessPoints", - lv_serviceAccessPoints_26_0, - "SAP"); + "serviceImplementations", + lv_serviceImplementations_26_0, + "ServiceImplementation"); afterParserOrEnumRuleCall(); } @@ -3162,17 +3162,17 @@ ruleActorClass returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_5_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_5_0()); } - lv_serviceImplementations_29_0=ruleServiceImplementation { + lv_serviceAccessPoints_29_0=ruleSAP { if ($current==null) { $current = createModelElementForParent(grammarAccess.getActorClassRule()); } add( $current, - "serviceImplementations", - lv_serviceImplementations_29_0, - "ServiceImplementation"); + "serviceAccessPoints", + lv_serviceAccessPoints_29_0, + "SAP"); afterParserOrEnumRuleCall(); } @@ -3181,17 +3181,17 @@ ruleActorClass returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_6_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_6_0()); } - lv_bindings_30_0=ruleBinding { + lv_internalPorts_30_0=rulePort { if ($current==null) { $current = createModelElementForParent(grammarAccess.getActorClassRule()); } add( $current, - "bindings", - lv_bindings_30_0, - "Binding"); + "internalPorts", + lv_internalPorts_30_0, + "Port"); afterParserOrEnumRuleCall(); } @@ -3200,17 +3200,17 @@ ruleActorClass returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_7_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_7_0()); } - lv_connections_31_0=ruleLayerConnection { + lv_externalPorts_31_0=ruleExternalPort { if ($current==null) { $current = createModelElementForParent(grammarAccess.getActorClassRule()); } add( $current, - "connections", - lv_connections_31_0, - "LayerConnection"); + "externalPorts", + lv_externalPorts_31_0, + "ExternalPort"); afterParserOrEnumRuleCall(); } @@ -3266,17 +3266,17 @@ ruleActorClass returns [EObject current=null] )*(( ( { - newCompositeNode(grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_0_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_0_0()); } - lv_structors_37_0=ruleClassStructor { + lv_operations_37_0=ruleStandardOperation { if ($current==null) { $current = createModelElementForParent(grammarAccess.getActorClassRule()); } add( $current, - "structors", - lv_structors_37_0, - "ClassStructor"); + "operations", + lv_operations_37_0, + "StandardOperation"); afterParserOrEnumRuleCall(); } @@ -3285,17 +3285,17 @@ ruleActorClass returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_1_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_1_0()); } - lv_operations_38_0=ruleStandardOperation { + lv_structors_38_0=ruleClassStructor { if ($current==null) { $current = createModelElementForParent(grammarAccess.getActorClassRule()); } add( $current, - "operations", - lv_operations_38_0, - "StandardOperation"); + "structors", + lv_structors_38_0, + "ClassStructor"); afterParserOrEnumRuleCall(); } @@ -3783,17 +3783,17 @@ ruleLogicalSystem returns [EObject current=null] )*(( ( { - newCompositeNode(grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_0_0()); + newCompositeNode(grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_0_0()); } - lv_subSystems_5_0=ruleSubSystemRef { + lv_connections_5_0=ruleLayerConnection { if ($current==null) { $current = createModelElementForParent(grammarAccess.getLogicalSystemRule()); } add( $current, - "subSystems", - lv_subSystems_5_0, - "SubSystemRef"); + "connections", + lv_connections_5_0, + "LayerConnection"); afterParserOrEnumRuleCall(); } @@ -3821,17 +3821,17 @@ ruleLogicalSystem returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_2_0()); + newCompositeNode(grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_2_0()); } - lv_connections_7_0=ruleLayerConnection { + lv_subSystems_7_0=ruleSubSystemRef { if ($current==null) { $current = createModelElementForParent(grammarAccess.getLogicalSystemRule()); } add( $current, - "connections", - lv_connections_7_0, - "LayerConnection"); + "subSystems", + lv_subSystems_7_0, + "SubSystemRef"); afterParserOrEnumRuleCall(); } @@ -4074,17 +4074,17 @@ ruleSubSystemClass returns [EObject current=null] ))?(( ( { - newCompositeNode(grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_0_0()); + newCompositeNode(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_0_0()); } - lv_relayPorts_11_0=rulePort { + lv_actorInstanceMappings_11_0=ruleActorInstanceMapping { if ($current==null) { $current = createModelElementForParent(grammarAccess.getSubSystemClassRule()); } add( $current, - "relayPorts", - lv_relayPorts_11_0, - "Port"); + "actorInstanceMappings", + lv_actorInstanceMappings_11_0, + "ActorInstanceMapping"); afterParserOrEnumRuleCall(); } @@ -4093,17 +4093,17 @@ ruleSubSystemClass returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_1_0()); + newCompositeNode(grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_1_0()); } - lv_serviceProvisionPoints_12_0=ruleSPP { + lv_threads_12_0=ruleLogicalThread { if ($current==null) { $current = createModelElementForParent(grammarAccess.getSubSystemClassRule()); } add( $current, - "serviceProvisionPoints", - lv_serviceProvisionPoints_12_0, - "SPP"); + "threads", + lv_threads_12_0, + "LogicalThread"); afterParserOrEnumRuleCall(); } @@ -4112,17 +4112,17 @@ ruleSubSystemClass returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_2_0()); + newCompositeNode(grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_2_0()); } - lv_actorRefs_13_0=ruleActorRef { + lv_connections_13_0=ruleLayerConnection { if ($current==null) { $current = createModelElementForParent(grammarAccess.getSubSystemClassRule()); } add( $current, - "actorRefs", - lv_actorRefs_13_0, - "ActorRef"); + "connections", + lv_connections_13_0, + "LayerConnection"); afterParserOrEnumRuleCall(); } @@ -4150,17 +4150,17 @@ ruleSubSystemClass returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_4_0()); + newCompositeNode(grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_4_0()); } - lv_connections_15_0=ruleLayerConnection { + lv_actorRefs_15_0=ruleActorRef { if ($current==null) { $current = createModelElementForParent(grammarAccess.getSubSystemClassRule()); } add( $current, - "connections", - lv_connections_15_0, - "LayerConnection"); + "actorRefs", + lv_actorRefs_15_0, + "ActorRef"); afterParserOrEnumRuleCall(); } @@ -4169,17 +4169,17 @@ ruleSubSystemClass returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_5_0()); + newCompositeNode(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_5_0()); } - lv_threads_16_0=ruleLogicalThread { + lv_serviceProvisionPoints_16_0=ruleSPP { if ($current==null) { $current = createModelElementForParent(grammarAccess.getSubSystemClassRule()); } add( $current, - "threads", - lv_threads_16_0, - "LogicalThread"); + "serviceProvisionPoints", + lv_serviceProvisionPoints_16_0, + "SPP"); afterParserOrEnumRuleCall(); } @@ -4188,17 +4188,17 @@ ruleSubSystemClass returns [EObject current=null] |( ( { - newCompositeNode(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_6_0()); + newCompositeNode(grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_6_0()); } - lv_actorInstanceMappings_17_0=ruleActorInstanceMapping { + lv_relayPorts_17_0=rulePort { if ($current==null) { $current = createModelElementForParent(grammarAccess.getSubSystemClassRule()); } add( $current, - "actorInstanceMappings", - lv_actorInstanceMappings_17_0, - "ActorInstanceMapping"); + "relayPorts", + lv_relayPorts_17_0, + "Port"); afterParserOrEnumRuleCall(); } diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java index cfa28a54e..eab92d6c8 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java @@ -2619,7 +2619,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleDataClass" - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1065:1: ruleDataClass returns [EObject current=null] : (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_attributes_13_0= ruleAttribute ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_operations_15_0= ruleStandardOperation ) ) )* otherlv_16= '}' ) ; + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1065:1: ruleDataClass returns [EObject current=null] : (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}' ) ; public final EObject ruleDataClass() throws RecognitionException { EObject current = null; @@ -2641,21 +2641,21 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { EObject lv_userCode3_12_0 = null; - EObject lv_attributes_13_0 = null; + EObject lv_operations_13_0 = null; EObject lv_structors_14_0 = null; - EObject lv_operations_15_0 = null; + EObject lv_attributes_15_0 = null; enterRule(); try { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1068:28: ( (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_attributes_13_0= ruleAttribute ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_operations_15_0= ruleStandardOperation ) ) )* otherlv_16= '}' ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1069:1: (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_attributes_13_0= ruleAttribute ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_operations_15_0= ruleStandardOperation ) ) )* otherlv_16= '}' ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1068:28: ( (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}' ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1069:1: (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}' ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1069:1: (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_attributes_13_0= ruleAttribute ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_operations_15_0= ruleStandardOperation ) ) )* otherlv_16= '}' ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1069:3: otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_attributes_13_0= ruleAttribute ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_operations_15_0= ruleStandardOperation ) ) )* otherlv_16= '}' + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1069:1: (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}' ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1069:3: otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}' { otherlv_0=(Token)match(input,28,FOLLOW_28_in_ruleDataClass2142); @@ -2987,12 +2987,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1216:4: ( ( (lv_attributes_13_0= ruleAttribute ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_operations_15_0= ruleStandardOperation ) ) )* + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1216:4: ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* loop24: do { int alt24=4; switch ( input.LA(1) ) { - case 33: + case 36: + case 37: { alt24=1; } @@ -3003,8 +3004,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { alt24=2; } break; - case 36: - case 37: + case 33: { alt24=3; } @@ -3014,19 +3014,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { switch (alt24) { case 1 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1216:5: ( (lv_attributes_13_0= ruleAttribute ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1216:5: ( (lv_operations_13_0= ruleStandardOperation ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1216:5: ( (lv_attributes_13_0= ruleAttribute ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1217:1: (lv_attributes_13_0= ruleAttribute ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1216:5: ( (lv_operations_13_0= ruleStandardOperation ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1217:1: (lv_operations_13_0= ruleStandardOperation ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1217:1: (lv_attributes_13_0= ruleAttribute ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1218:3: lv_attributes_13_0= ruleAttribute + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1217:1: (lv_operations_13_0= ruleStandardOperation ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1218:3: lv_operations_13_0= ruleStandardOperation { - newCompositeNode(grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_0_0()); + newCompositeNode(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_0_0()); - pushFollow(FOLLOW_ruleAttribute_in_ruleDataClass2388); - lv_attributes_13_0=ruleAttribute(); + pushFollow(FOLLOW_ruleStandardOperation_in_ruleDataClass2388); + lv_operations_13_0=ruleStandardOperation(); state._fsp--; @@ -3036,9 +3036,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "attributes", - lv_attributes_13_0, - "Attribute"); + "operations", + lv_operations_13_0, + "StandardOperation"); afterParserOrEnumRuleCall(); @@ -3088,19 +3088,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 3 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1254:6: ( (lv_operations_15_0= ruleStandardOperation ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1254:6: ( (lv_attributes_15_0= ruleAttribute ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1254:6: ( (lv_operations_15_0= ruleStandardOperation ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1255:1: (lv_operations_15_0= ruleStandardOperation ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1254:6: ( (lv_attributes_15_0= ruleAttribute ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1255:1: (lv_attributes_15_0= ruleAttribute ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1255:1: (lv_operations_15_0= ruleStandardOperation ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1256:3: lv_operations_15_0= ruleStandardOperation + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1255:1: (lv_attributes_15_0= ruleAttribute ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1256:3: lv_attributes_15_0= ruleAttribute { - newCompositeNode(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_2_0()); + newCompositeNode(grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_2_0()); - pushFollow(FOLLOW_ruleStandardOperation_in_ruleDataClass2442); - lv_operations_15_0=ruleStandardOperation(); + pushFollow(FOLLOW_ruleAttribute_in_ruleDataClass2442); + lv_attributes_15_0=ruleAttribute(); state._fsp--; @@ -3110,9 +3110,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "operations", - lv_operations_15_0, - "StandardOperation"); + "attributes", + lv_attributes_15_0, + "Attribute"); afterParserOrEnumRuleCall(); @@ -6071,7 +6071,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { // $ANTLR start "rulePortClass" - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2465:1: rulePortClass returns [EObject current=null] : ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_attributes_4_0= ruleAttribute ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_msgHandlers_6_0= ruleMessageHandler ) ) )* otherlv_7= '}' ) ; + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2465:1: rulePortClass returns [EObject current=null] : ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}' ) ; public final EObject rulePortClass() throws RecognitionException { EObject current = null; @@ -6080,21 +6080,21 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { Token otherlv_7=null; EObject lv_userCode_3_0 = null; - EObject lv_attributes_4_0 = null; + EObject lv_msgHandlers_4_0 = null; EObject lv_operations_5_0 = null; - EObject lv_msgHandlers_6_0 = null; + EObject lv_attributes_6_0 = null; enterRule(); try { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2468:28: ( ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_attributes_4_0= ruleAttribute ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_msgHandlers_6_0= ruleMessageHandler ) ) )* otherlv_7= '}' ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2469:1: ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_attributes_4_0= ruleAttribute ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_msgHandlers_6_0= ruleMessageHandler ) ) )* otherlv_7= '}' ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2468:28: ( ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}' ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2469:1: ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}' ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2469:1: ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_attributes_4_0= ruleAttribute ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_msgHandlers_6_0= ruleMessageHandler ) ) )* otherlv_7= '}' ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2469:2: () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_attributes_4_0= ruleAttribute ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_msgHandlers_6_0= ruleMessageHandler ) ) )* otherlv_7= '}' + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2469:1: ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}' ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2469:2: () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}' { // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2469:2: () // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2470:5: @@ -6163,12 +6163,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2501:4: ( ( (lv_attributes_4_0= ruleAttribute ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_msgHandlers_6_0= ruleMessageHandler ) ) )* + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2501:4: ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* loop62: do { int alt62=4; switch ( input.LA(1) ) { - case 33: + case 53: { alt62=1; } @@ -6178,7 +6178,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { alt62=2; } break; - case 53: + case 33: { alt62=3; } @@ -6188,19 +6188,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { switch (alt62) { case 1 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2501:5: ( (lv_attributes_4_0= ruleAttribute ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2501:5: ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2501:5: ( (lv_attributes_4_0= ruleAttribute ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2502:1: (lv_attributes_4_0= ruleAttribute ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2501:5: ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2502:1: (lv_msgHandlers_4_0= ruleMessageHandler ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2502:1: (lv_attributes_4_0= ruleAttribute ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2503:3: lv_attributes_4_0= ruleAttribute + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2502:1: (lv_msgHandlers_4_0= ruleMessageHandler ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2503:3: lv_msgHandlers_4_0= ruleMessageHandler { - newCompositeNode(grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_0_0()); + newCompositeNode(grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_0_0()); - pushFollow(FOLLOW_ruleAttribute_in_rulePortClass4901); - lv_attributes_4_0=ruleAttribute(); + pushFollow(FOLLOW_ruleMessageHandler_in_rulePortClass4901); + lv_msgHandlers_4_0=ruleMessageHandler(); state._fsp--; @@ -6210,9 +6210,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "attributes", - lv_attributes_4_0, - "Attribute"); + "msgHandlers", + lv_msgHandlers_4_0, + "MessageHandler"); afterParserOrEnumRuleCall(); @@ -6262,19 +6262,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 3 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2539:6: ( (lv_msgHandlers_6_0= ruleMessageHandler ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2539:6: ( (lv_attributes_6_0= ruleAttribute ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2539:6: ( (lv_msgHandlers_6_0= ruleMessageHandler ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2540:1: (lv_msgHandlers_6_0= ruleMessageHandler ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2539:6: ( (lv_attributes_6_0= ruleAttribute ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2540:1: (lv_attributes_6_0= ruleAttribute ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2540:1: (lv_msgHandlers_6_0= ruleMessageHandler ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2541:3: lv_msgHandlers_6_0= ruleMessageHandler + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2540:1: (lv_attributes_6_0= ruleAttribute ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2541:3: lv_attributes_6_0= ruleAttribute { - newCompositeNode(grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_2_0()); + newCompositeNode(grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_2_0()); - pushFollow(FOLLOW_ruleMessageHandler_in_rulePortClass4955); - lv_msgHandlers_6_0=ruleMessageHandler(); + pushFollow(FOLLOW_ruleAttribute_in_rulePortClass4955); + lv_attributes_6_0=ruleAttribute(); state._fsp--; @@ -6284,9 +6284,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "msgHandlers", - lv_msgHandlers_6_0, - "MessageHandler"); + "attributes", + lv_attributes_6_0, + "Attribute"); afterParserOrEnumRuleCall(); @@ -6851,7 +6851,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleActorClass" - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2768:1: ruleActorClass returns [EObject current=null] : ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_interfacePorts_12_0= rulePort ) ) | ( (lv_serviceProvisionPoints_13_0= ruleSPP ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_internalPorts_24_0= rulePort ) ) | ( (lv_externalPorts_25_0= ruleExternalPort ) ) | ( (lv_serviceAccessPoints_26_0= ruleSAP ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceImplementations_29_0= ruleServiceImplementation ) ) | ( (lv_bindings_30_0= ruleBinding ) ) | ( (lv_connections_31_0= ruleLayerConnection ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_structors_37_0= ruleClassStructor ) ) | ( (lv_operations_38_0= ruleStandardOperation ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' ) ; + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2768:1: ruleActorClass returns [EObject current=null] : ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' ) ; public final EObject ruleActorClass() throws RecognitionException { EObject current = null; @@ -6879,9 +6879,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { EObject lv_annotations_9_0 = null; - EObject lv_interfacePorts_12_0 = null; + EObject lv_serviceProvisionPoints_12_0 = null; - EObject lv_serviceProvisionPoints_13_0 = null; + EObject lv_interfacePorts_13_0 = null; EObject lv_structureDocu_16_0 = null; @@ -6891,29 +6891,29 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { EObject lv_userCode3_23_0 = null; - EObject lv_internalPorts_24_0 = null; + EObject lv_connections_24_0 = null; - EObject lv_externalPorts_25_0 = null; + EObject lv_bindings_25_0 = null; - EObject lv_serviceAccessPoints_26_0 = null; + EObject lv_serviceImplementations_26_0 = null; EObject lv_attributes_27_0 = null; EObject lv_actorRefs_28_0 = null; - EObject lv_serviceImplementations_29_0 = null; + EObject lv_serviceAccessPoints_29_0 = null; - EObject lv_bindings_30_0 = null; + EObject lv_internalPorts_30_0 = null; - EObject lv_connections_31_0 = null; + EObject lv_externalPorts_31_0 = null; EObject lv_behaviorDocu_34_0 = null; EObject lv_behaviorAnnotations_36_0 = null; - EObject lv_structors_37_0 = null; + EObject lv_operations_37_0 = null; - EObject lv_operations_38_0 = null; + EObject lv_structors_38_0 = null; EObject lv_stateMachine_39_0 = null; @@ -6921,11 +6921,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2771:28: ( ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_interfacePorts_12_0= rulePort ) ) | ( (lv_serviceProvisionPoints_13_0= ruleSPP ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_internalPorts_24_0= rulePort ) ) | ( (lv_externalPorts_25_0= ruleExternalPort ) ) | ( (lv_serviceAccessPoints_26_0= ruleSAP ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceImplementations_29_0= ruleServiceImplementation ) ) | ( (lv_bindings_30_0= ruleBinding ) ) | ( (lv_connections_31_0= ruleLayerConnection ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_structors_37_0= ruleClassStructor ) ) | ( (lv_operations_38_0= ruleStandardOperation ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2772:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_interfacePorts_12_0= rulePort ) ) | ( (lv_serviceProvisionPoints_13_0= ruleSPP ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_internalPorts_24_0= rulePort ) ) | ( (lv_externalPorts_25_0= ruleExternalPort ) ) | ( (lv_serviceAccessPoints_26_0= ruleSAP ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceImplementations_29_0= ruleServiceImplementation ) ) | ( (lv_bindings_30_0= ruleBinding ) ) | ( (lv_connections_31_0= ruleLayerConnection ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_structors_37_0= ruleClassStructor ) ) | ( (lv_operations_38_0= ruleStandardOperation ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2771:28: ( ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2772:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2772:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_interfacePorts_12_0= rulePort ) ) | ( (lv_serviceProvisionPoints_13_0= ruleSPP ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_internalPorts_24_0= rulePort ) ) | ( (lv_externalPorts_25_0= ruleExternalPort ) ) | ( (lv_serviceAccessPoints_26_0= ruleSAP ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceImplementations_29_0= ruleServiceImplementation ) ) | ( (lv_bindings_30_0= ruleBinding ) ) | ( (lv_connections_31_0= ruleLayerConnection ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_structors_37_0= ruleClassStructor ) ) | ( (lv_operations_38_0= ruleStandardOperation ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2772:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_interfacePorts_12_0= rulePort ) ) | ( (lv_serviceProvisionPoints_13_0= ruleSPP ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_internalPorts_24_0= rulePort ) ) | ( (lv_externalPorts_25_0= ruleExternalPort ) ) | ( (lv_serviceAccessPoints_26_0= ruleSAP ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceImplementations_29_0= ruleServiceImplementation ) ) | ( (lv_bindings_30_0= ruleBinding ) ) | ( (lv_connections_31_0= ruleLayerConnection ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_structors_37_0= ruleClassStructor ) ) | ( (lv_operations_38_0= ruleStandardOperation ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2772:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2772:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' { // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2772:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2774:1: ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) @@ -7271,7 +7271,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } } while (true); - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2926:3: (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_interfacePorts_12_0= rulePort ) ) | ( (lv_serviceProvisionPoints_13_0= ruleSPP ) ) )* otherlv_14= '}' )? + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2926:3: (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? int alt69=2; int LA69_0 = input.LA(1); @@ -7280,7 +7280,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } switch (alt69) { case 1 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2926:5: otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_interfacePorts_12_0= rulePort ) ) | ( (lv_serviceProvisionPoints_13_0= ruleSPP ) ) )* otherlv_14= '}' + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2926:5: otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' { otherlv_10=(Token)match(input,56,FOLLOW_56_in_ruleActorClass5853); @@ -7290,35 +7290,35 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { newLeafNode(otherlv_11, grammarAccess.getActorClassAccess().getLeftCurlyBracketKeyword_7_1()); - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2934:1: ( ( (lv_interfacePorts_12_0= rulePort ) ) | ( (lv_serviceProvisionPoints_13_0= ruleSPP ) ) )* + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2934:1: ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* loop68: do { int alt68=3; int LA68_0 = input.LA(1); - if ( (LA68_0==47||LA68_0==59) ) { + if ( (LA68_0==62) ) { alt68=1; } - else if ( (LA68_0==62) ) { + else if ( (LA68_0==47||LA68_0==59) ) { alt68=2; } switch (alt68) { case 1 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2934:2: ( (lv_interfacePorts_12_0= rulePort ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2934:2: ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2934:2: ( (lv_interfacePorts_12_0= rulePort ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2935:1: (lv_interfacePorts_12_0= rulePort ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2934:2: ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2935:1: (lv_serviceProvisionPoints_12_0= ruleSPP ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2935:1: (lv_interfacePorts_12_0= rulePort ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2936:3: lv_interfacePorts_12_0= rulePort + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2935:1: (lv_serviceProvisionPoints_12_0= ruleSPP ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2936:3: lv_serviceProvisionPoints_12_0= ruleSPP { - newCompositeNode(grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_0_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_0_0()); - pushFollow(FOLLOW_rulePort_in_ruleActorClass5887); - lv_interfacePorts_12_0=rulePort(); + pushFollow(FOLLOW_ruleSPP_in_ruleActorClass5887); + lv_serviceProvisionPoints_12_0=ruleSPP(); state._fsp--; @@ -7328,9 +7328,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "interfacePorts", - lv_interfacePorts_12_0, - "Port"); + "serviceProvisionPoints", + lv_serviceProvisionPoints_12_0, + "SPP"); afterParserOrEnumRuleCall(); @@ -7343,19 +7343,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2953:6: ( (lv_serviceProvisionPoints_13_0= ruleSPP ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2953:6: ( (lv_interfacePorts_13_0= rulePort ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2953:6: ( (lv_serviceProvisionPoints_13_0= ruleSPP ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2954:1: (lv_serviceProvisionPoints_13_0= ruleSPP ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2953:6: ( (lv_interfacePorts_13_0= rulePort ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2954:1: (lv_interfacePorts_13_0= rulePort ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2954:1: (lv_serviceProvisionPoints_13_0= ruleSPP ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2955:3: lv_serviceProvisionPoints_13_0= ruleSPP + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2954:1: (lv_interfacePorts_13_0= rulePort ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2955:3: lv_interfacePorts_13_0= rulePort { - newCompositeNode(grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_1_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_1_0()); - pushFollow(FOLLOW_ruleSPP_in_ruleActorClass5914); - lv_serviceProvisionPoints_13_0=ruleSPP(); + pushFollow(FOLLOW_rulePort_in_ruleActorClass5914); + lv_interfacePorts_13_0=rulePort(); state._fsp--; @@ -7365,9 +7365,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "serviceProvisionPoints", - lv_serviceProvisionPoints_13_0, - "SPP"); + "interfacePorts", + lv_interfacePorts_13_0, + "Port"); afterParserOrEnumRuleCall(); @@ -7395,7 +7395,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2975:3: (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_internalPorts_24_0= rulePort ) ) | ( (lv_externalPorts_25_0= ruleExternalPort ) ) | ( (lv_serviceAccessPoints_26_0= ruleSAP ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceImplementations_29_0= ruleServiceImplementation ) ) | ( (lv_bindings_30_0= ruleBinding ) ) | ( (lv_connections_31_0= ruleLayerConnection ) ) )* otherlv_32= '}' )? + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2975:3: (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? int alt75=2; int LA75_0 = input.LA(1); @@ -7404,7 +7404,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } switch (alt75) { case 1 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2975:5: otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_internalPorts_24_0= rulePort ) ) | ( (lv_externalPorts_25_0= ruleExternalPort ) ) | ( (lv_serviceAccessPoints_26_0= ruleSAP ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceImplementations_29_0= ruleServiceImplementation ) ) | ( (lv_bindings_30_0= ruleBinding ) ) | ( (lv_connections_31_0= ruleLayerConnection ) ) )* otherlv_32= '}' + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2975:5: otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' { otherlv_15=(Token)match(input,57,FOLLOW_57_in_ruleActorClass5943); @@ -7612,23 +7612,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3067:4: ( ( (lv_internalPorts_24_0= rulePort ) ) | ( (lv_externalPorts_25_0= ruleExternalPort ) ) | ( (lv_serviceAccessPoints_26_0= ruleSAP ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceImplementations_29_0= ruleServiceImplementation ) ) | ( (lv_bindings_30_0= ruleBinding ) ) | ( (lv_connections_31_0= ruleLayerConnection ) ) )* + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3067:4: ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* loop74: do { int alt74=9; switch ( input.LA(1) ) { - case 47: - case 59: + case 74: { alt74=1; } break; - case 60: + case 70: { alt74=2; } break; - case 61: + case 63: { alt74=3; } @@ -7645,17 +7644,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { alt74=5; } break; - case 63: + case 61: { alt74=6; } break; - case 70: + case 47: + case 59: { alt74=7; } break; - case 74: + case 60: { alt74=8; } @@ -7665,19 +7665,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { switch (alt74) { case 1 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3067:5: ( (lv_internalPorts_24_0= rulePort ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3067:5: ( (lv_connections_24_0= ruleLayerConnection ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3067:5: ( (lv_internalPorts_24_0= rulePort ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3068:1: (lv_internalPorts_24_0= rulePort ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3067:5: ( (lv_connections_24_0= ruleLayerConnection ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3068:1: (lv_connections_24_0= ruleLayerConnection ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3068:1: (lv_internalPorts_24_0= rulePort ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3069:3: lv_internalPorts_24_0= rulePort + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3068:1: (lv_connections_24_0= ruleLayerConnection ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3069:3: lv_connections_24_0= ruleLayerConnection { - newCompositeNode(grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_0_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_0_0()); - pushFollow(FOLLOW_rulePort_in_ruleActorClass6107); - lv_internalPorts_24_0=rulePort(); + pushFollow(FOLLOW_ruleLayerConnection_in_ruleActorClass6107); + lv_connections_24_0=ruleLayerConnection(); state._fsp--; @@ -7687,9 +7687,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "internalPorts", - lv_internalPorts_24_0, - "Port"); + "connections", + lv_connections_24_0, + "LayerConnection"); afterParserOrEnumRuleCall(); @@ -7702,19 +7702,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3086:6: ( (lv_externalPorts_25_0= ruleExternalPort ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3086:6: ( (lv_bindings_25_0= ruleBinding ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3086:6: ( (lv_externalPorts_25_0= ruleExternalPort ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3087:1: (lv_externalPorts_25_0= ruleExternalPort ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3086:6: ( (lv_bindings_25_0= ruleBinding ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3087:1: (lv_bindings_25_0= ruleBinding ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3087:1: (lv_externalPorts_25_0= ruleExternalPort ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3088:3: lv_externalPorts_25_0= ruleExternalPort + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3087:1: (lv_bindings_25_0= ruleBinding ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3088:3: lv_bindings_25_0= ruleBinding { - newCompositeNode(grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_1_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_1_0()); - pushFollow(FOLLOW_ruleExternalPort_in_ruleActorClass6134); - lv_externalPorts_25_0=ruleExternalPort(); + pushFollow(FOLLOW_ruleBinding_in_ruleActorClass6134); + lv_bindings_25_0=ruleBinding(); state._fsp--; @@ -7724,9 +7724,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "externalPorts", - lv_externalPorts_25_0, - "ExternalPort"); + "bindings", + lv_bindings_25_0, + "Binding"); afterParserOrEnumRuleCall(); @@ -7739,19 +7739,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 3 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3105:6: ( (lv_serviceAccessPoints_26_0= ruleSAP ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3105:6: ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3105:6: ( (lv_serviceAccessPoints_26_0= ruleSAP ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3106:1: (lv_serviceAccessPoints_26_0= ruleSAP ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3105:6: ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3106:1: (lv_serviceImplementations_26_0= ruleServiceImplementation ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3106:1: (lv_serviceAccessPoints_26_0= ruleSAP ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3107:3: lv_serviceAccessPoints_26_0= ruleSAP + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3106:1: (lv_serviceImplementations_26_0= ruleServiceImplementation ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3107:3: lv_serviceImplementations_26_0= ruleServiceImplementation { - newCompositeNode(grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_2_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_2_0()); - pushFollow(FOLLOW_ruleSAP_in_ruleActorClass6161); - lv_serviceAccessPoints_26_0=ruleSAP(); + pushFollow(FOLLOW_ruleServiceImplementation_in_ruleActorClass6161); + lv_serviceImplementations_26_0=ruleServiceImplementation(); state._fsp--; @@ -7761,9 +7761,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "serviceAccessPoints", - lv_serviceAccessPoints_26_0, - "SAP"); + "serviceImplementations", + lv_serviceImplementations_26_0, + "ServiceImplementation"); afterParserOrEnumRuleCall(); @@ -7850,19 +7850,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 6 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3162:6: ( (lv_serviceImplementations_29_0= ruleServiceImplementation ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3162:6: ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3162:6: ( (lv_serviceImplementations_29_0= ruleServiceImplementation ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3163:1: (lv_serviceImplementations_29_0= ruleServiceImplementation ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3162:6: ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3163:1: (lv_serviceAccessPoints_29_0= ruleSAP ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3163:1: (lv_serviceImplementations_29_0= ruleServiceImplementation ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3164:3: lv_serviceImplementations_29_0= ruleServiceImplementation + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3163:1: (lv_serviceAccessPoints_29_0= ruleSAP ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3164:3: lv_serviceAccessPoints_29_0= ruleSAP { - newCompositeNode(grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_5_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_5_0()); - pushFollow(FOLLOW_ruleServiceImplementation_in_ruleActorClass6242); - lv_serviceImplementations_29_0=ruleServiceImplementation(); + pushFollow(FOLLOW_ruleSAP_in_ruleActorClass6242); + lv_serviceAccessPoints_29_0=ruleSAP(); state._fsp--; @@ -7872,9 +7872,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "serviceImplementations", - lv_serviceImplementations_29_0, - "ServiceImplementation"); + "serviceAccessPoints", + lv_serviceAccessPoints_29_0, + "SAP"); afterParserOrEnumRuleCall(); @@ -7887,19 +7887,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 7 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3181:6: ( (lv_bindings_30_0= ruleBinding ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3181:6: ( (lv_internalPorts_30_0= rulePort ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3181:6: ( (lv_bindings_30_0= ruleBinding ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3182:1: (lv_bindings_30_0= ruleBinding ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3181:6: ( (lv_internalPorts_30_0= rulePort ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3182:1: (lv_internalPorts_30_0= rulePort ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3182:1: (lv_bindings_30_0= ruleBinding ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3183:3: lv_bindings_30_0= ruleBinding + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3182:1: (lv_internalPorts_30_0= rulePort ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3183:3: lv_internalPorts_30_0= rulePort { - newCompositeNode(grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_6_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_6_0()); - pushFollow(FOLLOW_ruleBinding_in_ruleActorClass6269); - lv_bindings_30_0=ruleBinding(); + pushFollow(FOLLOW_rulePort_in_ruleActorClass6269); + lv_internalPorts_30_0=rulePort(); state._fsp--; @@ -7909,9 +7909,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "bindings", - lv_bindings_30_0, - "Binding"); + "internalPorts", + lv_internalPorts_30_0, + "Port"); afterParserOrEnumRuleCall(); @@ -7924,19 +7924,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 8 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3200:6: ( (lv_connections_31_0= ruleLayerConnection ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3200:6: ( (lv_externalPorts_31_0= ruleExternalPort ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3200:6: ( (lv_connections_31_0= ruleLayerConnection ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3201:1: (lv_connections_31_0= ruleLayerConnection ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3200:6: ( (lv_externalPorts_31_0= ruleExternalPort ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3201:1: (lv_externalPorts_31_0= ruleExternalPort ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3201:1: (lv_connections_31_0= ruleLayerConnection ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3202:3: lv_connections_31_0= ruleLayerConnection + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3201:1: (lv_externalPorts_31_0= ruleExternalPort ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3202:3: lv_externalPorts_31_0= ruleExternalPort { - newCompositeNode(grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_7_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_7_0()); - pushFollow(FOLLOW_ruleLayerConnection_in_ruleActorClass6296); - lv_connections_31_0=ruleLayerConnection(); + pushFollow(FOLLOW_ruleExternalPort_in_ruleActorClass6296); + lv_externalPorts_31_0=ruleExternalPort(); state._fsp--; @@ -7946,9 +7946,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "connections", - lv_connections_31_0, - "LayerConnection"); + "externalPorts", + lv_externalPorts_31_0, + "ExternalPort"); afterParserOrEnumRuleCall(); @@ -7976,7 +7976,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3222:3: (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_structors_37_0= ruleClassStructor ) ) | ( (lv_operations_38_0= ruleStandardOperation ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3222:3: (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? int alt80=2; int LA80_0 = input.LA(1); @@ -7985,7 +7985,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } switch (alt80) { case 1 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3222:5: otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_structors_37_0= ruleClassStructor ) ) | ( (lv_operations_38_0= ruleStandardOperation ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3222:5: otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' { otherlv_33=(Token)match(input,58,FOLLOW_58_in_ruleActorClass6325); @@ -8086,35 +8086,35 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } } while (true); - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3266:3: ( ( (lv_structors_37_0= ruleClassStructor ) ) | ( (lv_operations_38_0= ruleStandardOperation ) ) )* + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3266:3: ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* loop78: do { int alt78=3; int LA78_0 = input.LA(1); - if ( ((LA78_0>=40 && LA78_0<=41)) ) { + if ( ((LA78_0>=36 && LA78_0<=37)) ) { alt78=1; } - else if ( ((LA78_0>=36 && LA78_0<=37)) ) { + else if ( ((LA78_0>=40 && LA78_0<=41)) ) { alt78=2; } switch (alt78) { case 1 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3266:4: ( (lv_structors_37_0= ruleClassStructor ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3266:4: ( (lv_operations_37_0= ruleStandardOperation ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3266:4: ( (lv_structors_37_0= ruleClassStructor ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3267:1: (lv_structors_37_0= ruleClassStructor ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3266:4: ( (lv_operations_37_0= ruleStandardOperation ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3267:1: (lv_operations_37_0= ruleStandardOperation ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3267:1: (lv_structors_37_0= ruleClassStructor ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3268:3: lv_structors_37_0= ruleClassStructor + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3267:1: (lv_operations_37_0= ruleStandardOperation ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3268:3: lv_operations_37_0= ruleStandardOperation { - newCompositeNode(grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_0_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_0_0()); - pushFollow(FOLLOW_ruleClassStructor_in_ruleActorClass6403); - lv_structors_37_0=ruleClassStructor(); + pushFollow(FOLLOW_ruleStandardOperation_in_ruleActorClass6403); + lv_operations_37_0=ruleStandardOperation(); state._fsp--; @@ -8124,9 +8124,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "structors", - lv_structors_37_0, - "ClassStructor"); + "operations", + lv_operations_37_0, + "StandardOperation"); afterParserOrEnumRuleCall(); @@ -8139,19 +8139,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3285:6: ( (lv_operations_38_0= ruleStandardOperation ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3285:6: ( (lv_structors_38_0= ruleClassStructor ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3285:6: ( (lv_operations_38_0= ruleStandardOperation ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3286:1: (lv_operations_38_0= ruleStandardOperation ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3285:6: ( (lv_structors_38_0= ruleClassStructor ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3286:1: (lv_structors_38_0= ruleClassStructor ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3286:1: (lv_operations_38_0= ruleStandardOperation ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3287:3: lv_operations_38_0= ruleStandardOperation + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3286:1: (lv_structors_38_0= ruleClassStructor ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3287:3: lv_structors_38_0= ruleClassStructor { - newCompositeNode(grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_1_0()); + newCompositeNode(grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_1_0()); - pushFollow(FOLLOW_ruleStandardOperation_in_ruleActorClass6430); - lv_operations_38_0=ruleStandardOperation(); + pushFollow(FOLLOW_ruleClassStructor_in_ruleActorClass6430); + lv_structors_38_0=ruleClassStructor(); state._fsp--; @@ -8161,9 +8161,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "operations", - lv_operations_38_0, - "StandardOperation"); + "structors", + lv_structors_38_0, + "ClassStructor"); afterParserOrEnumRuleCall(); @@ -9185,7 +9185,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleLogicalSystem" - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3717:1: ruleLogicalSystem returns [EObject current=null] : (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_subSystems_5_0= ruleSubSystemRef ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_connections_7_0= ruleLayerConnection ) ) )* otherlv_8= '}' ) ; + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3717:1: ruleLogicalSystem returns [EObject current=null] : (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}' ) ; public final EObject ruleLogicalSystem() throws RecognitionException { EObject current = null; @@ -9197,21 +9197,21 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { EObject lv_annotations_4_0 = null; - EObject lv_subSystems_5_0 = null; + EObject lv_connections_5_0 = null; EObject lv_bindings_6_0 = null; - EObject lv_connections_7_0 = null; + EObject lv_subSystems_7_0 = null; enterRule(); try { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3720:28: ( (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_subSystems_5_0= ruleSubSystemRef ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_connections_7_0= ruleLayerConnection ) ) )* otherlv_8= '}' ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3721:1: (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_subSystems_5_0= ruleSubSystemRef ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_connections_7_0= ruleLayerConnection ) ) )* otherlv_8= '}' ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3720:28: ( (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}' ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3721:1: (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}' ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3721:1: (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_subSystems_5_0= ruleSubSystemRef ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_connections_7_0= ruleLayerConnection ) ) )* otherlv_8= '}' ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3721:3: otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_subSystems_5_0= ruleSubSystemRef ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_connections_7_0= ruleLayerConnection ) ) )* otherlv_8= '}' + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3721:1: (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}' ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3721:3: otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}' { otherlv_0=(Token)match(input,64,FOLLOW_64_in_ruleLogicalSystem7435); @@ -9338,12 +9338,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } } while (true); - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3783:3: ( ( (lv_subSystems_5_0= ruleSubSystemRef ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_connections_7_0= ruleLayerConnection ) ) )* + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3783:3: ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* loop87: do { int alt87=4; switch ( input.LA(1) ) { - case 65: + case 74: { alt87=1; } @@ -9353,7 +9353,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { alt87=2; } break; - case 74: + case 65: { alt87=3; } @@ -9363,19 +9363,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { switch (alt87) { case 1 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3783:4: ( (lv_subSystems_5_0= ruleSubSystemRef ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3783:4: ( (lv_connections_5_0= ruleLayerConnection ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3783:4: ( (lv_subSystems_5_0= ruleSubSystemRef ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3784:1: (lv_subSystems_5_0= ruleSubSystemRef ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3783:4: ( (lv_connections_5_0= ruleLayerConnection ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3784:1: (lv_connections_5_0= ruleLayerConnection ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3784:1: (lv_subSystems_5_0= ruleSubSystemRef ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3785:3: lv_subSystems_5_0= ruleSubSystemRef + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3784:1: (lv_connections_5_0= ruleLayerConnection ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3785:3: lv_connections_5_0= ruleLayerConnection { - newCompositeNode(grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_0_0()); + newCompositeNode(grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_0_0()); - pushFollow(FOLLOW_ruleSubSystemRef_in_ruleLogicalSystem7535); - lv_subSystems_5_0=ruleSubSystemRef(); + pushFollow(FOLLOW_ruleLayerConnection_in_ruleLogicalSystem7535); + lv_connections_5_0=ruleLayerConnection(); state._fsp--; @@ -9385,9 +9385,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "subSystems", - lv_subSystems_5_0, - "SubSystemRef"); + "connections", + lv_connections_5_0, + "LayerConnection"); afterParserOrEnumRuleCall(); @@ -9437,19 +9437,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 3 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3821:6: ( (lv_connections_7_0= ruleLayerConnection ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3821:6: ( (lv_subSystems_7_0= ruleSubSystemRef ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3821:6: ( (lv_connections_7_0= ruleLayerConnection ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3822:1: (lv_connections_7_0= ruleLayerConnection ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3821:6: ( (lv_subSystems_7_0= ruleSubSystemRef ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3822:1: (lv_subSystems_7_0= ruleSubSystemRef ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3822:1: (lv_connections_7_0= ruleLayerConnection ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3823:3: lv_connections_7_0= ruleLayerConnection + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3822:1: (lv_subSystems_7_0= ruleSubSystemRef ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3823:3: lv_subSystems_7_0= ruleSubSystemRef { - newCompositeNode(grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_2_0()); + newCompositeNode(grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_2_0()); - pushFollow(FOLLOW_ruleLayerConnection_in_ruleLogicalSystem7589); - lv_connections_7_0=ruleLayerConnection(); + pushFollow(FOLLOW_ruleSubSystemRef_in_ruleLogicalSystem7589); + lv_subSystems_7_0=ruleSubSystemRef(); state._fsp--; @@ -9459,9 +9459,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "connections", - lv_connections_7_0, - "LayerConnection"); + "subSystems", + lv_subSystems_7_0, + "SubSystemRef"); afterParserOrEnumRuleCall(); @@ -9720,7 +9720,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleSubSystemClass" - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3942:1: ruleSubSystemClass returns [EObject current=null] : (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_relayPorts_11_0= rulePort ) ) | ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_actorRefs_13_0= ruleActorRef ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_connections_15_0= ruleLayerConnection ) ) | ( (lv_threads_16_0= ruleLogicalThread ) ) | ( (lv_actorInstanceMappings_17_0= ruleActorInstanceMapping ) ) )* otherlv_18= '}' ) ; + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3942:1: ruleSubSystemClass returns [EObject current=null] : (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}' ) ; public final EObject ruleSubSystemClass() throws RecognitionException { EObject current = null; @@ -9741,29 +9741,29 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { EObject lv_userCode3_10_0 = null; - EObject lv_relayPorts_11_0 = null; + EObject lv_actorInstanceMappings_11_0 = null; - EObject lv_serviceProvisionPoints_12_0 = null; + EObject lv_threads_12_0 = null; - EObject lv_actorRefs_13_0 = null; + EObject lv_connections_13_0 = null; EObject lv_bindings_14_0 = null; - EObject lv_connections_15_0 = null; + EObject lv_actorRefs_15_0 = null; - EObject lv_threads_16_0 = null; + EObject lv_serviceProvisionPoints_16_0 = null; - EObject lv_actorInstanceMappings_17_0 = null; + EObject lv_relayPorts_17_0 = null; enterRule(); try { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3945:28: ( (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_relayPorts_11_0= rulePort ) ) | ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_actorRefs_13_0= ruleActorRef ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_connections_15_0= ruleLayerConnection ) ) | ( (lv_threads_16_0= ruleLogicalThread ) ) | ( (lv_actorInstanceMappings_17_0= ruleActorInstanceMapping ) ) )* otherlv_18= '}' ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3946:1: (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_relayPorts_11_0= rulePort ) ) | ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_actorRefs_13_0= ruleActorRef ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_connections_15_0= ruleLayerConnection ) ) | ( (lv_threads_16_0= ruleLogicalThread ) ) | ( (lv_actorInstanceMappings_17_0= ruleActorInstanceMapping ) ) )* otherlv_18= '}' ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3945:28: ( (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}' ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3946:1: (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}' ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3946:1: (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_relayPorts_11_0= rulePort ) ) | ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_actorRefs_13_0= ruleActorRef ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_connections_15_0= ruleLayerConnection ) ) | ( (lv_threads_16_0= ruleLogicalThread ) ) | ( (lv_actorInstanceMappings_17_0= ruleActorInstanceMapping ) ) )* otherlv_18= '}' ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3946:3: otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_relayPorts_11_0= rulePort ) ) | ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_actorRefs_13_0= ruleActorRef ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_connections_15_0= ruleLayerConnection ) ) | ( (lv_threads_16_0= ruleLogicalThread ) ) | ( (lv_actorInstanceMappings_17_0= ruleActorInstanceMapping ) ) )* otherlv_18= '}' + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3946:1: (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}' ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3946:3: otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}' { otherlv_0=(Token)match(input,66,FOLLOW_66_in_ruleSubSystemClass7850); @@ -10046,25 +10046,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4074:4: ( ( (lv_relayPorts_11_0= rulePort ) ) | ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_actorRefs_13_0= ruleActorRef ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_connections_15_0= ruleLayerConnection ) ) | ( (lv_threads_16_0= ruleLogicalThread ) ) | ( (lv_actorInstanceMappings_17_0= ruleActorInstanceMapping ) ) )* + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4074:4: ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* loop94: do { int alt94=8; switch ( input.LA(1) ) { - case 47: - case 59: + case 68: { alt94=1; } break; - case 62: + case 67: { alt94=2; } break; - case 77: - case 111: - case 125: + case 74: { alt94=3; } @@ -10074,17 +10071,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { alt94=4; } break; - case 74: + case 77: + case 111: + case 125: { alt94=5; } break; - case 67: + case 62: { alt94=6; } break; - case 68: + case 47: + case 59: { alt94=7; } @@ -10094,19 +10094,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { switch (alt94) { case 1 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4074:5: ( (lv_relayPorts_11_0= rulePort ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4074:5: ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4074:5: ( (lv_relayPorts_11_0= rulePort ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4075:1: (lv_relayPorts_11_0= rulePort ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4074:5: ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4075:1: (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4075:1: (lv_relayPorts_11_0= rulePort ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4076:3: lv_relayPorts_11_0= rulePort + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4075:1: (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4076:3: lv_actorInstanceMappings_11_0= ruleActorInstanceMapping { - newCompositeNode(grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_0_0()); + newCompositeNode(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_0_0()); - pushFollow(FOLLOW_rulePort_in_ruleSubSystemClass8058); - lv_relayPorts_11_0=rulePort(); + pushFollow(FOLLOW_ruleActorInstanceMapping_in_ruleSubSystemClass8058); + lv_actorInstanceMappings_11_0=ruleActorInstanceMapping(); state._fsp--; @@ -10116,9 +10116,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "relayPorts", - lv_relayPorts_11_0, - "Port"); + "actorInstanceMappings", + lv_actorInstanceMappings_11_0, + "ActorInstanceMapping"); afterParserOrEnumRuleCall(); @@ -10131,19 +10131,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4093:6: ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4093:6: ( (lv_threads_12_0= ruleLogicalThread ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4093:6: ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4094:1: (lv_serviceProvisionPoints_12_0= ruleSPP ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4093:6: ( (lv_threads_12_0= ruleLogicalThread ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4094:1: (lv_threads_12_0= ruleLogicalThread ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4094:1: (lv_serviceProvisionPoints_12_0= ruleSPP ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4095:3: lv_serviceProvisionPoints_12_0= ruleSPP + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4094:1: (lv_threads_12_0= ruleLogicalThread ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4095:3: lv_threads_12_0= ruleLogicalThread { - newCompositeNode(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_1_0()); + newCompositeNode(grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_1_0()); - pushFollow(FOLLOW_ruleSPP_in_ruleSubSystemClass8085); - lv_serviceProvisionPoints_12_0=ruleSPP(); + pushFollow(FOLLOW_ruleLogicalThread_in_ruleSubSystemClass8085); + lv_threads_12_0=ruleLogicalThread(); state._fsp--; @@ -10153,9 +10153,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "serviceProvisionPoints", - lv_serviceProvisionPoints_12_0, - "SPP"); + "threads", + lv_threads_12_0, + "LogicalThread"); afterParserOrEnumRuleCall(); @@ -10168,19 +10168,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 3 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4112:6: ( (lv_actorRefs_13_0= ruleActorRef ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4112:6: ( (lv_connections_13_0= ruleLayerConnection ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4112:6: ( (lv_actorRefs_13_0= ruleActorRef ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4113:1: (lv_actorRefs_13_0= ruleActorRef ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4112:6: ( (lv_connections_13_0= ruleLayerConnection ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4113:1: (lv_connections_13_0= ruleLayerConnection ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4113:1: (lv_actorRefs_13_0= ruleActorRef ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4114:3: lv_actorRefs_13_0= ruleActorRef + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4113:1: (lv_connections_13_0= ruleLayerConnection ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4114:3: lv_connections_13_0= ruleLayerConnection { - newCompositeNode(grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_2_0()); + newCompositeNode(grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_2_0()); - pushFollow(FOLLOW_ruleActorRef_in_ruleSubSystemClass8112); - lv_actorRefs_13_0=ruleActorRef(); + pushFollow(FOLLOW_ruleLayerConnection_in_ruleSubSystemClass8112); + lv_connections_13_0=ruleLayerConnection(); state._fsp--; @@ -10190,9 +10190,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "actorRefs", - lv_actorRefs_13_0, - "ActorRef"); + "connections", + lv_connections_13_0, + "LayerConnection"); afterParserOrEnumRuleCall(); @@ -10242,19 +10242,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 5 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4150:6: ( (lv_connections_15_0= ruleLayerConnection ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4150:6: ( (lv_actorRefs_15_0= ruleActorRef ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4150:6: ( (lv_connections_15_0= ruleLayerConnection ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4151:1: (lv_connections_15_0= ruleLayerConnection ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4150:6: ( (lv_actorRefs_15_0= ruleActorRef ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4151:1: (lv_actorRefs_15_0= ruleActorRef ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4151:1: (lv_connections_15_0= ruleLayerConnection ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4152:3: lv_connections_15_0= ruleLayerConnection + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4151:1: (lv_actorRefs_15_0= ruleActorRef ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4152:3: lv_actorRefs_15_0= ruleActorRef { - newCompositeNode(grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_4_0()); + newCompositeNode(grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_4_0()); - pushFollow(FOLLOW_ruleLayerConnection_in_ruleSubSystemClass8166); - lv_connections_15_0=ruleLayerConnection(); + pushFollow(FOLLOW_ruleActorRef_in_ruleSubSystemClass8166); + lv_actorRefs_15_0=ruleActorRef(); state._fsp--; @@ -10264,9 +10264,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "connections", - lv_connections_15_0, - "LayerConnection"); + "actorRefs", + lv_actorRefs_15_0, + "ActorRef"); afterParserOrEnumRuleCall(); @@ -10279,19 +10279,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 6 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4169:6: ( (lv_threads_16_0= ruleLogicalThread ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4169:6: ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4169:6: ( (lv_threads_16_0= ruleLogicalThread ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4170:1: (lv_threads_16_0= ruleLogicalThread ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4169:6: ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4170:1: (lv_serviceProvisionPoints_16_0= ruleSPP ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4170:1: (lv_threads_16_0= ruleLogicalThread ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4171:3: lv_threads_16_0= ruleLogicalThread + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4170:1: (lv_serviceProvisionPoints_16_0= ruleSPP ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4171:3: lv_serviceProvisionPoints_16_0= ruleSPP { - newCompositeNode(grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_5_0()); + newCompositeNode(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_5_0()); - pushFollow(FOLLOW_ruleLogicalThread_in_ruleSubSystemClass8193); - lv_threads_16_0=ruleLogicalThread(); + pushFollow(FOLLOW_ruleSPP_in_ruleSubSystemClass8193); + lv_serviceProvisionPoints_16_0=ruleSPP(); state._fsp--; @@ -10301,9 +10301,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "threads", - lv_threads_16_0, - "LogicalThread"); + "serviceProvisionPoints", + lv_serviceProvisionPoints_16_0, + "SPP"); afterParserOrEnumRuleCall(); @@ -10316,19 +10316,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } break; case 7 : - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4188:6: ( (lv_actorInstanceMappings_17_0= ruleActorInstanceMapping ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4188:6: ( (lv_relayPorts_17_0= rulePort ) ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4188:6: ( (lv_actorInstanceMappings_17_0= ruleActorInstanceMapping ) ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4189:1: (lv_actorInstanceMappings_17_0= ruleActorInstanceMapping ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4188:6: ( (lv_relayPorts_17_0= rulePort ) ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4189:1: (lv_relayPorts_17_0= rulePort ) { - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4189:1: (lv_actorInstanceMappings_17_0= ruleActorInstanceMapping ) - // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4190:3: lv_actorInstanceMappings_17_0= ruleActorInstanceMapping + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4189:1: (lv_relayPorts_17_0= rulePort ) + // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4190:3: lv_relayPorts_17_0= rulePort { - newCompositeNode(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_6_0()); + newCompositeNode(grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_6_0()); - pushFollow(FOLLOW_ruleActorInstanceMapping_in_ruleSubSystemClass8220); - lv_actorInstanceMappings_17_0=ruleActorInstanceMapping(); + pushFollow(FOLLOW_rulePort_in_ruleSubSystemClass8220); + lv_relayPorts_17_0=rulePort(); state._fsp--; @@ -10338,9 +10338,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { } add( current, - "actorInstanceMappings", - lv_actorInstanceMappings_17_0, - "ActorInstanceMapping"); + "relayPorts", + lv_relayPorts_17_0, + "Port"); afterParserOrEnumRuleCall(); @@ -23981,9 +23981,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_ruleDetailCode_in_ruleDataClass2328 = new BitSet(new long[]{0x0000033300008000L}); public static final BitSet FOLLOW_32_in_ruleDataClass2343 = new BitSet(new long[]{0x0000000000004000L}); public static final BitSet FOLLOW_ruleDetailCode_in_ruleDataClass2364 = new BitSet(new long[]{0x0000033200008000L}); - public static final BitSet FOLLOW_ruleAttribute_in_ruleDataClass2388 = new BitSet(new long[]{0x0000033200008000L}); + public static final BitSet FOLLOW_ruleStandardOperation_in_ruleDataClass2388 = new BitSet(new long[]{0x0000033200008000L}); public static final BitSet FOLLOW_ruleClassStructor_in_ruleDataClass2415 = new BitSet(new long[]{0x0000033200008000L}); - public static final BitSet FOLLOW_ruleStandardOperation_in_ruleDataClass2442 = new BitSet(new long[]{0x0000033200008000L}); + public static final BitSet FOLLOW_ruleAttribute_in_ruleDataClass2442 = new BitSet(new long[]{0x0000033200008000L}); public static final BitSet FOLLOW_15_in_ruleDataClass2456 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute2492 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleAttribute2502 = new BitSet(new long[]{0x0000000000000002L}); @@ -24095,12 +24095,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_ruleDocumentation_in_ruleMessage4750 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rulePortClass_in_entryRulePortClass4787 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRulePortClass4797 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_14_in_rulePortClass4843 = new BitSet(new long[]{0x0030002200008000L}); + public static final BitSet FOLLOW_14_in_rulePortClass4843 = new BitSet(new long[]{0x0030033200008000L}); public static final BitSet FOLLOW_52_in_rulePortClass4856 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_ruleDetailCode_in_rulePortClass4877 = new BitSet(new long[]{0x0020002200008000L}); - public static final BitSet FOLLOW_ruleAttribute_in_rulePortClass4901 = new BitSet(new long[]{0x0020002200008000L}); - public static final BitSet FOLLOW_rulePortOperation_in_rulePortClass4928 = new BitSet(new long[]{0x0020002200008000L}); - public static final BitSet FOLLOW_ruleMessageHandler_in_rulePortClass4955 = new BitSet(new long[]{0x0020002200008000L}); + public static final BitSet FOLLOW_ruleDetailCode_in_rulePortClass4877 = new BitSet(new long[]{0x0020033200008000L}); + public static final BitSet FOLLOW_ruleMessageHandler_in_rulePortClass4901 = new BitSet(new long[]{0x0020033200008000L}); + public static final BitSet FOLLOW_rulePortOperation_in_rulePortClass4928 = new BitSet(new long[]{0x0020033200008000L}); + public static final BitSet FOLLOW_ruleAttribute_in_rulePortClass4955 = new BitSet(new long[]{0x0020033200008000L}); public static final BitSet FOLLOW_15_in_rulePortClass4969 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleMessageHandler_in_entryRuleMessageHandler5005 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleMessageHandler5015 = new BitSet(new long[]{0x0000000000000002L}); @@ -24134,33 +24134,33 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_ruleAnnotation_in_ruleActorClass5839 = new BitSet(new long[]{0x0700000000008000L,0x0000100000000000L}); public static final BitSet FOLLOW_56_in_ruleActorClass5853 = new BitSet(new long[]{0x0000000000004000L}); public static final BitSet FOLLOW_14_in_ruleActorClass5865 = new BitSet(new long[]{0x4800800000008000L}); - public static final BitSet FOLLOW_rulePort_in_ruleActorClass5887 = new BitSet(new long[]{0x4800800000008000L}); - public static final BitSet FOLLOW_ruleSPP_in_ruleActorClass5914 = new BitSet(new long[]{0x4800800000008000L}); + public static final BitSet FOLLOW_ruleSPP_in_ruleActorClass5887 = new BitSet(new long[]{0x4800800000008000L}); + public static final BitSet FOLLOW_rulePort_in_ruleActorClass5914 = new BitSet(new long[]{0x4800800000008000L}); public static final BitSet FOLLOW_15_in_ruleActorClass5928 = new BitSet(new long[]{0x0600000000008000L}); public static final BitSet FOLLOW_57_in_ruleActorClass5943 = new BitSet(new long[]{0x0000000400004000L}); public static final BitSet FOLLOW_ruleDocumentation_in_ruleActorClass5964 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_14_in_ruleActorClass5977 = new BitSet(new long[]{0xB8008003C0008000L,0x2000800000002440L}); + public static final BitSet FOLLOW_14_in_ruleActorClass5977 = new BitSet(new long[]{0xF8008333C0008000L,0x2000800000002440L}); public static final BitSet FOLLOW_30_in_ruleActorClass5990 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass6011 = new BitSet(new long[]{0xB800800380008000L,0x2000800000002440L}); + public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass6011 = new BitSet(new long[]{0xF800833380008000L,0x2000800000002440L}); public static final BitSet FOLLOW_31_in_ruleActorClass6026 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass6047 = new BitSet(new long[]{0xB800800300008000L,0x2000800000002440L}); + public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass6047 = new BitSet(new long[]{0xF800833300008000L,0x2000800000002440L}); public static final BitSet FOLLOW_32_in_ruleActorClass6062 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass6083 = new BitSet(new long[]{0xB800800200008000L,0x2000800000002440L}); - public static final BitSet FOLLOW_rulePort_in_ruleActorClass6107 = new BitSet(new long[]{0xB800800200008000L,0x2000800000002440L}); - public static final BitSet FOLLOW_ruleExternalPort_in_ruleActorClass6134 = new BitSet(new long[]{0xB800800200008000L,0x2000800000002440L}); - public static final BitSet FOLLOW_ruleSAP_in_ruleActorClass6161 = new BitSet(new long[]{0xB800800200008000L,0x2000800000002440L}); - public static final BitSet FOLLOW_ruleAttribute_in_ruleActorClass6188 = new BitSet(new long[]{0xB800800200008000L,0x2000800000002440L}); - public static final BitSet FOLLOW_ruleActorRef_in_ruleActorClass6215 = new BitSet(new long[]{0xB800800200008000L,0x2000800000002440L}); - public static final BitSet FOLLOW_ruleServiceImplementation_in_ruleActorClass6242 = new BitSet(new long[]{0xB800800200008000L,0x2000800000002440L}); - public static final BitSet FOLLOW_ruleBinding_in_ruleActorClass6269 = new BitSet(new long[]{0xB800800200008000L,0x2000800000002440L}); - public static final BitSet FOLLOW_ruleLayerConnection_in_ruleActorClass6296 = new BitSet(new long[]{0xB800800200008000L,0x2000800000002440L}); + public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass6083 = new BitSet(new long[]{0xF800833200008000L,0x2000800000002440L}); + public static final BitSet FOLLOW_ruleLayerConnection_in_ruleActorClass6107 = new BitSet(new long[]{0xF800833200008000L,0x2000800000002440L}); + public static final BitSet FOLLOW_ruleBinding_in_ruleActorClass6134 = new BitSet(new long[]{0xF800833200008000L,0x2000800000002440L}); + public static final BitSet FOLLOW_ruleServiceImplementation_in_ruleActorClass6161 = new BitSet(new long[]{0xF800833200008000L,0x2000800000002440L}); + public static final BitSet FOLLOW_ruleAttribute_in_ruleActorClass6188 = new BitSet(new long[]{0xF800833200008000L,0x2000800000002440L}); + public static final BitSet FOLLOW_ruleActorRef_in_ruleActorClass6215 = new BitSet(new long[]{0xF800833200008000L,0x2000800000002440L}); + public static final BitSet FOLLOW_ruleSAP_in_ruleActorClass6242 = new BitSet(new long[]{0xF800833200008000L,0x2000800000002440L}); + public static final BitSet FOLLOW_rulePort_in_ruleActorClass6269 = new BitSet(new long[]{0xF800833200008000L,0x2000800000002440L}); + public static final BitSet FOLLOW_ruleExternalPort_in_ruleActorClass6296 = new BitSet(new long[]{0xF800833200008000L,0x2000800000002440L}); public static final BitSet FOLLOW_15_in_ruleActorClass6310 = new BitSet(new long[]{0x0400000000008000L}); public static final BitSet FOLLOW_58_in_ruleActorClass6325 = new BitSet(new long[]{0x0000000400004000L}); public static final BitSet FOLLOW_ruleDocumentation_in_ruleActorClass6346 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_14_in_ruleActorClass6359 = new BitSet(new long[]{0x0000033200008000L,0x0000100000010000L}); - public static final BitSet FOLLOW_ruleAnnotation_in_ruleActorClass6380 = new BitSet(new long[]{0x0000033200008000L,0x0000100000010000L}); - public static final BitSet FOLLOW_ruleClassStructor_in_ruleActorClass6403 = new BitSet(new long[]{0x0000033200008000L,0x0000000000010000L}); - public static final BitSet FOLLOW_ruleStandardOperation_in_ruleActorClass6430 = new BitSet(new long[]{0x0000033200008000L,0x0000000000010000L}); + public static final BitSet FOLLOW_14_in_ruleActorClass6359 = new BitSet(new long[]{0x0000033000008000L,0x0000100000010000L}); + public static final BitSet FOLLOW_ruleAnnotation_in_ruleActorClass6380 = new BitSet(new long[]{0x0000033000008000L,0x0000100000010000L}); + public static final BitSet FOLLOW_ruleStandardOperation_in_ruleActorClass6403 = new BitSet(new long[]{0x0000033000008000L,0x0000000000010000L}); + public static final BitSet FOLLOW_ruleClassStructor_in_ruleActorClass6430 = new BitSet(new long[]{0x0000033000008000L,0x0000000000010000L}); public static final BitSet FOLLOW_ruleStateMachine_in_ruleActorClass6453 = new BitSet(new long[]{0x0000000000008000L}); public static final BitSet FOLLOW_15_in_ruleActorClass6466 = new BitSet(new long[]{0x0000000000008000L}); public static final BitSet FOLLOW_15_in_ruleActorClass6480 = new BitSet(new long[]{0x0000000000000002L}); @@ -24205,11 +24205,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_64_in_ruleLogicalSystem7435 = new BitSet(new long[]{0x0000000000000010L}); public static final BitSet FOLLOW_RULE_ID_in_ruleLogicalSystem7452 = new BitSet(new long[]{0x0000000400004000L}); public static final BitSet FOLLOW_ruleDocumentation_in_ruleLogicalSystem7478 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_14_in_ruleLogicalSystem7491 = new BitSet(new long[]{0xB800800200008000L,0x2000900000002442L}); - public static final BitSet FOLLOW_ruleAnnotation_in_ruleLogicalSystem7512 = new BitSet(new long[]{0xB800800200008000L,0x2000900000002442L}); - public static final BitSet FOLLOW_ruleSubSystemRef_in_ruleLogicalSystem7535 = new BitSet(new long[]{0xB800800200008000L,0x2000800000002442L}); - public static final BitSet FOLLOW_ruleBinding_in_ruleLogicalSystem7562 = new BitSet(new long[]{0xB800800200008000L,0x2000800000002442L}); - public static final BitSet FOLLOW_ruleLayerConnection_in_ruleLogicalSystem7589 = new BitSet(new long[]{0xB800800200008000L,0x2000800000002442L}); + public static final BitSet FOLLOW_14_in_ruleLogicalSystem7491 = new BitSet(new long[]{0x0000000000008000L,0x0000100000000442L}); + public static final BitSet FOLLOW_ruleAnnotation_in_ruleLogicalSystem7512 = new BitSet(new long[]{0x0000000000008000L,0x0000100000000442L}); + public static final BitSet FOLLOW_ruleLayerConnection_in_ruleLogicalSystem7535 = new BitSet(new long[]{0x0000000000008000L,0x0000000000000442L}); + public static final BitSet FOLLOW_ruleBinding_in_ruleLogicalSystem7562 = new BitSet(new long[]{0x0000000000008000L,0x0000000000000442L}); + public static final BitSet FOLLOW_ruleSubSystemRef_in_ruleLogicalSystem7589 = new BitSet(new long[]{0x0000000000008000L,0x0000000000000442L}); public static final BitSet FOLLOW_15_in_ruleLogicalSystem7603 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleSubSystemRef_in_entryRuleSubSystemRef7641 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleSubSystemRef7651 = new BitSet(new long[]{0x0000000000000002L}); @@ -24223,21 +24223,21 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_66_in_ruleSubSystemClass7850 = new BitSet(new long[]{0x0000000000000010L}); public static final BitSet FOLLOW_RULE_ID_in_ruleSubSystemClass7867 = new BitSet(new long[]{0x0000000400004000L}); public static final BitSet FOLLOW_ruleDocumentation_in_ruleSubSystemClass7893 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_14_in_ruleSubSystemClass7906 = new BitSet(new long[]{0xF8008003C0008000L,0x2000900000002458L}); - public static final BitSet FOLLOW_ruleAnnotation_in_ruleSubSystemClass7927 = new BitSet(new long[]{0xF8008003C0008000L,0x2000900000002458L}); + public static final BitSet FOLLOW_14_in_ruleSubSystemClass7906 = new BitSet(new long[]{0x48008001C0008000L,0x2000900000002458L}); + public static final BitSet FOLLOW_ruleAnnotation_in_ruleSubSystemClass7927 = new BitSet(new long[]{0x48008001C0008000L,0x2000900000002458L}); public static final BitSet FOLLOW_30_in_ruleSubSystemClass7941 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_ruleDetailCode_in_ruleSubSystemClass7962 = new BitSet(new long[]{0xF800800380008000L,0x2000800000002458L}); + public static final BitSet FOLLOW_ruleDetailCode_in_ruleSubSystemClass7962 = new BitSet(new long[]{0x4800800180008000L,0x2000800000002458L}); public static final BitSet FOLLOW_31_in_ruleSubSystemClass7977 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_ruleDetailCode_in_ruleSubSystemClass7998 = new BitSet(new long[]{0xF800800300008000L,0x2000800000002458L}); + public static final BitSet FOLLOW_ruleDetailCode_in_ruleSubSystemClass7998 = new BitSet(new long[]{0x4800800100008000L,0x2000800000002458L}); public static final BitSet FOLLOW_32_in_ruleSubSystemClass8013 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_ruleDetailCode_in_ruleSubSystemClass8034 = new BitSet(new long[]{0xF800800200008000L,0x2000800000002458L}); - public static final BitSet FOLLOW_rulePort_in_ruleSubSystemClass8058 = new BitSet(new long[]{0xF800800200008000L,0x2000800000002458L}); - public static final BitSet FOLLOW_ruleSPP_in_ruleSubSystemClass8085 = new BitSet(new long[]{0xF800800200008000L,0x2000800000002458L}); - public static final BitSet FOLLOW_ruleActorRef_in_ruleSubSystemClass8112 = new BitSet(new long[]{0xF800800200008000L,0x2000800000002458L}); - public static final BitSet FOLLOW_ruleBinding_in_ruleSubSystemClass8139 = new BitSet(new long[]{0xF800800200008000L,0x2000800000002458L}); - public static final BitSet FOLLOW_ruleLayerConnection_in_ruleSubSystemClass8166 = new BitSet(new long[]{0xF800800200008000L,0x2000800000002458L}); - public static final BitSet FOLLOW_ruleLogicalThread_in_ruleSubSystemClass8193 = new BitSet(new long[]{0xF800800200008000L,0x2000800000002458L}); - public static final BitSet FOLLOW_ruleActorInstanceMapping_in_ruleSubSystemClass8220 = new BitSet(new long[]{0xF800800200008000L,0x2000800000002458L}); + public static final BitSet FOLLOW_ruleDetailCode_in_ruleSubSystemClass8034 = new BitSet(new long[]{0x4800800000008000L,0x2000800000002458L}); + public static final BitSet FOLLOW_ruleActorInstanceMapping_in_ruleSubSystemClass8058 = new BitSet(new long[]{0x4800800000008000L,0x2000800000002458L}); + public static final BitSet FOLLOW_ruleLogicalThread_in_ruleSubSystemClass8085 = new BitSet(new long[]{0x4800800000008000L,0x2000800000002458L}); + public static final BitSet FOLLOW_ruleLayerConnection_in_ruleSubSystemClass8112 = new BitSet(new long[]{0x4800800000008000L,0x2000800000002458L}); + public static final BitSet FOLLOW_ruleBinding_in_ruleSubSystemClass8139 = new BitSet(new long[]{0x4800800000008000L,0x2000800000002458L}); + public static final BitSet FOLLOW_ruleActorRef_in_ruleSubSystemClass8166 = new BitSet(new long[]{0x4800800000008000L,0x2000800000002458L}); + public static final BitSet FOLLOW_ruleSPP_in_ruleSubSystemClass8193 = new BitSet(new long[]{0x4800800000008000L,0x2000800000002458L}); + public static final BitSet FOLLOW_rulePort_in_ruleSubSystemClass8220 = new BitSet(new long[]{0x4800800000008000L,0x2000800000002458L}); public static final BitSet FOLLOW_15_in_ruleSubSystemClass8234 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleLogicalThread_in_entryRuleLogicalThread8270 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleLogicalThread8280 = new BitSet(new long[]{0x0000000000000002L}); @@ -24249,8 +24249,8 @@ public class InternalRoomParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_ruleRefPath_in_ruleActorInstanceMapping8443 = new BitSet(new long[]{0x0000000000080000L}); public static final BitSet FOLLOW_19_in_ruleActorInstanceMapping8455 = new BitSet(new long[]{0x0000000000000010L}); public static final BitSet FOLLOW_RULE_ID_in_ruleActorInstanceMapping8475 = new BitSet(new long[]{0x0000000000004002L}); - public static final BitSet FOLLOW_14_in_ruleActorInstanceMapping8488 = new BitSet(new long[]{0xF800800200008000L,0x2000800000002458L}); - public static final BitSet FOLLOW_ruleActorInstanceMapping_in_ruleActorInstanceMapping8509 = new BitSet(new long[]{0xF800800200008000L,0x2000800000002458L}); + public static final BitSet FOLLOW_14_in_ruleActorInstanceMapping8488 = new BitSet(new long[]{0x0000000000008000L,0x0000000000000010L}); + public static final BitSet FOLLOW_ruleActorInstanceMapping_in_ruleActorInstanceMapping8509 = new BitSet(new long[]{0x0000000000008000L,0x0000000000000010L}); public static final BitSet FOLLOW_15_in_ruleActorInstanceMapping8522 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleRefPath_in_entryRuleRefPath8560 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleRefPath8570 = new BitSet(new long[]{0x0000000000000002L}); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorClass.java index b9abc7578..ad4dfd457 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorClass.java @@ -57,15 +57,15 @@ import org.eclipse.etrice.core.fsm.fSM.ModelComponent; * <ul> * <li>{@link org.eclipse.etrice.core.room.ActorClass#getInterfacePorts <em>Interface Ports</em>}</li> * <li>{@link org.eclipse.etrice.core.room.ActorClass#getStructureDocu <em>Structure Docu</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.ActorClass#getServiceImplementations <em>Service Implementations</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.ActorClass#getAttributes <em>Attributes</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.ActorClass#getServiceAccessPoints <em>Service Access Points</em>}</li> * <li>{@link org.eclipse.etrice.core.room.ActorClass#getInternalPorts <em>Internal Ports</em>}</li> * <li>{@link org.eclipse.etrice.core.room.ActorClass#getExternalPorts <em>External Ports</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.ActorClass#getServiceAccessPoints <em>Service Access Points</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.ActorClass#getAttributes <em>Attributes</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.ActorClass#getServiceImplementations <em>Service Implementations</em>}</li> * <li>{@link org.eclipse.etrice.core.room.ActorClass#getBehaviorDocu <em>Behavior Docu</em>}</li> * <li>{@link org.eclipse.etrice.core.room.ActorClass#getBehaviorAnnotations <em>Behavior Annotations</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.ActorClass#getStructors <em>Structors</em>}</li> * <li>{@link org.eclipse.etrice.core.room.ActorClass#getOperations <em>Operations</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.ActorClass#getStructors <em>Structors</em>}</li> * </ul> * </p> * @@ -118,36 +118,36 @@ public interface ActorClass extends ActorContainerClass, ModelComponent void setStructureDocu(Documentation value); /** - * Returns the value of the '<em><b>Internal Ports</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.Port}. + * Returns the value of the '<em><b>Service Implementations</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.ServiceImplementation}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> - * <br>This is a list containing all ports of the actor structure (internal end ports). + * <br>This is a list of all service implementations. * * <!-- end-model-doc --> - * @return the value of the '<em>Internal Ports</em>' containment reference list. - * @see org.eclipse.etrice.core.room.RoomPackage#getActorClass_InternalPorts() + * @return the value of the '<em>Service Implementations</em>' containment reference list. + * @see org.eclipse.etrice.core.room.RoomPackage#getActorClass_ServiceImplementations() * @model containment="true" * @generated */ - EList<Port> getInternalPorts(); + EList<ServiceImplementation> getServiceImplementations(); /** - * Returns the value of the '<em><b>External Ports</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.ExternalPort}. + * Returns the value of the '<em><b>Attributes</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.Attribute}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> - * <br>This is a list containing all ports of the actor interface that are end ports. + * <br>This is a list of all actor class private attributes. * * <!-- end-model-doc --> - * @return the value of the '<em>External Ports</em>' containment reference list. - * @see org.eclipse.etrice.core.room.RoomPackage#getActorClass_ExternalPorts() + * @return the value of the '<em>Attributes</em>' containment reference list. + * @see org.eclipse.etrice.core.room.RoomPackage#getActorClass_Attributes() * @model containment="true" * @generated */ - EList<ExternalPort> getExternalPorts(); + EList<Attribute> getAttributes(); /** * Returns the value of the '<em><b>Service Access Points</b></em>' containment reference list. @@ -166,36 +166,36 @@ public interface ActorClass extends ActorContainerClass, ModelComponent EList<SAP> getServiceAccessPoints(); /** - * Returns the value of the '<em><b>Attributes</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.Attribute}. + * Returns the value of the '<em><b>Internal Ports</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.Port}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> - * <br>This is a list of all actor class private attributes. + * <br>This is a list containing all ports of the actor structure (internal end ports). * * <!-- end-model-doc --> - * @return the value of the '<em>Attributes</em>' containment reference list. - * @see org.eclipse.etrice.core.room.RoomPackage#getActorClass_Attributes() + * @return the value of the '<em>Internal Ports</em>' containment reference list. + * @see org.eclipse.etrice.core.room.RoomPackage#getActorClass_InternalPorts() * @model containment="true" * @generated */ - EList<Attribute> getAttributes(); + EList<Port> getInternalPorts(); /** - * Returns the value of the '<em><b>Service Implementations</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.ServiceImplementation}. + * Returns the value of the '<em><b>External Ports</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.ExternalPort}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> - * <br>This is a list of all service implementations. + * <br>This is a list containing all ports of the actor interface that are end ports. * * <!-- end-model-doc --> - * @return the value of the '<em>Service Implementations</em>' containment reference list. - * @see org.eclipse.etrice.core.room.RoomPackage#getActorClass_ServiceImplementations() + * @return the value of the '<em>External Ports</em>' containment reference list. + * @see org.eclipse.etrice.core.room.RoomPackage#getActorClass_ExternalPorts() * @model containment="true" * @generated */ - EList<ServiceImplementation> getServiceImplementations(); + EList<ExternalPort> getExternalPorts(); /** * Returns the value of the '<em><b>Behavior Docu</b></em>' containment reference. @@ -240,22 +240,6 @@ public interface ActorClass extends ActorContainerClass, ModelComponent EList<Annotation> getBehaviorAnnotations(); /** - * Returns the value of the '<em><b>Structors</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.ClassStructor}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Structors</em>' containment reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Structors</em>' containment reference list. - * @see org.eclipse.etrice.core.room.RoomPackage#getActorClass_Structors() - * @model containment="true" - * @generated - */ - EList<ClassStructor> getStructors(); - - /** * Returns the value of the '<em><b>Operations</b></em>' containment reference list. * The list contents are of type {@link org.eclipse.etrice.core.room.StandardOperation}. * <!-- begin-user-doc --> @@ -272,6 +256,22 @@ public interface ActorClass extends ActorContainerClass, ModelComponent EList<StandardOperation> getOperations(); /** + * Returns the value of the '<em><b>Structors</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.ClassStructor}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Structors</em>' containment reference list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Structors</em>' containment reference list. + * @see org.eclipse.etrice.core.room.RoomPackage#getActorClass_Structors() + * @model containment="true" + * @generated + */ + EList<ClassStructor> getStructors(); + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @model kind="operation" diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataClass.java index afe1fad01..33964c127 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataClass.java @@ -39,9 +39,9 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode; * <li>{@link org.eclipse.etrice.core.room.DataClass#getUserCode1 <em>User Code1</em>}</li> * <li>{@link org.eclipse.etrice.core.room.DataClass#getUserCode2 <em>User Code2</em>}</li> * <li>{@link org.eclipse.etrice.core.room.DataClass#getUserCode3 <em>User Code3</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.DataClass#getAttributes <em>Attributes</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.DataClass#getStructors <em>Structors</em>}</li> * <li>{@link org.eclipse.etrice.core.room.DataClass#getOperations <em>Operations</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.DataClass#getStructors <em>Structors</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.DataClass#getAttributes <em>Attributes</em>}</li> * </ul> * </p> * @@ -172,20 +172,20 @@ public interface DataClass extends ComplexType void setUserCode3(DetailCode value); /** - * Returns the value of the '<em><b>Attributes</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.Attribute}. + * Returns the value of the '<em><b>Operations</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.StandardOperation}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> - * <br>Attributes are the data members of the data class. + * <br>Operations are the methods of the data class. * * <!-- end-model-doc --> - * @return the value of the '<em>Attributes</em>' containment reference list. - * @see org.eclipse.etrice.core.room.RoomPackage#getDataClass_Attributes() + * @return the value of the '<em>Operations</em>' containment reference list. + * @see org.eclipse.etrice.core.room.RoomPackage#getDataClass_Operations() * @model containment="true" * @generated */ - EList<Attribute> getAttributes(); + EList<StandardOperation> getOperations(); /** * Returns the value of the '<em><b>Structors</b></em>' containment reference list. @@ -204,19 +204,19 @@ public interface DataClass extends ComplexType EList<ClassStructor> getStructors(); /** - * Returns the value of the '<em><b>Operations</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.StandardOperation}. + * Returns the value of the '<em><b>Attributes</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.Attribute}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> - * <br>Operations are the methods of the data class. + * <br>Attributes are the data members of the data class. * * <!-- end-model-doc --> - * @return the value of the '<em>Operations</em>' containment reference list. - * @see org.eclipse.etrice.core.room.RoomPackage#getDataClass_Operations() + * @return the value of the '<em>Attributes</em>' containment reference list. + * @see org.eclipse.etrice.core.room.RoomPackage#getDataClass_Attributes() * @model containment="true" * @generated */ - EList<StandardOperation> getOperations(); + EList<Attribute> getAttributes(); } // DataClass diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortClass.java index 59b430413..d0db65b77 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortClass.java @@ -28,9 +28,9 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode; * The following features are supported: * <ul> * <li>{@link org.eclipse.etrice.core.room.PortClass#getUserCode <em>User Code</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.PortClass#getAttributes <em>Attributes</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.PortClass#getOperations <em>Operations</em>}</li> * <li>{@link org.eclipse.etrice.core.room.PortClass#getMsgHandlers <em>Msg Handlers</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.PortClass#getOperations <em>Operations</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.PortClass#getAttributes <em>Attributes</em>}</li> * </ul> * </p> * @@ -67,20 +67,20 @@ public interface PortClass extends EObject void setUserCode(DetailCode value); /** - * Returns the value of the '<em><b>Attributes</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.Attribute}. + * Returns the value of the '<em><b>Msg Handlers</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.MessageHandler}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> - * <br>This is a list of attributes of this nested class. + * <br>This is a list of message handlers. * * <!-- end-model-doc --> - * @return the value of the '<em>Attributes</em>' containment reference list. - * @see org.eclipse.etrice.core.room.RoomPackage#getPortClass_Attributes() + * @return the value of the '<em>Msg Handlers</em>' containment reference list. + * @see org.eclipse.etrice.core.room.RoomPackage#getPortClass_MsgHandlers() * @model containment="true" * @generated */ - EList<Attribute> getAttributes(); + EList<MessageHandler> getMsgHandlers(); /** * Returns the value of the '<em><b>Operations</b></em>' containment reference list. @@ -99,19 +99,19 @@ public interface PortClass extends EObject EList<PortOperation> getOperations(); /** - * Returns the value of the '<em><b>Msg Handlers</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.MessageHandler}. + * Returns the value of the '<em><b>Attributes</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.Attribute}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> - * <br>This is a list of message handlers. + * <br>This is a list of attributes of this nested class. * * <!-- end-model-doc --> - * @return the value of the '<em>Msg Handlers</em>' containment reference list. - * @see org.eclipse.etrice.core.room.RoomPackage#getPortClass_MsgHandlers() + * @return the value of the '<em>Attributes</em>' containment reference list. + * @see org.eclipse.etrice.core.room.RoomPackage#getPortClass_Attributes() * @model containment="true" * @generated */ - EList<MessageHandler> getMsgHandlers(); + EList<Attribute> getAttributes(); } // PortClass diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomPackage.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomPackage.java index 276d65ec9..43f6472c8 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomPackage.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomPackage.java @@ -261,22 +261,22 @@ public interface RoomPackage extends EPackage int STRUCTURE_CLASS__ANNOTATIONS = ROOM_CLASS_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Bindings</b></em>' containment reference list. + * The feature id for the '<em><b>Connections</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int STRUCTURE_CLASS__BINDINGS = ROOM_CLASS_FEATURE_COUNT + 1; + int STRUCTURE_CLASS__CONNECTIONS = ROOM_CLASS_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Connections</b></em>' containment reference list. + * The feature id for the '<em><b>Bindings</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int STRUCTURE_CLASS__CONNECTIONS = ROOM_CLASS_FEATURE_COUNT + 2; + int STRUCTURE_CLASS__BINDINGS = ROOM_CLASS_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>Structure Class</em>' class. @@ -325,22 +325,22 @@ public interface RoomPackage extends EPackage int ACTOR_CONTAINER_CLASS__ANNOTATIONS = STRUCTURE_CLASS__ANNOTATIONS; /** - * The feature id for the '<em><b>Bindings</b></em>' containment reference list. + * The feature id for the '<em><b>Connections</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ACTOR_CONTAINER_CLASS__BINDINGS = STRUCTURE_CLASS__BINDINGS; + int ACTOR_CONTAINER_CLASS__CONNECTIONS = STRUCTURE_CLASS__CONNECTIONS; /** - * The feature id for the '<em><b>Connections</b></em>' containment reference list. + * The feature id for the '<em><b>Bindings</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ACTOR_CONTAINER_CLASS__CONNECTIONS = STRUCTURE_CLASS__CONNECTIONS; + int ACTOR_CONTAINER_CLASS__BINDINGS = STRUCTURE_CLASS__BINDINGS; /** * The feature id for the '<em><b>Service Provision Points</b></em>' containment reference list. @@ -838,13 +838,13 @@ public interface RoomPackage extends EPackage int DATA_CLASS__USER_CODE3 = COMPLEX_TYPE_FEATURE_COUNT + 4; /** - * The feature id for the '<em><b>Attributes</b></em>' containment reference list. + * The feature id for the '<em><b>Operations</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DATA_CLASS__ATTRIBUTES = COMPLEX_TYPE_FEATURE_COUNT + 5; + int DATA_CLASS__OPERATIONS = COMPLEX_TYPE_FEATURE_COUNT + 5; /** * The feature id for the '<em><b>Structors</b></em>' containment reference list. @@ -856,13 +856,13 @@ public interface RoomPackage extends EPackage int DATA_CLASS__STRUCTORS = COMPLEX_TYPE_FEATURE_COUNT + 6; /** - * The feature id for the '<em><b>Operations</b></em>' containment reference list. + * The feature id for the '<em><b>Attributes</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DATA_CLASS__OPERATIONS = COMPLEX_TYPE_FEATURE_COUNT + 7; + int DATA_CLASS__ATTRIBUTES = COMPLEX_TYPE_FEATURE_COUNT + 7; /** * The number of structural features of the '<em>Data Class</em>' class. @@ -1533,13 +1533,13 @@ public interface RoomPackage extends EPackage int PORT_CLASS__USER_CODE = 0; /** - * The feature id for the '<em><b>Attributes</b></em>' containment reference list. + * The feature id for the '<em><b>Msg Handlers</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int PORT_CLASS__ATTRIBUTES = 1; + int PORT_CLASS__MSG_HANDLERS = 1; /** * The feature id for the '<em><b>Operations</b></em>' containment reference list. @@ -1551,13 +1551,13 @@ public interface RoomPackage extends EPackage int PORT_CLASS__OPERATIONS = 2; /** - * The feature id for the '<em><b>Msg Handlers</b></em>' containment reference list. + * The feature id for the '<em><b>Attributes</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int PORT_CLASS__MSG_HANDLERS = 3; + int PORT_CLASS__ATTRIBUTES = 3; /** * The number of structural features of the '<em>Port Class</em>' class. @@ -1717,22 +1717,22 @@ public interface RoomPackage extends EPackage int ACTOR_CLASS__ANNOTATIONS = ACTOR_CONTAINER_CLASS__ANNOTATIONS; /** - * The feature id for the '<em><b>Bindings</b></em>' containment reference list. + * The feature id for the '<em><b>Connections</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ACTOR_CLASS__BINDINGS = ACTOR_CONTAINER_CLASS__BINDINGS; + int ACTOR_CLASS__CONNECTIONS = ACTOR_CONTAINER_CLASS__CONNECTIONS; /** - * The feature id for the '<em><b>Connections</b></em>' containment reference list. + * The feature id for the '<em><b>Bindings</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ACTOR_CLASS__CONNECTIONS = ACTOR_CONTAINER_CLASS__CONNECTIONS; + int ACTOR_CLASS__BINDINGS = ACTOR_CONTAINER_CLASS__BINDINGS; /** * The feature id for the '<em><b>Service Provision Points</b></em>' containment reference list. @@ -1843,22 +1843,22 @@ public interface RoomPackage extends EPackage int ACTOR_CLASS__STRUCTURE_DOCU = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 6; /** - * The feature id for the '<em><b>Internal Ports</b></em>' containment reference list. + * The feature id for the '<em><b>Service Implementations</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ACTOR_CLASS__INTERNAL_PORTS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 7; + int ACTOR_CLASS__SERVICE_IMPLEMENTATIONS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 7; /** - * The feature id for the '<em><b>External Ports</b></em>' containment reference list. + * The feature id for the '<em><b>Attributes</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ACTOR_CLASS__EXTERNAL_PORTS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 8; + int ACTOR_CLASS__ATTRIBUTES = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 8; /** * The feature id for the '<em><b>Service Access Points</b></em>' containment reference list. @@ -1870,22 +1870,22 @@ public interface RoomPackage extends EPackage int ACTOR_CLASS__SERVICE_ACCESS_POINTS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 9; /** - * The feature id for the '<em><b>Attributes</b></em>' containment reference list. + * The feature id for the '<em><b>Internal Ports</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ACTOR_CLASS__ATTRIBUTES = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 10; + int ACTOR_CLASS__INTERNAL_PORTS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 10; /** - * The feature id for the '<em><b>Service Implementations</b></em>' containment reference list. + * The feature id for the '<em><b>External Ports</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ACTOR_CLASS__SERVICE_IMPLEMENTATIONS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 11; + int ACTOR_CLASS__EXTERNAL_PORTS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 11; /** * The feature id for the '<em><b>Behavior Docu</b></em>' containment reference. @@ -1906,22 +1906,22 @@ public interface RoomPackage extends EPackage int ACTOR_CLASS__BEHAVIOR_ANNOTATIONS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 13; /** - * The feature id for the '<em><b>Structors</b></em>' containment reference list. + * The feature id for the '<em><b>Operations</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ACTOR_CLASS__STRUCTORS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 14; + int ACTOR_CLASS__OPERATIONS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 14; /** - * The feature id for the '<em><b>Operations</b></em>' containment reference list. + * The feature id for the '<em><b>Structors</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ACTOR_CLASS__OPERATIONS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 15; + int ACTOR_CLASS__STRUCTORS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 15; /** * The number of structural features of the '<em>Actor Class</em>' class. @@ -2192,22 +2192,22 @@ public interface RoomPackage extends EPackage int LOGICAL_SYSTEM__ANNOTATIONS = STRUCTURE_CLASS__ANNOTATIONS; /** - * The feature id for the '<em><b>Bindings</b></em>' containment reference list. + * The feature id for the '<em><b>Connections</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int LOGICAL_SYSTEM__BINDINGS = STRUCTURE_CLASS__BINDINGS; + int LOGICAL_SYSTEM__CONNECTIONS = STRUCTURE_CLASS__CONNECTIONS; /** - * The feature id for the '<em><b>Connections</b></em>' containment reference list. + * The feature id for the '<em><b>Bindings</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int LOGICAL_SYSTEM__CONNECTIONS = STRUCTURE_CLASS__CONNECTIONS; + int LOGICAL_SYSTEM__BINDINGS = STRUCTURE_CLASS__BINDINGS; /** * The feature id for the '<em><b>Sub Systems</b></em>' containment reference list. @@ -2348,22 +2348,22 @@ public interface RoomPackage extends EPackage int SUB_SYSTEM_CLASS__ANNOTATIONS = ACTOR_CONTAINER_CLASS__ANNOTATIONS; /** - * The feature id for the '<em><b>Bindings</b></em>' containment reference list. + * The feature id for the '<em><b>Connections</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int SUB_SYSTEM_CLASS__BINDINGS = ACTOR_CONTAINER_CLASS__BINDINGS; + int SUB_SYSTEM_CLASS__CONNECTIONS = ACTOR_CONTAINER_CLASS__CONNECTIONS; /** - * The feature id for the '<em><b>Connections</b></em>' containment reference list. + * The feature id for the '<em><b>Bindings</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int SUB_SYSTEM_CLASS__CONNECTIONS = ACTOR_CONTAINER_CLASS__CONNECTIONS; + int SUB_SYSTEM_CLASS__BINDINGS = ACTOR_CONTAINER_CLASS__BINDINGS; /** * The feature id for the '<em><b>Service Provision Points</b></em>' containment reference list. @@ -2411,13 +2411,13 @@ public interface RoomPackage extends EPackage int SUB_SYSTEM_CLASS__ACTOR_REFS = ACTOR_CONTAINER_CLASS__ACTOR_REFS; /** - * The feature id for the '<em><b>Relay Ports</b></em>' containment reference list. + * The feature id for the '<em><b>Actor Instance Mappings</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int SUB_SYSTEM_CLASS__RELAY_PORTS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 0; + int SUB_SYSTEM_CLASS__ACTOR_INSTANCE_MAPPINGS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Threads</b></em>' containment reference list. @@ -2429,13 +2429,13 @@ public interface RoomPackage extends EPackage int SUB_SYSTEM_CLASS__THREADS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Actor Instance Mappings</b></em>' containment reference list. + * The feature id for the '<em><b>Relay Ports</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int SUB_SYSTEM_CLASS__ACTOR_INSTANCE_MAPPINGS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 2; + int SUB_SYSTEM_CLASS__RELAY_PORTS = ACTOR_CONTAINER_CLASS_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>Sub System Class</em>' class. @@ -3108,26 +3108,26 @@ public interface RoomPackage extends EPackage EReference getStructureClass_Annotations(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.StructureClass#getBindings <em>Bindings</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.StructureClass#getConnections <em>Connections</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Bindings</em>'. - * @see org.eclipse.etrice.core.room.StructureClass#getBindings() + * @return the meta object for the containment reference list '<em>Connections</em>'. + * @see org.eclipse.etrice.core.room.StructureClass#getConnections() * @see #getStructureClass() * @generated */ - EReference getStructureClass_Bindings(); + EReference getStructureClass_Connections(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.StructureClass#getConnections <em>Connections</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.StructureClass#getBindings <em>Bindings</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Connections</em>'. - * @see org.eclipse.etrice.core.room.StructureClass#getConnections() + * @return the meta object for the containment reference list '<em>Bindings</em>'. + * @see org.eclipse.etrice.core.room.StructureClass#getBindings() * @see #getStructureClass() * @generated */ - EReference getStructureClass_Connections(); + EReference getStructureClass_Bindings(); /** * Returns the meta object for class '{@link org.eclipse.etrice.core.room.ActorContainerClass <em>Actor Container Class</em>}'. @@ -3494,15 +3494,15 @@ public interface RoomPackage extends EPackage EReference getDataClass_UserCode3(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.DataClass#getAttributes <em>Attributes</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.DataClass#getOperations <em>Operations</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Attributes</em>'. - * @see org.eclipse.etrice.core.room.DataClass#getAttributes() + * @return the meta object for the containment reference list '<em>Operations</em>'. + * @see org.eclipse.etrice.core.room.DataClass#getOperations() * @see #getDataClass() * @generated */ - EReference getDataClass_Attributes(); + EReference getDataClass_Operations(); /** * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.DataClass#getStructors <em>Structors</em>}'. @@ -3516,15 +3516,15 @@ public interface RoomPackage extends EPackage EReference getDataClass_Structors(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.DataClass#getOperations <em>Operations</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.DataClass#getAttributes <em>Attributes</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Operations</em>'. - * @see org.eclipse.etrice.core.room.DataClass#getOperations() + * @return the meta object for the containment reference list '<em>Attributes</em>'. + * @see org.eclipse.etrice.core.room.DataClass#getAttributes() * @see #getDataClass() * @generated */ - EReference getDataClass_Operations(); + EReference getDataClass_Attributes(); /** * Returns the meta object for class '{@link org.eclipse.etrice.core.room.Attribute <em>Attribute</em>}'. @@ -4000,15 +4000,15 @@ public interface RoomPackage extends EPackage EReference getPortClass_UserCode(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.PortClass#getAttributes <em>Attributes</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.PortClass#getMsgHandlers <em>Msg Handlers</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Attributes</em>'. - * @see org.eclipse.etrice.core.room.PortClass#getAttributes() + * @return the meta object for the containment reference list '<em>Msg Handlers</em>'. + * @see org.eclipse.etrice.core.room.PortClass#getMsgHandlers() * @see #getPortClass() * @generated */ - EReference getPortClass_Attributes(); + EReference getPortClass_MsgHandlers(); /** * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.PortClass#getOperations <em>Operations</em>}'. @@ -4022,15 +4022,15 @@ public interface RoomPackage extends EPackage EReference getPortClass_Operations(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.PortClass#getMsgHandlers <em>Msg Handlers</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.PortClass#getAttributes <em>Attributes</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Msg Handlers</em>'. - * @see org.eclipse.etrice.core.room.PortClass#getMsgHandlers() + * @return the meta object for the containment reference list '<em>Attributes</em>'. + * @see org.eclipse.etrice.core.room.PortClass#getAttributes() * @see #getPortClass() * @generated */ - EReference getPortClass_MsgHandlers(); + EReference getPortClass_Attributes(); /** * Returns the meta object for class '{@link org.eclipse.etrice.core.room.MessageHandler <em>Message Handler</em>}'. @@ -4117,26 +4117,26 @@ public interface RoomPackage extends EPackage EReference getActorClass_StructureDocu(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.ActorClass#getInternalPorts <em>Internal Ports</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.ActorClass#getServiceImplementations <em>Service Implementations</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Internal Ports</em>'. - * @see org.eclipse.etrice.core.room.ActorClass#getInternalPorts() + * @return the meta object for the containment reference list '<em>Service Implementations</em>'. + * @see org.eclipse.etrice.core.room.ActorClass#getServiceImplementations() * @see #getActorClass() * @generated */ - EReference getActorClass_InternalPorts(); + EReference getActorClass_ServiceImplementations(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.ActorClass#getExternalPorts <em>External Ports</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.ActorClass#getAttributes <em>Attributes</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>External Ports</em>'. - * @see org.eclipse.etrice.core.room.ActorClass#getExternalPorts() + * @return the meta object for the containment reference list '<em>Attributes</em>'. + * @see org.eclipse.etrice.core.room.ActorClass#getAttributes() * @see #getActorClass() * @generated */ - EReference getActorClass_ExternalPorts(); + EReference getActorClass_Attributes(); /** * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.ActorClass#getServiceAccessPoints <em>Service Access Points</em>}'. @@ -4150,26 +4150,26 @@ public interface RoomPackage extends EPackage EReference getActorClass_ServiceAccessPoints(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.ActorClass#getAttributes <em>Attributes</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.ActorClass#getInternalPorts <em>Internal Ports</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Attributes</em>'. - * @see org.eclipse.etrice.core.room.ActorClass#getAttributes() + * @return the meta object for the containment reference list '<em>Internal Ports</em>'. + * @see org.eclipse.etrice.core.room.ActorClass#getInternalPorts() * @see #getActorClass() * @generated */ - EReference getActorClass_Attributes(); + EReference getActorClass_InternalPorts(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.ActorClass#getServiceImplementations <em>Service Implementations</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.ActorClass#getExternalPorts <em>External Ports</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Service Implementations</em>'. - * @see org.eclipse.etrice.core.room.ActorClass#getServiceImplementations() + * @return the meta object for the containment reference list '<em>External Ports</em>'. + * @see org.eclipse.etrice.core.room.ActorClass#getExternalPorts() * @see #getActorClass() * @generated */ - EReference getActorClass_ServiceImplementations(); + EReference getActorClass_ExternalPorts(); /** * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.room.ActorClass#getBehaviorDocu <em>Behavior Docu</em>}'. @@ -4194,26 +4194,26 @@ public interface RoomPackage extends EPackage EReference getActorClass_BehaviorAnnotations(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.ActorClass#getStructors <em>Structors</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.ActorClass#getOperations <em>Operations</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Structors</em>'. - * @see org.eclipse.etrice.core.room.ActorClass#getStructors() + * @return the meta object for the containment reference list '<em>Operations</em>'. + * @see org.eclipse.etrice.core.room.ActorClass#getOperations() * @see #getActorClass() * @generated */ - EReference getActorClass_Structors(); + EReference getActorClass_Operations(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.ActorClass#getOperations <em>Operations</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.ActorClass#getStructors <em>Structors</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Operations</em>'. - * @see org.eclipse.etrice.core.room.ActorClass#getOperations() + * @return the meta object for the containment reference list '<em>Structors</em>'. + * @see org.eclipse.etrice.core.room.ActorClass#getStructors() * @see #getActorClass() * @generated */ - EReference getActorClass_Operations(); + EReference getActorClass_Structors(); /** * Returns the meta object for class '{@link org.eclipse.etrice.core.room.InterfaceItem <em>Interface Item</em>}'. @@ -4448,15 +4448,15 @@ public interface RoomPackage extends EPackage EClass getSubSystemClass(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.SubSystemClass#getRelayPorts <em>Relay Ports</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.SubSystemClass#getActorInstanceMappings <em>Actor Instance Mappings</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Relay Ports</em>'. - * @see org.eclipse.etrice.core.room.SubSystemClass#getRelayPorts() + * @return the meta object for the containment reference list '<em>Actor Instance Mappings</em>'. + * @see org.eclipse.etrice.core.room.SubSystemClass#getActorInstanceMappings() * @see #getSubSystemClass() * @generated */ - EReference getSubSystemClass_RelayPorts(); + EReference getSubSystemClass_ActorInstanceMappings(); /** * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.SubSystemClass#getThreads <em>Threads</em>}'. @@ -4470,15 +4470,15 @@ public interface RoomPackage extends EPackage EReference getSubSystemClass_Threads(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.SubSystemClass#getActorInstanceMappings <em>Actor Instance Mappings</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.room.SubSystemClass#getRelayPorts <em>Relay Ports</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Actor Instance Mappings</em>'. - * @see org.eclipse.etrice.core.room.SubSystemClass#getActorInstanceMappings() + * @return the meta object for the containment reference list '<em>Relay Ports</em>'. + * @see org.eclipse.etrice.core.room.SubSystemClass#getRelayPorts() * @see #getSubSystemClass() * @generated */ - EReference getSubSystemClass_ActorInstanceMappings(); + EReference getSubSystemClass_RelayPorts(); /** * Returns the meta object for class '{@link org.eclipse.etrice.core.room.LogicalThread <em>Logical Thread</em>}'. @@ -5035,20 +5035,20 @@ public interface RoomPackage extends EPackage EReference STRUCTURE_CLASS__ANNOTATIONS = eINSTANCE.getStructureClass_Annotations(); /** - * The meta object literal for the '<em><b>Bindings</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Connections</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference STRUCTURE_CLASS__BINDINGS = eINSTANCE.getStructureClass_Bindings(); + EReference STRUCTURE_CLASS__CONNECTIONS = eINSTANCE.getStructureClass_Connections(); /** - * The meta object literal for the '<em><b>Connections</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Bindings</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference STRUCTURE_CLASS__CONNECTIONS = eINSTANCE.getStructureClass_Connections(); + EReference STRUCTURE_CLASS__BINDINGS = eINSTANCE.getStructureClass_Bindings(); /** * The meta object literal for the '{@link org.eclipse.etrice.core.room.impl.ActorContainerClassImpl <em>Actor Container Class</em>}' class. @@ -5343,12 +5343,12 @@ public interface RoomPackage extends EPackage EReference DATA_CLASS__USER_CODE3 = eINSTANCE.getDataClass_UserCode3(); /** - * The meta object literal for the '<em><b>Attributes</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Operations</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference DATA_CLASS__ATTRIBUTES = eINSTANCE.getDataClass_Attributes(); + EReference DATA_CLASS__OPERATIONS = eINSTANCE.getDataClass_Operations(); /** * The meta object literal for the '<em><b>Structors</b></em>' containment reference list feature. @@ -5359,12 +5359,12 @@ public interface RoomPackage extends EPackage EReference DATA_CLASS__STRUCTORS = eINSTANCE.getDataClass_Structors(); /** - * The meta object literal for the '<em><b>Operations</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Attributes</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference DATA_CLASS__OPERATIONS = eINSTANCE.getDataClass_Operations(); + EReference DATA_CLASS__ATTRIBUTES = eINSTANCE.getDataClass_Attributes(); /** * The meta object literal for the '{@link org.eclipse.etrice.core.room.impl.AttributeImpl <em>Attribute</em>}' class. @@ -5741,12 +5741,12 @@ public interface RoomPackage extends EPackage EReference PORT_CLASS__USER_CODE = eINSTANCE.getPortClass_UserCode(); /** - * The meta object literal for the '<em><b>Attributes</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Msg Handlers</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference PORT_CLASS__ATTRIBUTES = eINSTANCE.getPortClass_Attributes(); + EReference PORT_CLASS__MSG_HANDLERS = eINSTANCE.getPortClass_MsgHandlers(); /** * The meta object literal for the '<em><b>Operations</b></em>' containment reference list feature. @@ -5757,12 +5757,12 @@ public interface RoomPackage extends EPackage EReference PORT_CLASS__OPERATIONS = eINSTANCE.getPortClass_Operations(); /** - * The meta object literal for the '<em><b>Msg Handlers</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Attributes</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference PORT_CLASS__MSG_HANDLERS = eINSTANCE.getPortClass_MsgHandlers(); + EReference PORT_CLASS__ATTRIBUTES = eINSTANCE.getPortClass_Attributes(); /** * The meta object literal for the '{@link org.eclipse.etrice.core.room.impl.MessageHandlerImpl <em>Message Handler</em>}' class. @@ -5837,20 +5837,20 @@ public interface RoomPackage extends EPackage EReference ACTOR_CLASS__STRUCTURE_DOCU = eINSTANCE.getActorClass_StructureDocu(); /** - * The meta object literal for the '<em><b>Internal Ports</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Service Implementations</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference ACTOR_CLASS__INTERNAL_PORTS = eINSTANCE.getActorClass_InternalPorts(); + EReference ACTOR_CLASS__SERVICE_IMPLEMENTATIONS = eINSTANCE.getActorClass_ServiceImplementations(); /** - * The meta object literal for the '<em><b>External Ports</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Attributes</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference ACTOR_CLASS__EXTERNAL_PORTS = eINSTANCE.getActorClass_ExternalPorts(); + EReference ACTOR_CLASS__ATTRIBUTES = eINSTANCE.getActorClass_Attributes(); /** * The meta object literal for the '<em><b>Service Access Points</b></em>' containment reference list feature. @@ -5861,20 +5861,20 @@ public interface RoomPackage extends EPackage EReference ACTOR_CLASS__SERVICE_ACCESS_POINTS = eINSTANCE.getActorClass_ServiceAccessPoints(); /** - * The meta object literal for the '<em><b>Attributes</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Internal Ports</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference ACTOR_CLASS__ATTRIBUTES = eINSTANCE.getActorClass_Attributes(); + EReference ACTOR_CLASS__INTERNAL_PORTS = eINSTANCE.getActorClass_InternalPorts(); /** - * The meta object literal for the '<em><b>Service Implementations</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>External Ports</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference ACTOR_CLASS__SERVICE_IMPLEMENTATIONS = eINSTANCE.getActorClass_ServiceImplementations(); + EReference ACTOR_CLASS__EXTERNAL_PORTS = eINSTANCE.getActorClass_ExternalPorts(); /** * The meta object literal for the '<em><b>Behavior Docu</b></em>' containment reference feature. @@ -5893,20 +5893,20 @@ public interface RoomPackage extends EPackage EReference ACTOR_CLASS__BEHAVIOR_ANNOTATIONS = eINSTANCE.getActorClass_BehaviorAnnotations(); /** - * The meta object literal for the '<em><b>Structors</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Operations</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference ACTOR_CLASS__STRUCTORS = eINSTANCE.getActorClass_Structors(); + EReference ACTOR_CLASS__OPERATIONS = eINSTANCE.getActorClass_Operations(); /** - * The meta object literal for the '<em><b>Operations</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Structors</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference ACTOR_CLASS__OPERATIONS = eINSTANCE.getActorClass_Operations(); + EReference ACTOR_CLASS__STRUCTORS = eINSTANCE.getActorClass_Structors(); /** * The meta object literal for the '{@link org.eclipse.etrice.core.room.impl.InterfaceItemImpl <em>Interface Item</em>}' class. @@ -6105,12 +6105,12 @@ public interface RoomPackage extends EPackage EClass SUB_SYSTEM_CLASS = eINSTANCE.getSubSystemClass(); /** - * The meta object literal for the '<em><b>Relay Ports</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Actor Instance Mappings</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference SUB_SYSTEM_CLASS__RELAY_PORTS = eINSTANCE.getSubSystemClass_RelayPorts(); + EReference SUB_SYSTEM_CLASS__ACTOR_INSTANCE_MAPPINGS = eINSTANCE.getSubSystemClass_ActorInstanceMappings(); /** * The meta object literal for the '<em><b>Threads</b></em>' containment reference list feature. @@ -6121,12 +6121,12 @@ public interface RoomPackage extends EPackage EReference SUB_SYSTEM_CLASS__THREADS = eINSTANCE.getSubSystemClass_Threads(); /** - * The meta object literal for the '<em><b>Actor Instance Mappings</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Relay Ports</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference SUB_SYSTEM_CLASS__ACTOR_INSTANCE_MAPPINGS = eINSTANCE.getSubSystemClass_ActorInstanceMappings(); + EReference SUB_SYSTEM_CLASS__RELAY_PORTS = eINSTANCE.getSubSystemClass_RelayPorts(); /** * The meta object literal for the '{@link org.eclipse.etrice.core.room.impl.LogicalThreadImpl <em>Logical Thread</em>}' class. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StructureClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StructureClass.java index b66cb16b6..8e1e7d454 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StructureClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StructureClass.java @@ -24,8 +24,8 @@ import org.eclipse.etrice.core.common.base.Annotation; * The following features are supported: * <ul> * <li>{@link org.eclipse.etrice.core.room.StructureClass#getAnnotations <em>Annotations</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.StructureClass#getBindings <em>Bindings</em>}</li> * <li>{@link org.eclipse.etrice.core.room.StructureClass#getConnections <em>Connections</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.StructureClass#getBindings <em>Bindings</em>}</li> * </ul> * </p> * @@ -52,35 +52,35 @@ public interface StructureClass extends RoomClass EList<Annotation> getAnnotations(); /** - * Returns the value of the '<em><b>Bindings</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.Binding}. + * Returns the value of the '<em><b>Connections</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.LayerConnection}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> - * <br>This is a list of structure class bindings. + * <br>This is a list of structure class connections. * * <!-- end-model-doc --> - * @return the value of the '<em>Bindings</em>' containment reference list. - * @see org.eclipse.etrice.core.room.RoomPackage#getStructureClass_Bindings() + * @return the value of the '<em>Connections</em>' containment reference list. + * @see org.eclipse.etrice.core.room.RoomPackage#getStructureClass_Connections() * @model containment="true" * @generated */ - EList<Binding> getBindings(); + EList<LayerConnection> getConnections(); /** - * Returns the value of the '<em><b>Connections</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.LayerConnection}. + * Returns the value of the '<em><b>Bindings</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.Binding}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> - * <br>This is a list of structure class connections. + * <br>This is a list of structure class bindings. * * <!-- end-model-doc --> - * @return the value of the '<em>Connections</em>' containment reference list. - * @see org.eclipse.etrice.core.room.RoomPackage#getStructureClass_Connections() + * @return the value of the '<em>Bindings</em>' containment reference list. + * @see org.eclipse.etrice.core.room.RoomPackage#getStructureClass_Bindings() * @model containment="true" * @generated */ - EList<LayerConnection> getConnections(); + EList<Binding> getBindings(); } // StructureClass diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemClass.java index 241a5da3e..f1ec65380 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemClass.java @@ -28,9 +28,9 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.etrice.core.room.SubSystemClass#getRelayPorts <em>Relay Ports</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.SubSystemClass#getThreads <em>Threads</em>}</li> * <li>{@link org.eclipse.etrice.core.room.SubSystemClass#getActorInstanceMappings <em>Actor Instance Mappings</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.SubSystemClass#getThreads <em>Threads</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.SubSystemClass#getRelayPorts <em>Relay Ports</em>}</li> * </ul> * </p> * @@ -41,20 +41,20 @@ import org.eclipse.emf.common.util.EList; public interface SubSystemClass extends ActorContainerClass { /** - * Returns the value of the '<em><b>Relay Ports</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.Port}. + * Returns the value of the '<em><b>Actor Instance Mappings</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.ActorInstanceMapping}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> - * <br>This is a list of all relay ports of the sub system. + * <br>This is a list of actor instance mappings. * * <!-- end-model-doc --> - * @return the value of the '<em>Relay Ports</em>' containment reference list. - * @see org.eclipse.etrice.core.room.RoomPackage#getSubSystemClass_RelayPorts() + * @return the value of the '<em>Actor Instance Mappings</em>' containment reference list. + * @see org.eclipse.etrice.core.room.RoomPackage#getSubSystemClass_ActorInstanceMappings() * @model containment="true" * @generated */ - EList<Port> getRelayPorts(); + EList<ActorInstanceMapping> getActorInstanceMappings(); /** * Returns the value of the '<em><b>Threads</b></em>' containment reference list. @@ -73,19 +73,19 @@ public interface SubSystemClass extends ActorContainerClass EList<LogicalThread> getThreads(); /** - * Returns the value of the '<em><b>Actor Instance Mappings</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.ActorInstanceMapping}. + * Returns the value of the '<em><b>Relay Ports</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.Port}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> - * <br>This is a list of actor instance mappings. + * <br>This is a list of all relay ports of the sub system. * * <!-- end-model-doc --> - * @return the value of the '<em>Actor Instance Mappings</em>' containment reference list. - * @see org.eclipse.etrice.core.room.RoomPackage#getSubSystemClass_ActorInstanceMappings() + * @return the value of the '<em>Relay Ports</em>' containment reference list. + * @see org.eclipse.etrice.core.room.RoomPackage#getSubSystemClass_RelayPorts() * @model containment="true" * @generated */ - EList<ActorInstanceMapping> getActorInstanceMappings(); + EList<Port> getRelayPorts(); } // SubSystemClass diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorClassImpl.java index 3fca51117..64010b4ba 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorClassImpl.java @@ -55,15 +55,15 @@ import org.eclipse.etrice.core.room.util.RoomHelpers; * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getStateMachine <em>State Machine</em>}</li> * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getInterfacePorts <em>Interface Ports</em>}</li> * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getStructureDocu <em>Structure Docu</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getServiceImplementations <em>Service Implementations</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getAttributes <em>Attributes</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getServiceAccessPoints <em>Service Access Points</em>}</li> * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getInternalPorts <em>Internal Ports</em>}</li> * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getExternalPorts <em>External Ports</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getServiceAccessPoints <em>Service Access Points</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getAttributes <em>Attributes</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getServiceImplementations <em>Service Implementations</em>}</li> * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getBehaviorDocu <em>Behavior Docu</em>}</li> * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getBehaviorAnnotations <em>Behavior Annotations</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getStructors <em>Structors</em>}</li> * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getOperations <em>Operations</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getStructors <em>Structors</em>}</li> * </ul> * </p> * @@ -172,24 +172,24 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas protected Documentation structureDocu; /** - * The cached value of the '{@link #getInternalPorts() <em>Internal Ports</em>}' containment reference list. + * The cached value of the '{@link #getServiceImplementations() <em>Service Implementations</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getInternalPorts() + * @see #getServiceImplementations() * @generated * @ordered */ - protected EList<Port> internalPorts; + protected EList<ServiceImplementation> serviceImplementations; /** - * The cached value of the '{@link #getExternalPorts() <em>External Ports</em>}' containment reference list. + * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getExternalPorts() + * @see #getAttributes() * @generated * @ordered */ - protected EList<ExternalPort> externalPorts; + protected EList<Attribute> attributes; /** * The cached value of the '{@link #getServiceAccessPoints() <em>Service Access Points</em>}' containment reference list. @@ -202,24 +202,24 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas protected EList<SAP> serviceAccessPoints; /** - * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list. + * The cached value of the '{@link #getInternalPorts() <em>Internal Ports</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAttributes() + * @see #getInternalPorts() * @generated * @ordered */ - protected EList<Attribute> attributes; + protected EList<Port> internalPorts; /** - * The cached value of the '{@link #getServiceImplementations() <em>Service Implementations</em>}' containment reference list. + * The cached value of the '{@link #getExternalPorts() <em>External Ports</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getServiceImplementations() + * @see #getExternalPorts() * @generated * @ordered */ - protected EList<ServiceImplementation> serviceImplementations; + protected EList<ExternalPort> externalPorts; /** * The cached value of the '{@link #getBehaviorDocu() <em>Behavior Docu</em>}' containment reference. @@ -242,24 +242,24 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas protected EList<Annotation> behaviorAnnotations; /** - * The cached value of the '{@link #getStructors() <em>Structors</em>}' containment reference list. + * The cached value of the '{@link #getOperations() <em>Operations</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getStructors() + * @see #getOperations() * @generated * @ordered */ - protected EList<ClassStructor> structors; + protected EList<StandardOperation> operations; /** - * The cached value of the '{@link #getOperations() <em>Operations</em>}' containment reference list. + * The cached value of the '{@link #getStructors() <em>Structors</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getOperations() + * @see #getStructors() * @generated * @ordered */ - protected EList<StandardOperation> operations; + protected EList<ClassStructor> structors; /** * <!-- begin-user-doc --> @@ -509,13 +509,13 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas * <!-- end-user-doc --> * @generated */ - public EList<Port> getInternalPorts() + public EList<ServiceImplementation> getServiceImplementations() { - if (internalPorts == null) + if (serviceImplementations == null) { - internalPorts = new EObjectContainmentEList<Port>(Port.class, this, RoomPackage.ACTOR_CLASS__INTERNAL_PORTS); + serviceImplementations = new EObjectContainmentEList<ServiceImplementation>(ServiceImplementation.class, this, RoomPackage.ACTOR_CLASS__SERVICE_IMPLEMENTATIONS); } - return internalPorts; + return serviceImplementations; } /** @@ -523,13 +523,13 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas * <!-- end-user-doc --> * @generated */ - public EList<ExternalPort> getExternalPorts() + public EList<Attribute> getAttributes() { - if (externalPorts == null) + if (attributes == null) { - externalPorts = new EObjectContainmentEList<ExternalPort>(ExternalPort.class, this, RoomPackage.ACTOR_CLASS__EXTERNAL_PORTS); + attributes = new EObjectContainmentEList<Attribute>(Attribute.class, this, RoomPackage.ACTOR_CLASS__ATTRIBUTES); } - return externalPorts; + return attributes; } /** @@ -551,13 +551,13 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas * <!-- end-user-doc --> * @generated */ - public EList<Attribute> getAttributes() + public EList<Port> getInternalPorts() { - if (attributes == null) + if (internalPorts == null) { - attributes = new EObjectContainmentEList<Attribute>(Attribute.class, this, RoomPackage.ACTOR_CLASS__ATTRIBUTES); + internalPorts = new EObjectContainmentEList<Port>(Port.class, this, RoomPackage.ACTOR_CLASS__INTERNAL_PORTS); } - return attributes; + return internalPorts; } /** @@ -565,13 +565,13 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas * <!-- end-user-doc --> * @generated */ - public EList<ServiceImplementation> getServiceImplementations() + public EList<ExternalPort> getExternalPorts() { - if (serviceImplementations == null) + if (externalPorts == null) { - serviceImplementations = new EObjectContainmentEList<ServiceImplementation>(ServiceImplementation.class, this, RoomPackage.ACTOR_CLASS__SERVICE_IMPLEMENTATIONS); + externalPorts = new EObjectContainmentEList<ExternalPort>(ExternalPort.class, this, RoomPackage.ACTOR_CLASS__EXTERNAL_PORTS); } - return serviceImplementations; + return externalPorts; } /** @@ -641,13 +641,13 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas * <!-- end-user-doc --> * @generated */ - public EList<ClassStructor> getStructors() + public EList<StandardOperation> getOperations() { - if (structors == null) + if (operations == null) { - structors = new EObjectContainmentEList<ClassStructor>(ClassStructor.class, this, RoomPackage.ACTOR_CLASS__STRUCTORS); + operations = new EObjectContainmentEList<StandardOperation>(StandardOperation.class, this, RoomPackage.ACTOR_CLASS__OPERATIONS); } - return structors; + return operations; } /** @@ -655,13 +655,13 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas * <!-- end-user-doc --> * @generated */ - public EList<StandardOperation> getOperations() + public EList<ClassStructor> getStructors() { - if (operations == null) + if (structors == null) { - operations = new EObjectContainmentEList<StandardOperation>(StandardOperation.class, this, RoomPackage.ACTOR_CLASS__OPERATIONS); + structors = new EObjectContainmentEList<ClassStructor>(ClassStructor.class, this, RoomPackage.ACTOR_CLASS__STRUCTORS); } - return operations; + return structors; } /** @@ -769,24 +769,24 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas return ((InternalEList<?>)getInterfacePorts()).basicRemove(otherEnd, msgs); case RoomPackage.ACTOR_CLASS__STRUCTURE_DOCU: return basicSetStructureDocu(null, msgs); + case RoomPackage.ACTOR_CLASS__SERVICE_IMPLEMENTATIONS: + return ((InternalEList<?>)getServiceImplementations()).basicRemove(otherEnd, msgs); + case RoomPackage.ACTOR_CLASS__ATTRIBUTES: + return ((InternalEList<?>)getAttributes()).basicRemove(otherEnd, msgs); + case RoomPackage.ACTOR_CLASS__SERVICE_ACCESS_POINTS: + return ((InternalEList<?>)getServiceAccessPoints()).basicRemove(otherEnd, msgs); case RoomPackage.ACTOR_CLASS__INTERNAL_PORTS: return ((InternalEList<?>)getInternalPorts()).basicRemove(otherEnd, msgs); case RoomPackage.ACTOR_CLASS__EXTERNAL_PORTS: return ((InternalEList<?>)getExternalPorts()).basicRemove(otherEnd, msgs); - case RoomPackage.ACTOR_CLASS__SERVICE_ACCESS_POINTS: - return ((InternalEList<?>)getServiceAccessPoints()).basicRemove(otherEnd, msgs); - case RoomPackage.ACTOR_CLASS__ATTRIBUTES: - return ((InternalEList<?>)getAttributes()).basicRemove(otherEnd, msgs); - case RoomPackage.ACTOR_CLASS__SERVICE_IMPLEMENTATIONS: - return ((InternalEList<?>)getServiceImplementations()).basicRemove(otherEnd, msgs); case RoomPackage.ACTOR_CLASS__BEHAVIOR_DOCU: return basicSetBehaviorDocu(null, msgs); case RoomPackage.ACTOR_CLASS__BEHAVIOR_ANNOTATIONS: return ((InternalEList<?>)getBehaviorAnnotations()).basicRemove(otherEnd, msgs); - case RoomPackage.ACTOR_CLASS__STRUCTORS: - return ((InternalEList<?>)getStructors()).basicRemove(otherEnd, msgs); case RoomPackage.ACTOR_CLASS__OPERATIONS: return ((InternalEList<?>)getOperations()).basicRemove(otherEnd, msgs); + case RoomPackage.ACTOR_CLASS__STRUCTORS: + return ((InternalEList<?>)getStructors()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -816,24 +816,24 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas return getInterfacePorts(); case RoomPackage.ACTOR_CLASS__STRUCTURE_DOCU: return getStructureDocu(); + case RoomPackage.ACTOR_CLASS__SERVICE_IMPLEMENTATIONS: + return getServiceImplementations(); + case RoomPackage.ACTOR_CLASS__ATTRIBUTES: + return getAttributes(); + case RoomPackage.ACTOR_CLASS__SERVICE_ACCESS_POINTS: + return getServiceAccessPoints(); case RoomPackage.ACTOR_CLASS__INTERNAL_PORTS: return getInternalPorts(); case RoomPackage.ACTOR_CLASS__EXTERNAL_PORTS: return getExternalPorts(); - case RoomPackage.ACTOR_CLASS__SERVICE_ACCESS_POINTS: - return getServiceAccessPoints(); - case RoomPackage.ACTOR_CLASS__ATTRIBUTES: - return getAttributes(); - case RoomPackage.ACTOR_CLASS__SERVICE_IMPLEMENTATIONS: - return getServiceImplementations(); case RoomPackage.ACTOR_CLASS__BEHAVIOR_DOCU: return getBehaviorDocu(); case RoomPackage.ACTOR_CLASS__BEHAVIOR_ANNOTATIONS: return getBehaviorAnnotations(); - case RoomPackage.ACTOR_CLASS__STRUCTORS: - return getStructors(); case RoomPackage.ACTOR_CLASS__OPERATIONS: return getOperations(); + case RoomPackage.ACTOR_CLASS__STRUCTORS: + return getStructors(); } return super.eGet(featureID, resolve, coreType); } @@ -871,25 +871,25 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas case RoomPackage.ACTOR_CLASS__STRUCTURE_DOCU: setStructureDocu((Documentation)newValue); return; - case RoomPackage.ACTOR_CLASS__INTERNAL_PORTS: - getInternalPorts().clear(); - getInternalPorts().addAll((Collection<? extends Port>)newValue); + case RoomPackage.ACTOR_CLASS__SERVICE_IMPLEMENTATIONS: + getServiceImplementations().clear(); + getServiceImplementations().addAll((Collection<? extends ServiceImplementation>)newValue); return; - case RoomPackage.ACTOR_CLASS__EXTERNAL_PORTS: - getExternalPorts().clear(); - getExternalPorts().addAll((Collection<? extends ExternalPort>)newValue); + case RoomPackage.ACTOR_CLASS__ATTRIBUTES: + getAttributes().clear(); + getAttributes().addAll((Collection<? extends Attribute>)newValue); return; case RoomPackage.ACTOR_CLASS__SERVICE_ACCESS_POINTS: getServiceAccessPoints().clear(); getServiceAccessPoints().addAll((Collection<? extends SAP>)newValue); return; - case RoomPackage.ACTOR_CLASS__ATTRIBUTES: - getAttributes().clear(); - getAttributes().addAll((Collection<? extends Attribute>)newValue); + case RoomPackage.ACTOR_CLASS__INTERNAL_PORTS: + getInternalPorts().clear(); + getInternalPorts().addAll((Collection<? extends Port>)newValue); return; - case RoomPackage.ACTOR_CLASS__SERVICE_IMPLEMENTATIONS: - getServiceImplementations().clear(); - getServiceImplementations().addAll((Collection<? extends ServiceImplementation>)newValue); + case RoomPackage.ACTOR_CLASS__EXTERNAL_PORTS: + getExternalPorts().clear(); + getExternalPorts().addAll((Collection<? extends ExternalPort>)newValue); return; case RoomPackage.ACTOR_CLASS__BEHAVIOR_DOCU: setBehaviorDocu((Documentation)newValue); @@ -898,14 +898,14 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas getBehaviorAnnotations().clear(); getBehaviorAnnotations().addAll((Collection<? extends Annotation>)newValue); return; - case RoomPackage.ACTOR_CLASS__STRUCTORS: - getStructors().clear(); - getStructors().addAll((Collection<? extends ClassStructor>)newValue); - return; case RoomPackage.ACTOR_CLASS__OPERATIONS: getOperations().clear(); getOperations().addAll((Collection<? extends StandardOperation>)newValue); return; + case RoomPackage.ACTOR_CLASS__STRUCTORS: + getStructors().clear(); + getStructors().addAll((Collection<? extends ClassStructor>)newValue); + return; } super.eSet(featureID, newValue); } @@ -941,20 +941,20 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas case RoomPackage.ACTOR_CLASS__STRUCTURE_DOCU: setStructureDocu((Documentation)null); return; - case RoomPackage.ACTOR_CLASS__INTERNAL_PORTS: - getInternalPorts().clear(); + case RoomPackage.ACTOR_CLASS__SERVICE_IMPLEMENTATIONS: + getServiceImplementations().clear(); return; - case RoomPackage.ACTOR_CLASS__EXTERNAL_PORTS: - getExternalPorts().clear(); + case RoomPackage.ACTOR_CLASS__ATTRIBUTES: + getAttributes().clear(); return; case RoomPackage.ACTOR_CLASS__SERVICE_ACCESS_POINTS: getServiceAccessPoints().clear(); return; - case RoomPackage.ACTOR_CLASS__ATTRIBUTES: - getAttributes().clear(); + case RoomPackage.ACTOR_CLASS__INTERNAL_PORTS: + getInternalPorts().clear(); return; - case RoomPackage.ACTOR_CLASS__SERVICE_IMPLEMENTATIONS: - getServiceImplementations().clear(); + case RoomPackage.ACTOR_CLASS__EXTERNAL_PORTS: + getExternalPorts().clear(); return; case RoomPackage.ACTOR_CLASS__BEHAVIOR_DOCU: setBehaviorDocu((Documentation)null); @@ -962,12 +962,12 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas case RoomPackage.ACTOR_CLASS__BEHAVIOR_ANNOTATIONS: getBehaviorAnnotations().clear(); return; - case RoomPackage.ACTOR_CLASS__STRUCTORS: - getStructors().clear(); - return; case RoomPackage.ACTOR_CLASS__OPERATIONS: getOperations().clear(); return; + case RoomPackage.ACTOR_CLASS__STRUCTORS: + getStructors().clear(); + return; } super.eUnset(featureID); } @@ -996,24 +996,24 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas return interfacePorts != null && !interfacePorts.isEmpty(); case RoomPackage.ACTOR_CLASS__STRUCTURE_DOCU: return structureDocu != null; + case RoomPackage.ACTOR_CLASS__SERVICE_IMPLEMENTATIONS: + return serviceImplementations != null && !serviceImplementations.isEmpty(); + case RoomPackage.ACTOR_CLASS__ATTRIBUTES: + return attributes != null && !attributes.isEmpty(); + case RoomPackage.ACTOR_CLASS__SERVICE_ACCESS_POINTS: + return serviceAccessPoints != null && !serviceAccessPoints.isEmpty(); case RoomPackage.ACTOR_CLASS__INTERNAL_PORTS: return internalPorts != null && !internalPorts.isEmpty(); case RoomPackage.ACTOR_CLASS__EXTERNAL_PORTS: return externalPorts != null && !externalPorts.isEmpty(); - case RoomPackage.ACTOR_CLASS__SERVICE_ACCESS_POINTS: - return serviceAccessPoints != null && !serviceAccessPoints.isEmpty(); - case RoomPackage.ACTOR_CLASS__ATTRIBUTES: - return attributes != null && !attributes.isEmpty(); - case RoomPackage.ACTOR_CLASS__SERVICE_IMPLEMENTATIONS: - return serviceImplementations != null && !serviceImplementations.isEmpty(); case RoomPackage.ACTOR_CLASS__BEHAVIOR_DOCU: return behaviorDocu != null; case RoomPackage.ACTOR_CLASS__BEHAVIOR_ANNOTATIONS: return behaviorAnnotations != null && !behaviorAnnotations.isEmpty(); - case RoomPackage.ACTOR_CLASS__STRUCTORS: - return structors != null && !structors.isEmpty(); case RoomPackage.ACTOR_CLASS__OPERATIONS: return operations != null && !operations.isEmpty(); + case RoomPackage.ACTOR_CLASS__STRUCTORS: + return structors != null && !structors.isEmpty(); } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataClassImpl.java index 2b574b6ce..ad758cb74 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataClassImpl.java @@ -39,9 +39,9 @@ import org.eclipse.etrice.core.room.StandardOperation; * <li>{@link org.eclipse.etrice.core.room.impl.DataClassImpl#getUserCode1 <em>User Code1</em>}</li> * <li>{@link org.eclipse.etrice.core.room.impl.DataClassImpl#getUserCode2 <em>User Code2</em>}</li> * <li>{@link org.eclipse.etrice.core.room.impl.DataClassImpl#getUserCode3 <em>User Code3</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.impl.DataClassImpl#getAttributes <em>Attributes</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.impl.DataClassImpl#getStructors <em>Structors</em>}</li> * <li>{@link org.eclipse.etrice.core.room.impl.DataClassImpl#getOperations <em>Operations</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.impl.DataClassImpl#getStructors <em>Structors</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.impl.DataClassImpl#getAttributes <em>Attributes</em>}</li> * </ul> * </p> * @@ -100,14 +100,14 @@ public class DataClassImpl extends ComplexTypeImpl implements DataClass protected DetailCode userCode3; /** - * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list. + * The cached value of the '{@link #getOperations() <em>Operations</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAttributes() + * @see #getOperations() * @generated * @ordered */ - protected EList<Attribute> attributes; + protected EList<StandardOperation> operations; /** * The cached value of the '{@link #getStructors() <em>Structors</em>}' containment reference list. @@ -120,14 +120,14 @@ public class DataClassImpl extends ComplexTypeImpl implements DataClass protected EList<ClassStructor> structors; /** - * The cached value of the '{@link #getOperations() <em>Operations</em>}' containment reference list. + * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getOperations() + * @see #getAttributes() * @generated * @ordered */ - protected EList<StandardOperation> operations; + protected EList<Attribute> attributes; /** * <!-- begin-user-doc --> @@ -356,13 +356,13 @@ public class DataClassImpl extends ComplexTypeImpl implements DataClass * <!-- end-user-doc --> * @generated */ - public EList<Attribute> getAttributes() + public EList<StandardOperation> getOperations() { - if (attributes == null) + if (operations == null) { - attributes = new EObjectContainmentEList<Attribute>(Attribute.class, this, RoomPackage.DATA_CLASS__ATTRIBUTES); + operations = new EObjectContainmentEList<StandardOperation>(StandardOperation.class, this, RoomPackage.DATA_CLASS__OPERATIONS); } - return attributes; + return operations; } /** @@ -384,13 +384,13 @@ public class DataClassImpl extends ComplexTypeImpl implements DataClass * <!-- end-user-doc --> * @generated */ - public EList<StandardOperation> getOperations() + public EList<Attribute> getAttributes() { - if (operations == null) + if (attributes == null) { - operations = new EObjectContainmentEList<StandardOperation>(StandardOperation.class, this, RoomPackage.DATA_CLASS__OPERATIONS); + attributes = new EObjectContainmentEList<Attribute>(Attribute.class, this, RoomPackage.DATA_CLASS__ATTRIBUTES); } - return operations; + return attributes; } /** @@ -411,12 +411,12 @@ public class DataClassImpl extends ComplexTypeImpl implements DataClass return basicSetUserCode2(null, msgs); case RoomPackage.DATA_CLASS__USER_CODE3: return basicSetUserCode3(null, msgs); - case RoomPackage.DATA_CLASS__ATTRIBUTES: - return ((InternalEList<?>)getAttributes()).basicRemove(otherEnd, msgs); - case RoomPackage.DATA_CLASS__STRUCTORS: - return ((InternalEList<?>)getStructors()).basicRemove(otherEnd, msgs); case RoomPackage.DATA_CLASS__OPERATIONS: return ((InternalEList<?>)getOperations()).basicRemove(otherEnd, msgs); + case RoomPackage.DATA_CLASS__STRUCTORS: + return ((InternalEList<?>)getStructors()).basicRemove(otherEnd, msgs); + case RoomPackage.DATA_CLASS__ATTRIBUTES: + return ((InternalEList<?>)getAttributes()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -442,12 +442,12 @@ public class DataClassImpl extends ComplexTypeImpl implements DataClass return getUserCode2(); case RoomPackage.DATA_CLASS__USER_CODE3: return getUserCode3(); - case RoomPackage.DATA_CLASS__ATTRIBUTES: - return getAttributes(); - case RoomPackage.DATA_CLASS__STRUCTORS: - return getStructors(); case RoomPackage.DATA_CLASS__OPERATIONS: return getOperations(); + case RoomPackage.DATA_CLASS__STRUCTORS: + return getStructors(); + case RoomPackage.DATA_CLASS__ATTRIBUTES: + return getAttributes(); } return super.eGet(featureID, resolve, coreType); } @@ -479,17 +479,17 @@ public class DataClassImpl extends ComplexTypeImpl implements DataClass case RoomPackage.DATA_CLASS__USER_CODE3: setUserCode3((DetailCode)newValue); return; - case RoomPackage.DATA_CLASS__ATTRIBUTES: - getAttributes().clear(); - getAttributes().addAll((Collection<? extends Attribute>)newValue); + case RoomPackage.DATA_CLASS__OPERATIONS: + getOperations().clear(); + getOperations().addAll((Collection<? extends StandardOperation>)newValue); return; case RoomPackage.DATA_CLASS__STRUCTORS: getStructors().clear(); getStructors().addAll((Collection<? extends ClassStructor>)newValue); return; - case RoomPackage.DATA_CLASS__OPERATIONS: - getOperations().clear(); - getOperations().addAll((Collection<? extends StandardOperation>)newValue); + case RoomPackage.DATA_CLASS__ATTRIBUTES: + getAttributes().clear(); + getAttributes().addAll((Collection<? extends Attribute>)newValue); return; } super.eSet(featureID, newValue); @@ -520,14 +520,14 @@ public class DataClassImpl extends ComplexTypeImpl implements DataClass case RoomPackage.DATA_CLASS__USER_CODE3: setUserCode3((DetailCode)null); return; - case RoomPackage.DATA_CLASS__ATTRIBUTES: - getAttributes().clear(); + case RoomPackage.DATA_CLASS__OPERATIONS: + getOperations().clear(); return; case RoomPackage.DATA_CLASS__STRUCTORS: getStructors().clear(); return; - case RoomPackage.DATA_CLASS__OPERATIONS: - getOperations().clear(); + case RoomPackage.DATA_CLASS__ATTRIBUTES: + getAttributes().clear(); return; } super.eUnset(featureID); @@ -553,12 +553,12 @@ public class DataClassImpl extends ComplexTypeImpl implements DataClass return userCode2 != null; case RoomPackage.DATA_CLASS__USER_CODE3: return userCode3 != null; - case RoomPackage.DATA_CLASS__ATTRIBUTES: - return attributes != null && !attributes.isEmpty(); - case RoomPackage.DATA_CLASS__STRUCTORS: - return structors != null && !structors.isEmpty(); case RoomPackage.DATA_CLASS__OPERATIONS: return operations != null && !operations.isEmpty(); + case RoomPackage.DATA_CLASS__STRUCTORS: + return structors != null && !structors.isEmpty(); + case RoomPackage.DATA_CLASS__ATTRIBUTES: + return attributes != null && !attributes.isEmpty(); } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortClassImpl.java index d7716e133..f0b1948b3 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortClassImpl.java @@ -34,9 +34,9 @@ import org.eclipse.etrice.core.room.RoomPackage; * The following features are implemented: * <ul> * <li>{@link org.eclipse.etrice.core.room.impl.PortClassImpl#getUserCode <em>User Code</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.impl.PortClassImpl#getAttributes <em>Attributes</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.impl.PortClassImpl#getOperations <em>Operations</em>}</li> * <li>{@link org.eclipse.etrice.core.room.impl.PortClassImpl#getMsgHandlers <em>Msg Handlers</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.impl.PortClassImpl#getOperations <em>Operations</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.impl.PortClassImpl#getAttributes <em>Attributes</em>}</li> * </ul> * </p> * @@ -55,14 +55,14 @@ public class PortClassImpl extends MinimalEObjectImpl.Container implements PortC protected DetailCode userCode; /** - * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list. + * The cached value of the '{@link #getMsgHandlers() <em>Msg Handlers</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAttributes() + * @see #getMsgHandlers() * @generated * @ordered */ - protected EList<Attribute> attributes; + protected EList<MessageHandler> msgHandlers; /** * The cached value of the '{@link #getOperations() <em>Operations</em>}' containment reference list. @@ -75,14 +75,14 @@ public class PortClassImpl extends MinimalEObjectImpl.Container implements PortC protected EList<PortOperation> operations; /** - * The cached value of the '{@link #getMsgHandlers() <em>Msg Handlers</em>}' containment reference list. + * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMsgHandlers() + * @see #getAttributes() * @generated * @ordered */ - protected EList<MessageHandler> msgHandlers; + protected EList<Attribute> attributes; /** * <!-- begin-user-doc --> @@ -158,13 +158,13 @@ public class PortClassImpl extends MinimalEObjectImpl.Container implements PortC * <!-- end-user-doc --> * @generated */ - public EList<Attribute> getAttributes() + public EList<MessageHandler> getMsgHandlers() { - if (attributes == null) + if (msgHandlers == null) { - attributes = new EObjectContainmentEList<Attribute>(Attribute.class, this, RoomPackage.PORT_CLASS__ATTRIBUTES); + msgHandlers = new EObjectContainmentEList<MessageHandler>(MessageHandler.class, this, RoomPackage.PORT_CLASS__MSG_HANDLERS); } - return attributes; + return msgHandlers; } /** @@ -186,13 +186,13 @@ public class PortClassImpl extends MinimalEObjectImpl.Container implements PortC * <!-- end-user-doc --> * @generated */ - public EList<MessageHandler> getMsgHandlers() + public EList<Attribute> getAttributes() { - if (msgHandlers == null) + if (attributes == null) { - msgHandlers = new EObjectContainmentEList<MessageHandler>(MessageHandler.class, this, RoomPackage.PORT_CLASS__MSG_HANDLERS); + attributes = new EObjectContainmentEList<Attribute>(Attribute.class, this, RoomPackage.PORT_CLASS__ATTRIBUTES); } - return msgHandlers; + return attributes; } /** @@ -207,12 +207,12 @@ public class PortClassImpl extends MinimalEObjectImpl.Container implements PortC { case RoomPackage.PORT_CLASS__USER_CODE: return basicSetUserCode(null, msgs); - case RoomPackage.PORT_CLASS__ATTRIBUTES: - return ((InternalEList<?>)getAttributes()).basicRemove(otherEnd, msgs); - case RoomPackage.PORT_CLASS__OPERATIONS: - return ((InternalEList<?>)getOperations()).basicRemove(otherEnd, msgs); case RoomPackage.PORT_CLASS__MSG_HANDLERS: return ((InternalEList<?>)getMsgHandlers()).basicRemove(otherEnd, msgs); + case RoomPackage.PORT_CLASS__OPERATIONS: + return ((InternalEList<?>)getOperations()).basicRemove(otherEnd, msgs); + case RoomPackage.PORT_CLASS__ATTRIBUTES: + return ((InternalEList<?>)getAttributes()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -229,12 +229,12 @@ public class PortClassImpl extends MinimalEObjectImpl.Container implements PortC { case RoomPackage.PORT_CLASS__USER_CODE: return getUserCode(); - case RoomPackage.PORT_CLASS__ATTRIBUTES: - return getAttributes(); - case RoomPackage.PORT_CLASS__OPERATIONS: - return getOperations(); case RoomPackage.PORT_CLASS__MSG_HANDLERS: return getMsgHandlers(); + case RoomPackage.PORT_CLASS__OPERATIONS: + return getOperations(); + case RoomPackage.PORT_CLASS__ATTRIBUTES: + return getAttributes(); } return super.eGet(featureID, resolve, coreType); } @@ -253,17 +253,17 @@ public class PortClassImpl extends MinimalEObjectImpl.Container implements PortC case RoomPackage.PORT_CLASS__USER_CODE: setUserCode((DetailCode)newValue); return; - case RoomPackage.PORT_CLASS__ATTRIBUTES: - getAttributes().clear(); - getAttributes().addAll((Collection<? extends Attribute>)newValue); + case RoomPackage.PORT_CLASS__MSG_HANDLERS: + getMsgHandlers().clear(); + getMsgHandlers().addAll((Collection<? extends MessageHandler>)newValue); return; case RoomPackage.PORT_CLASS__OPERATIONS: getOperations().clear(); getOperations().addAll((Collection<? extends PortOperation>)newValue); return; - case RoomPackage.PORT_CLASS__MSG_HANDLERS: - getMsgHandlers().clear(); - getMsgHandlers().addAll((Collection<? extends MessageHandler>)newValue); + case RoomPackage.PORT_CLASS__ATTRIBUTES: + getAttributes().clear(); + getAttributes().addAll((Collection<? extends Attribute>)newValue); return; } super.eSet(featureID, newValue); @@ -282,14 +282,14 @@ public class PortClassImpl extends MinimalEObjectImpl.Container implements PortC case RoomPackage.PORT_CLASS__USER_CODE: setUserCode((DetailCode)null); return; - case RoomPackage.PORT_CLASS__ATTRIBUTES: - getAttributes().clear(); + case RoomPackage.PORT_CLASS__MSG_HANDLERS: + getMsgHandlers().clear(); return; case RoomPackage.PORT_CLASS__OPERATIONS: getOperations().clear(); return; - case RoomPackage.PORT_CLASS__MSG_HANDLERS: - getMsgHandlers().clear(); + case RoomPackage.PORT_CLASS__ATTRIBUTES: + getAttributes().clear(); return; } super.eUnset(featureID); @@ -307,12 +307,12 @@ public class PortClassImpl extends MinimalEObjectImpl.Container implements PortC { case RoomPackage.PORT_CLASS__USER_CODE: return userCode != null; - case RoomPackage.PORT_CLASS__ATTRIBUTES: - return attributes != null && !attributes.isEmpty(); - case RoomPackage.PORT_CLASS__OPERATIONS: - return operations != null && !operations.isEmpty(); case RoomPackage.PORT_CLASS__MSG_HANDLERS: return msgHandlers != null && !msgHandlers.isEmpty(); + case RoomPackage.PORT_CLASS__OPERATIONS: + return operations != null && !operations.isEmpty(); + case RoomPackage.PORT_CLASS__ATTRIBUTES: + return attributes != null && !attributes.isEmpty(); } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomPackageImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomPackageImpl.java index c2b4958bb..79f2f0ef1 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomPackageImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomPackageImpl.java @@ -698,7 +698,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ - public EReference getStructureClass_Bindings() + public EReference getStructureClass_Connections() { return (EReference)structureClassEClass.getEStructuralFeatures().get(1); } @@ -708,7 +708,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ - public EReference getStructureClass_Connections() + public EReference getStructureClass_Bindings() { return (EReference)structureClassEClass.getEStructuralFeatures().get(2); } @@ -1058,7 +1058,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ - public EReference getDataClass_Attributes() + public EReference getDataClass_Operations() { return (EReference)dataClassEClass.getEStructuralFeatures().get(5); } @@ -1078,7 +1078,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ - public EReference getDataClass_Operations() + public EReference getDataClass_Attributes() { return (EReference)dataClassEClass.getEStructuralFeatures().get(7); } @@ -1528,7 +1528,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ - public EReference getPortClass_Attributes() + public EReference getPortClass_MsgHandlers() { return (EReference)portClassEClass.getEStructuralFeatures().get(1); } @@ -1548,7 +1548,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ - public EReference getPortClass_MsgHandlers() + public EReference getPortClass_Attributes() { return (EReference)portClassEClass.getEStructuralFeatures().get(3); } @@ -1638,7 +1638,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ - public EReference getActorClass_InternalPorts() + public EReference getActorClass_ServiceImplementations() { return (EReference)actorClassEClass.getEStructuralFeatures().get(2); } @@ -1648,7 +1648,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ - public EReference getActorClass_ExternalPorts() + public EReference getActorClass_Attributes() { return (EReference)actorClassEClass.getEStructuralFeatures().get(3); } @@ -1668,7 +1668,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ - public EReference getActorClass_Attributes() + public EReference getActorClass_InternalPorts() { return (EReference)actorClassEClass.getEStructuralFeatures().get(5); } @@ -1678,7 +1678,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ - public EReference getActorClass_ServiceImplementations() + public EReference getActorClass_ExternalPorts() { return (EReference)actorClassEClass.getEStructuralFeatures().get(6); } @@ -1708,7 +1708,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ - public EReference getActorClass_Structors() + public EReference getActorClass_Operations() { return (EReference)actorClassEClass.getEStructuralFeatures().get(9); } @@ -1718,7 +1718,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ - public EReference getActorClass_Operations() + public EReference getActorClass_Structors() { return (EReference)actorClassEClass.getEStructuralFeatures().get(10); } @@ -1948,7 +1948,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ - public EReference getSubSystemClass_RelayPorts() + public EReference getSubSystemClass_ActorInstanceMappings() { return (EReference)subSystemClassEClass.getEStructuralFeatures().get(0); } @@ -1968,7 +1968,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ - public EReference getSubSystemClass_ActorInstanceMappings() + public EReference getSubSystemClass_RelayPorts() { return (EReference)subSystemClassEClass.getEStructuralFeatures().get(2); } @@ -2383,8 +2383,8 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage structureClassEClass = createEClass(STRUCTURE_CLASS); createEReference(structureClassEClass, STRUCTURE_CLASS__ANNOTATIONS); - createEReference(structureClassEClass, STRUCTURE_CLASS__BINDINGS); createEReference(structureClassEClass, STRUCTURE_CLASS__CONNECTIONS); + createEReference(structureClassEClass, STRUCTURE_CLASS__BINDINGS); actorContainerClassEClass = createEClass(ACTOR_CONTAINER_CLASS); createEReference(actorContainerClassEClass, ACTOR_CONTAINER_CLASS__SERVICE_PROVISION_POINTS); @@ -2429,9 +2429,9 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage createEReference(dataClassEClass, DATA_CLASS__USER_CODE1); createEReference(dataClassEClass, DATA_CLASS__USER_CODE2); createEReference(dataClassEClass, DATA_CLASS__USER_CODE3); - createEReference(dataClassEClass, DATA_CLASS__ATTRIBUTES); - createEReference(dataClassEClass, DATA_CLASS__STRUCTORS); createEReference(dataClassEClass, DATA_CLASS__OPERATIONS); + createEReference(dataClassEClass, DATA_CLASS__STRUCTORS); + createEReference(dataClassEClass, DATA_CLASS__ATTRIBUTES); attributeEClass = createEClass(ATTRIBUTE); createEAttribute(attributeEClass, ATTRIBUTE__NAME); @@ -2487,9 +2487,9 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage portClassEClass = createEClass(PORT_CLASS); createEReference(portClassEClass, PORT_CLASS__USER_CODE); - createEReference(portClassEClass, PORT_CLASS__ATTRIBUTES); - createEReference(portClassEClass, PORT_CLASS__OPERATIONS); createEReference(portClassEClass, PORT_CLASS__MSG_HANDLERS); + createEReference(portClassEClass, PORT_CLASS__OPERATIONS); + createEReference(portClassEClass, PORT_CLASS__ATTRIBUTES); messageHandlerEClass = createEClass(MESSAGE_HANDLER); createEReference(messageHandlerEClass, MESSAGE_HANDLER__MSG); @@ -2502,15 +2502,15 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage actorClassEClass = createEClass(ACTOR_CLASS); createEReference(actorClassEClass, ACTOR_CLASS__INTERFACE_PORTS); createEReference(actorClassEClass, ACTOR_CLASS__STRUCTURE_DOCU); + createEReference(actorClassEClass, ACTOR_CLASS__SERVICE_IMPLEMENTATIONS); + createEReference(actorClassEClass, ACTOR_CLASS__ATTRIBUTES); + createEReference(actorClassEClass, ACTOR_CLASS__SERVICE_ACCESS_POINTS); createEReference(actorClassEClass, ACTOR_CLASS__INTERNAL_PORTS); createEReference(actorClassEClass, ACTOR_CLASS__EXTERNAL_PORTS); - createEReference(actorClassEClass, ACTOR_CLASS__SERVICE_ACCESS_POINTS); - createEReference(actorClassEClass, ACTOR_CLASS__ATTRIBUTES); - createEReference(actorClassEClass, ACTOR_CLASS__SERVICE_IMPLEMENTATIONS); createEReference(actorClassEClass, ACTOR_CLASS__BEHAVIOR_DOCU); createEReference(actorClassEClass, ACTOR_CLASS__BEHAVIOR_ANNOTATIONS); - createEReference(actorClassEClass, ACTOR_CLASS__STRUCTORS); createEReference(actorClassEClass, ACTOR_CLASS__OPERATIONS); + createEReference(actorClassEClass, ACTOR_CLASS__STRUCTORS); interfaceItemEClass = createEClass(INTERFACE_ITEM); @@ -2543,9 +2543,9 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage createEReference(subSystemRefEClass, SUB_SYSTEM_REF__TYPE); subSystemClassEClass = createEClass(SUB_SYSTEM_CLASS); - createEReference(subSystemClassEClass, SUB_SYSTEM_CLASS__RELAY_PORTS); - createEReference(subSystemClassEClass, SUB_SYSTEM_CLASS__THREADS); createEReference(subSystemClassEClass, SUB_SYSTEM_CLASS__ACTOR_INSTANCE_MAPPINGS); + createEReference(subSystemClassEClass, SUB_SYSTEM_CLASS__THREADS); + createEReference(subSystemClassEClass, SUB_SYSTEM_CLASS__RELAY_PORTS); logicalThreadEClass = createEClass(LOGICAL_THREAD); createEAttribute(logicalThreadEClass, LOGICAL_THREAD__NAME); @@ -2680,8 +2680,8 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage initEClass(structureClassEClass, StructureClass.class, "StructureClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getStructureClass_Annotations(), theBasePackage.getAnnotation(), null, "annotations", null, 0, -1, StructureClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getStructureClass_Bindings(), this.getBinding(), null, "bindings", null, 0, -1, StructureClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getStructureClass_Connections(), this.getLayerConnection(), null, "connections", null, 0, -1, StructureClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getStructureClass_Bindings(), this.getBinding(), null, "bindings", null, 0, -1, StructureClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(actorContainerClassEClass, ActorContainerClass.class, "ActorContainerClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getActorContainerClass_ServiceProvisionPoints(), this.getSPP(), null, "serviceProvisionPoints", null, 0, -1, ActorContainerClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -2730,9 +2730,9 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage initEReference(getDataClass_UserCode1(), theFSMPackage.getDetailCode(), null, "userCode1", null, 0, 1, DataClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getDataClass_UserCode2(), theFSMPackage.getDetailCode(), null, "userCode2", null, 0, 1, DataClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getDataClass_UserCode3(), theFSMPackage.getDetailCode(), null, "userCode3", null, 0, 1, DataClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDataClass_Attributes(), this.getAttribute(), null, "attributes", null, 0, -1, DataClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDataClass_Structors(), this.getClassStructor(), null, "structors", null, 0, -1, DataClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getDataClass_Operations(), this.getStandardOperation(), null, "operations", null, 0, -1, DataClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getDataClass_Structors(), this.getClassStructor(), null, "structors", null, 0, -1, DataClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getDataClass_Attributes(), this.getAttribute(), null, "attributes", null, 0, -1, DataClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(attributeEClass, Attribute.class, "Attribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getAttribute_Name(), ecorePackage.getEString(), "name", null, 0, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -2790,9 +2790,9 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage initEClass(portClassEClass, PortClass.class, "PortClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getPortClass_UserCode(), theFSMPackage.getDetailCode(), null, "userCode", null, 0, 1, PortClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getPortClass_Attributes(), this.getAttribute(), null, "attributes", null, 0, -1, PortClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getPortClass_Operations(), this.getPortOperation(), null, "operations", null, 0, -1, PortClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getPortClass_MsgHandlers(), this.getMessageHandler(), null, "msgHandlers", null, 0, -1, PortClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getPortClass_Operations(), this.getPortOperation(), null, "operations", null, 0, -1, PortClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getPortClass_Attributes(), this.getAttribute(), null, "attributes", null, 0, -1, PortClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(messageHandlerEClass, MessageHandler.class, "MessageHandler", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getMessageHandler_Msg(), this.getMessage(), null, "msg", null, 0, 1, MessageHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -2805,15 +2805,15 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage initEClass(actorClassEClass, ActorClass.class, "ActorClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getActorClass_InterfacePorts(), this.getPort(), null, "interfacePorts", null, 0, -1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getActorClass_StructureDocu(), theBasePackage.getDocumentation(), null, "structureDocu", null, 0, 1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getActorClass_ServiceImplementations(), this.getServiceImplementation(), null, "serviceImplementations", null, 0, -1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getActorClass_Attributes(), this.getAttribute(), null, "attributes", null, 0, -1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getActorClass_ServiceAccessPoints(), this.getSAP(), null, "serviceAccessPoints", null, 0, -1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getActorClass_InternalPorts(), this.getPort(), null, "internalPorts", null, 0, -1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getActorClass_ExternalPorts(), this.getExternalPort(), null, "externalPorts", null, 0, -1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getActorClass_ServiceAccessPoints(), this.getSAP(), null, "serviceAccessPoints", null, 0, -1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getActorClass_Attributes(), this.getAttribute(), null, "attributes", null, 0, -1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getActorClass_ServiceImplementations(), this.getServiceImplementation(), null, "serviceImplementations", null, 0, -1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getActorClass_BehaviorDocu(), theBasePackage.getDocumentation(), null, "behaviorDocu", null, 0, 1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getActorClass_BehaviorAnnotations(), theBasePackage.getAnnotation(), null, "behaviorAnnotations", null, 0, -1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getActorClass_Structors(), this.getClassStructor(), null, "structors", null, 0, -1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getActorClass_Operations(), this.getStandardOperation(), null, "operations", null, 0, -1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getActorClass_Structors(), this.getClassStructor(), null, "structors", null, 0, -1, ActorClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); addEOperation(actorClassEClass, this.getPort(), "getExternalEndPorts", 0, -1, IS_UNIQUE, IS_ORDERED); @@ -2874,9 +2874,9 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage initEReference(getSubSystemRef_Type(), this.getSubSystemClass(), null, "type", null, 0, 1, SubSystemRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(subSystemClassEClass, SubSystemClass.class, "SubSystemClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getSubSystemClass_RelayPorts(), this.getPort(), null, "relayPorts", null, 0, -1, SubSystemClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSubSystemClass_Threads(), this.getLogicalThread(), null, "threads", null, 0, -1, SubSystemClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getSubSystemClass_ActorInstanceMappings(), this.getActorInstanceMapping(), null, "actorInstanceMappings", null, 0, -1, SubSystemClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSubSystemClass_Threads(), this.getLogicalThread(), null, "threads", null, 0, -1, SubSystemClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSubSystemClass_RelayPorts(), this.getPort(), null, "relayPorts", null, 0, -1, SubSystemClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(logicalThreadEClass, LogicalThread.class, "LogicalThread", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getLogicalThread_Name(), ecorePackage.getEString(), "name", null, 0, 1, LogicalThread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StructureClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StructureClassImpl.java index bef6a3a09..2c2466eba 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StructureClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StructureClassImpl.java @@ -29,8 +29,8 @@ import org.eclipse.etrice.core.room.StructureClass; * The following features are implemented: * <ul> * <li>{@link org.eclipse.etrice.core.room.impl.StructureClassImpl#getAnnotations <em>Annotations</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.impl.StructureClassImpl#getBindings <em>Bindings</em>}</li> * <li>{@link org.eclipse.etrice.core.room.impl.StructureClassImpl#getConnections <em>Connections</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.impl.StructureClassImpl#getBindings <em>Bindings</em>}</li> * </ul> * </p> * @@ -49,24 +49,24 @@ public class StructureClassImpl extends RoomClassImpl implements StructureClass protected EList<Annotation> annotations; /** - * The cached value of the '{@link #getBindings() <em>Bindings</em>}' containment reference list. + * The cached value of the '{@link #getConnections() <em>Connections</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getBindings() + * @see #getConnections() * @generated * @ordered */ - protected EList<Binding> bindings; + protected EList<LayerConnection> connections; /** - * The cached value of the '{@link #getConnections() <em>Connections</em>}' containment reference list. + * The cached value of the '{@link #getBindings() <em>Bindings</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getConnections() + * @see #getBindings() * @generated * @ordered */ - protected EList<LayerConnection> connections; + protected EList<Binding> bindings; /** * <!-- begin-user-doc --> @@ -108,13 +108,13 @@ public class StructureClassImpl extends RoomClassImpl implements StructureClass * <!-- end-user-doc --> * @generated */ - public EList<Binding> getBindings() + public EList<LayerConnection> getConnections() { - if (bindings == null) + if (connections == null) { - bindings = new EObjectContainmentEList<Binding>(Binding.class, this, RoomPackage.STRUCTURE_CLASS__BINDINGS); + connections = new EObjectContainmentEList<LayerConnection>(LayerConnection.class, this, RoomPackage.STRUCTURE_CLASS__CONNECTIONS); } - return bindings; + return connections; } /** @@ -122,13 +122,13 @@ public class StructureClassImpl extends RoomClassImpl implements StructureClass * <!-- end-user-doc --> * @generated */ - public EList<LayerConnection> getConnections() + public EList<Binding> getBindings() { - if (connections == null) + if (bindings == null) { - connections = new EObjectContainmentEList<LayerConnection>(LayerConnection.class, this, RoomPackage.STRUCTURE_CLASS__CONNECTIONS); + bindings = new EObjectContainmentEList<Binding>(Binding.class, this, RoomPackage.STRUCTURE_CLASS__BINDINGS); } - return connections; + return bindings; } /** @@ -143,10 +143,10 @@ public class StructureClassImpl extends RoomClassImpl implements StructureClass { case RoomPackage.STRUCTURE_CLASS__ANNOTATIONS: return ((InternalEList<?>)getAnnotations()).basicRemove(otherEnd, msgs); - case RoomPackage.STRUCTURE_CLASS__BINDINGS: - return ((InternalEList<?>)getBindings()).basicRemove(otherEnd, msgs); case RoomPackage.STRUCTURE_CLASS__CONNECTIONS: return ((InternalEList<?>)getConnections()).basicRemove(otherEnd, msgs); + case RoomPackage.STRUCTURE_CLASS__BINDINGS: + return ((InternalEList<?>)getBindings()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -163,10 +163,10 @@ public class StructureClassImpl extends RoomClassImpl implements StructureClass { case RoomPackage.STRUCTURE_CLASS__ANNOTATIONS: return getAnnotations(); - case RoomPackage.STRUCTURE_CLASS__BINDINGS: - return getBindings(); case RoomPackage.STRUCTURE_CLASS__CONNECTIONS: return getConnections(); + case RoomPackage.STRUCTURE_CLASS__BINDINGS: + return getBindings(); } return super.eGet(featureID, resolve, coreType); } @@ -186,14 +186,14 @@ public class StructureClassImpl extends RoomClassImpl implements StructureClass getAnnotations().clear(); getAnnotations().addAll((Collection<? extends Annotation>)newValue); return; - case RoomPackage.STRUCTURE_CLASS__BINDINGS: - getBindings().clear(); - getBindings().addAll((Collection<? extends Binding>)newValue); - return; case RoomPackage.STRUCTURE_CLASS__CONNECTIONS: getConnections().clear(); getConnections().addAll((Collection<? extends LayerConnection>)newValue); return; + case RoomPackage.STRUCTURE_CLASS__BINDINGS: + getBindings().clear(); + getBindings().addAll((Collection<? extends Binding>)newValue); + return; } super.eSet(featureID, newValue); } @@ -211,12 +211,12 @@ public class StructureClassImpl extends RoomClassImpl implements StructureClass case RoomPackage.STRUCTURE_CLASS__ANNOTATIONS: getAnnotations().clear(); return; - case RoomPackage.STRUCTURE_CLASS__BINDINGS: - getBindings().clear(); - return; case RoomPackage.STRUCTURE_CLASS__CONNECTIONS: getConnections().clear(); return; + case RoomPackage.STRUCTURE_CLASS__BINDINGS: + getBindings().clear(); + return; } super.eUnset(featureID); } @@ -233,10 +233,10 @@ public class StructureClassImpl extends RoomClassImpl implements StructureClass { case RoomPackage.STRUCTURE_CLASS__ANNOTATIONS: return annotations != null && !annotations.isEmpty(); - case RoomPackage.STRUCTURE_CLASS__BINDINGS: - return bindings != null && !bindings.isEmpty(); case RoomPackage.STRUCTURE_CLASS__CONNECTIONS: return connections != null && !connections.isEmpty(); + case RoomPackage.STRUCTURE_CLASS__BINDINGS: + return bindings != null && !bindings.isEmpty(); } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemClassImpl.java index 2246cb839..05b07a038 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemClassImpl.java @@ -27,9 +27,9 @@ import org.eclipse.etrice.core.room.SubSystemClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.etrice.core.room.impl.SubSystemClassImpl#getRelayPorts <em>Relay Ports</em>}</li> - * <li>{@link org.eclipse.etrice.core.room.impl.SubSystemClassImpl#getThreads <em>Threads</em>}</li> * <li>{@link org.eclipse.etrice.core.room.impl.SubSystemClassImpl#getActorInstanceMappings <em>Actor Instance Mappings</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.impl.SubSystemClassImpl#getThreads <em>Threads</em>}</li> + * <li>{@link org.eclipse.etrice.core.room.impl.SubSystemClassImpl#getRelayPorts <em>Relay Ports</em>}</li> * </ul> * </p> * @@ -38,14 +38,14 @@ import org.eclipse.etrice.core.room.SubSystemClass; public class SubSystemClassImpl extends ActorContainerClassImpl implements SubSystemClass { /** - * The cached value of the '{@link #getRelayPorts() <em>Relay Ports</em>}' containment reference list. + * The cached value of the '{@link #getActorInstanceMappings() <em>Actor Instance Mappings</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getRelayPorts() + * @see #getActorInstanceMappings() * @generated * @ordered */ - protected EList<Port> relayPorts; + protected EList<ActorInstanceMapping> actorInstanceMappings; /** * The cached value of the '{@link #getThreads() <em>Threads</em>}' containment reference list. @@ -58,14 +58,14 @@ public class SubSystemClassImpl extends ActorContainerClassImpl implements SubSy protected EList<LogicalThread> threads; /** - * The cached value of the '{@link #getActorInstanceMappings() <em>Actor Instance Mappings</em>}' containment reference list. + * The cached value of the '{@link #getRelayPorts() <em>Relay Ports</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getActorInstanceMappings() + * @see #getRelayPorts() * @generated * @ordered */ - protected EList<ActorInstanceMapping> actorInstanceMappings; + protected EList<Port> relayPorts; /** * <!-- begin-user-doc --> @@ -93,13 +93,13 @@ public class SubSystemClassImpl extends ActorContainerClassImpl implements SubSy * <!-- end-user-doc --> * @generated */ - public EList<Port> getRelayPorts() + public EList<ActorInstanceMapping> getActorInstanceMappings() { - if (relayPorts == null) + if (actorInstanceMappings == null) { - relayPorts = new EObjectContainmentEList<Port>(Port.class, this, RoomPackage.SUB_SYSTEM_CLASS__RELAY_PORTS); + actorInstanceMappings = new EObjectContainmentEList<ActorInstanceMapping>(ActorInstanceMapping.class, this, RoomPackage.SUB_SYSTEM_CLASS__ACTOR_INSTANCE_MAPPINGS); } - return relayPorts; + return actorInstanceMappings; } /** @@ -121,13 +121,13 @@ public class SubSystemClassImpl extends ActorContainerClassImpl implements SubSy * <!-- end-user-doc --> * @generated */ - public EList<ActorInstanceMapping> getActorInstanceMappings() + public EList<Port> getRelayPorts() { - if (actorInstanceMappings == null) + if (relayPorts == null) { - actorInstanceMappings = new EObjectContainmentEList<ActorInstanceMapping>(ActorInstanceMapping.class, this, RoomPackage.SUB_SYSTEM_CLASS__ACTOR_INSTANCE_MAPPINGS); + relayPorts = new EObjectContainmentEList<Port>(Port.class, this, RoomPackage.SUB_SYSTEM_CLASS__RELAY_PORTS); } - return actorInstanceMappings; + return relayPorts; } /** @@ -140,12 +140,12 @@ public class SubSystemClassImpl extends ActorContainerClassImpl implements SubSy { switch (featureID) { - case RoomPackage.SUB_SYSTEM_CLASS__RELAY_PORTS: - return ((InternalEList<?>)getRelayPorts()).basicRemove(otherEnd, msgs); - case RoomPackage.SUB_SYSTEM_CLASS__THREADS: - return ((InternalEList<?>)getThreads()).basicRemove(otherEnd, msgs); case RoomPackage.SUB_SYSTEM_CLASS__ACTOR_INSTANCE_MAPPINGS: return ((InternalEList<?>)getActorInstanceMappings()).basicRemove(otherEnd, msgs); + case RoomPackage.SUB_SYSTEM_CLASS__THREADS: + return ((InternalEList<?>)getThreads()).basicRemove(otherEnd, msgs); + case RoomPackage.SUB_SYSTEM_CLASS__RELAY_PORTS: + return ((InternalEList<?>)getRelayPorts()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -160,12 +160,12 @@ public class SubSystemClassImpl extends ActorContainerClassImpl implements SubSy { switch (featureID) { - case RoomPackage.SUB_SYSTEM_CLASS__RELAY_PORTS: - return getRelayPorts(); - case RoomPackage.SUB_SYSTEM_CLASS__THREADS: - return getThreads(); case RoomPackage.SUB_SYSTEM_CLASS__ACTOR_INSTANCE_MAPPINGS: return getActorInstanceMappings(); + case RoomPackage.SUB_SYSTEM_CLASS__THREADS: + return getThreads(); + case RoomPackage.SUB_SYSTEM_CLASS__RELAY_PORTS: + return getRelayPorts(); } return super.eGet(featureID, resolve, coreType); } @@ -181,17 +181,17 @@ public class SubSystemClassImpl extends ActorContainerClassImpl implements SubSy { switch (featureID) { - case RoomPackage.SUB_SYSTEM_CLASS__RELAY_PORTS: - getRelayPorts().clear(); - getRelayPorts().addAll((Collection<? extends Port>)newValue); + case RoomPackage.SUB_SYSTEM_CLASS__ACTOR_INSTANCE_MAPPINGS: + getActorInstanceMappings().clear(); + getActorInstanceMappings().addAll((Collection<? extends ActorInstanceMapping>)newValue); return; case RoomPackage.SUB_SYSTEM_CLASS__THREADS: getThreads().clear(); getThreads().addAll((Collection<? extends LogicalThread>)newValue); return; - case RoomPackage.SUB_SYSTEM_CLASS__ACTOR_INSTANCE_MAPPINGS: - getActorInstanceMappings().clear(); - getActorInstanceMappings().addAll((Collection<? extends ActorInstanceMapping>)newValue); + case RoomPackage.SUB_SYSTEM_CLASS__RELAY_PORTS: + getRelayPorts().clear(); + getRelayPorts().addAll((Collection<? extends Port>)newValue); return; } super.eSet(featureID, newValue); @@ -207,14 +207,14 @@ public class SubSystemClassImpl extends ActorContainerClassImpl implements SubSy { switch (featureID) { - case RoomPackage.SUB_SYSTEM_CLASS__RELAY_PORTS: - getRelayPorts().clear(); + case RoomPackage.SUB_SYSTEM_CLASS__ACTOR_INSTANCE_MAPPINGS: + getActorInstanceMappings().clear(); return; case RoomPackage.SUB_SYSTEM_CLASS__THREADS: getThreads().clear(); return; - case RoomPackage.SUB_SYSTEM_CLASS__ACTOR_INSTANCE_MAPPINGS: - getActorInstanceMappings().clear(); + case RoomPackage.SUB_SYSTEM_CLASS__RELAY_PORTS: + getRelayPorts().clear(); return; } super.eUnset(featureID); @@ -230,12 +230,12 @@ public class SubSystemClassImpl extends ActorContainerClassImpl implements SubSy { switch (featureID) { - case RoomPackage.SUB_SYSTEM_CLASS__RELAY_PORTS: - return relayPorts != null && !relayPorts.isEmpty(); - case RoomPackage.SUB_SYSTEM_CLASS__THREADS: - return threads != null && !threads.isEmpty(); case RoomPackage.SUB_SYSTEM_CLASS__ACTOR_INSTANCE_MAPPINGS: return actorInstanceMappings != null && !actorInstanceMappings.isEmpty(); + case RoomPackage.SUB_SYSTEM_CLASS__THREADS: + return threads != null && !threads.isEmpty(); + case RoomPackage.SUB_SYSTEM_CLASS__RELAY_PORTS: + return relayPorts != null && !relayPorts.isEmpty(); } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java index 5724c5604..b9914f8e9 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java @@ -630,24 +630,24 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Assignment cUserCode3Assignment_8_1 = (Assignment)cGroup_8.eContents().get(1); private final RuleCall cUserCode3DetailCodeParserRuleCall_8_1_0 = (RuleCall)cUserCode3Assignment_8_1.eContents().get(0); private final Alternatives cAlternatives_9 = (Alternatives)cGroup.eContents().get(9); - private final Assignment cAttributesAssignment_9_0 = (Assignment)cAlternatives_9.eContents().get(0); - private final RuleCall cAttributesAttributeParserRuleCall_9_0_0 = (RuleCall)cAttributesAssignment_9_0.eContents().get(0); + private final Assignment cOperationsAssignment_9_0 = (Assignment)cAlternatives_9.eContents().get(0); + private final RuleCall cOperationsStandardOperationParserRuleCall_9_0_0 = (RuleCall)cOperationsAssignment_9_0.eContents().get(0); private final Assignment cStructorsAssignment_9_1 = (Assignment)cAlternatives_9.eContents().get(1); private final RuleCall cStructorsClassStructorParserRuleCall_9_1_0 = (RuleCall)cStructorsAssignment_9_1.eContents().get(0); - private final Assignment cOperationsAssignment_9_2 = (Assignment)cAlternatives_9.eContents().get(2); - private final RuleCall cOperationsStandardOperationParserRuleCall_9_2_0 = (RuleCall)cOperationsAssignment_9_2.eContents().get(0); + private final Assignment cAttributesAssignment_9_2 = (Assignment)cAlternatives_9.eContents().get(2); + private final RuleCall cAttributesAttributeParserRuleCall_9_2_0 = (RuleCall)cAttributesAssignment_9_2.eContents().get(0); private final Keyword cRightCurlyBracketKeyword_10 = (Keyword)cGroup.eContents().get(10); //// TODOHRR: define detail level language? //DataClass: // "DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1" - // userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (attributes+=Attribute - // | structors+=ClassStructor | operations+=StandardOperation)* "}"; + // userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? + // (operations+=StandardOperation | structors+=ClassStructor | attributes+=Attribute)* "}"; public ParserRule getRule() { return rule; } //"DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1" - //userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (attributes+=Attribute - //| structors+=ClassStructor | operations+=StandardOperation)* "}" + //userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? + //(operations+=StandardOperation | structors+=ClassStructor | attributes+=Attribute)* "}" public Group getGroup() { return cGroup; } //"DataClass" @@ -725,14 +725,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //DetailCode public RuleCall getUserCode3DetailCodeParserRuleCall_8_1_0() { return cUserCode3DetailCodeParserRuleCall_8_1_0; } - //(attributes+=Attribute | structors+=ClassStructor | operations+=StandardOperation)* + //(operations+=StandardOperation | structors+=ClassStructor | attributes+=Attribute)* public Alternatives getAlternatives_9() { return cAlternatives_9; } - //attributes+=Attribute - public Assignment getAttributesAssignment_9_0() { return cAttributesAssignment_9_0; } + //operations+=StandardOperation + public Assignment getOperationsAssignment_9_0() { return cOperationsAssignment_9_0; } - //Attribute - public RuleCall getAttributesAttributeParserRuleCall_9_0_0() { return cAttributesAttributeParserRuleCall_9_0_0; } + //StandardOperation + public RuleCall getOperationsStandardOperationParserRuleCall_9_0_0() { return cOperationsStandardOperationParserRuleCall_9_0_0; } //structors+=ClassStructor public Assignment getStructorsAssignment_9_1() { return cStructorsAssignment_9_1; } @@ -740,11 +740,11 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //ClassStructor public RuleCall getStructorsClassStructorParserRuleCall_9_1_0() { return cStructorsClassStructorParserRuleCall_9_1_0; } - //operations+=StandardOperation - public Assignment getOperationsAssignment_9_2() { return cOperationsAssignment_9_2; } + //attributes+=Attribute + public Assignment getAttributesAssignment_9_2() { return cAttributesAssignment_9_2; } - //StandardOperation - public RuleCall getOperationsStandardOperationParserRuleCall_9_2_0() { return cOperationsStandardOperationParserRuleCall_9_2_0; } + //Attribute + public RuleCall getAttributesAttributeParserRuleCall_9_2_0() { return cAttributesAttributeParserRuleCall_9_2_0; } //"}" public Keyword getRightCurlyBracketKeyword_10() { return cRightCurlyBracketKeyword_10; } @@ -1532,21 +1532,21 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Assignment cUserCodeAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1); private final RuleCall cUserCodeDetailCodeParserRuleCall_2_1_0 = (RuleCall)cUserCodeAssignment_2_1.eContents().get(0); private final Alternatives cAlternatives_3 = (Alternatives)cGroup.eContents().get(3); - private final Assignment cAttributesAssignment_3_0 = (Assignment)cAlternatives_3.eContents().get(0); - private final RuleCall cAttributesAttributeParserRuleCall_3_0_0 = (RuleCall)cAttributesAssignment_3_0.eContents().get(0); + private final Assignment cMsgHandlersAssignment_3_0 = (Assignment)cAlternatives_3.eContents().get(0); + private final RuleCall cMsgHandlersMessageHandlerParserRuleCall_3_0_0 = (RuleCall)cMsgHandlersAssignment_3_0.eContents().get(0); private final Assignment cOperationsAssignment_3_1 = (Assignment)cAlternatives_3.eContents().get(1); private final RuleCall cOperationsPortOperationParserRuleCall_3_1_0 = (RuleCall)cOperationsAssignment_3_1.eContents().get(0); - private final Assignment cMsgHandlersAssignment_3_2 = (Assignment)cAlternatives_3.eContents().get(2); - private final RuleCall cMsgHandlersMessageHandlerParserRuleCall_3_2_0 = (RuleCall)cMsgHandlersAssignment_3_2.eContents().get(0); + private final Assignment cAttributesAssignment_3_2 = (Assignment)cAlternatives_3.eContents().get(2); + private final RuleCall cAttributesAttributeParserRuleCall_3_2_0 = (RuleCall)cAttributesAssignment_3_2.eContents().get(0); private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4); //PortClass: - // {PortClass} "{" ("usercode" userCode=DetailCode)? (attributes+=Attribute | operations+=PortOperation | - // msgHandlers+=MessageHandler)* "}"; + // {PortClass} "{" ("usercode" userCode=DetailCode)? (msgHandlers+=MessageHandler | operations+=PortOperation | + // attributes+=Attribute)* "}"; public ParserRule getRule() { return rule; } - //{PortClass} "{" ("usercode" userCode=DetailCode)? (attributes+=Attribute | operations+=PortOperation | - //msgHandlers+=MessageHandler)* "}" + //{PortClass} "{" ("usercode" userCode=DetailCode)? (msgHandlers+=MessageHandler | operations+=PortOperation | + //attributes+=Attribute)* "}" public Group getGroup() { return cGroup; } //{PortClass} @@ -1567,14 +1567,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //DetailCode public RuleCall getUserCodeDetailCodeParserRuleCall_2_1_0() { return cUserCodeDetailCodeParserRuleCall_2_1_0; } - //(attributes+=Attribute | operations+=PortOperation | msgHandlers+=MessageHandler)* + //(msgHandlers+=MessageHandler | operations+=PortOperation | attributes+=Attribute)* public Alternatives getAlternatives_3() { return cAlternatives_3; } - //attributes+=Attribute - public Assignment getAttributesAssignment_3_0() { return cAttributesAssignment_3_0; } + //msgHandlers+=MessageHandler + public Assignment getMsgHandlersAssignment_3_0() { return cMsgHandlersAssignment_3_0; } - //Attribute - public RuleCall getAttributesAttributeParserRuleCall_3_0_0() { return cAttributesAttributeParserRuleCall_3_0_0; } + //MessageHandler + public RuleCall getMsgHandlersMessageHandlerParserRuleCall_3_0_0() { return cMsgHandlersMessageHandlerParserRuleCall_3_0_0; } //operations+=PortOperation public Assignment getOperationsAssignment_3_1() { return cOperationsAssignment_3_1; } @@ -1582,11 +1582,11 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //PortOperation public RuleCall getOperationsPortOperationParserRuleCall_3_1_0() { return cOperationsPortOperationParserRuleCall_3_1_0; } - //msgHandlers+=MessageHandler - public Assignment getMsgHandlersAssignment_3_2() { return cMsgHandlersAssignment_3_2; } + //attributes+=Attribute + public Assignment getAttributesAssignment_3_2() { return cAttributesAssignment_3_2; } - //MessageHandler - public RuleCall getMsgHandlersMessageHandlerParserRuleCall_3_2_0() { return cMsgHandlersMessageHandlerParserRuleCall_3_2_0; } + //Attribute + public RuleCall getAttributesAttributeParserRuleCall_3_2_0() { return cAttributesAttributeParserRuleCall_3_2_0; } //"}" public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; } @@ -1731,10 +1731,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cInterfaceKeyword_7_0 = (Keyword)cGroup_7.eContents().get(0); private final Keyword cLeftCurlyBracketKeyword_7_1 = (Keyword)cGroup_7.eContents().get(1); private final Alternatives cAlternatives_7_2 = (Alternatives)cGroup_7.eContents().get(2); - private final Assignment cInterfacePortsAssignment_7_2_0 = (Assignment)cAlternatives_7_2.eContents().get(0); - private final RuleCall cInterfacePortsPortParserRuleCall_7_2_0_0 = (RuleCall)cInterfacePortsAssignment_7_2_0.eContents().get(0); - private final Assignment cServiceProvisionPointsAssignment_7_2_1 = (Assignment)cAlternatives_7_2.eContents().get(1); - private final RuleCall cServiceProvisionPointsSPPParserRuleCall_7_2_1_0 = (RuleCall)cServiceProvisionPointsAssignment_7_2_1.eContents().get(0); + private final Assignment cServiceProvisionPointsAssignment_7_2_0 = (Assignment)cAlternatives_7_2.eContents().get(0); + private final RuleCall cServiceProvisionPointsSPPParserRuleCall_7_2_0_0 = (RuleCall)cServiceProvisionPointsAssignment_7_2_0.eContents().get(0); + private final Assignment cInterfacePortsAssignment_7_2_1 = (Assignment)cAlternatives_7_2.eContents().get(1); + private final RuleCall cInterfacePortsPortParserRuleCall_7_2_1_0 = (RuleCall)cInterfacePortsAssignment_7_2_1.eContents().get(0); private final Keyword cRightCurlyBracketKeyword_7_3 = (Keyword)cGroup_7.eContents().get(3); private final Group cGroup_8 = (Group)cGroup.eContents().get(8); private final Keyword cStructureKeyword_8_0 = (Keyword)cGroup_8.eContents().get(0); @@ -1754,22 +1754,22 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Assignment cUserCode3Assignment_8_5_1 = (Assignment)cGroup_8_5.eContents().get(1); private final RuleCall cUserCode3DetailCodeParserRuleCall_8_5_1_0 = (RuleCall)cUserCode3Assignment_8_5_1.eContents().get(0); private final Alternatives cAlternatives_8_6 = (Alternatives)cGroup_8.eContents().get(6); - private final Assignment cInternalPortsAssignment_8_6_0 = (Assignment)cAlternatives_8_6.eContents().get(0); - private final RuleCall cInternalPortsPortParserRuleCall_8_6_0_0 = (RuleCall)cInternalPortsAssignment_8_6_0.eContents().get(0); - private final Assignment cExternalPortsAssignment_8_6_1 = (Assignment)cAlternatives_8_6.eContents().get(1); - private final RuleCall cExternalPortsExternalPortParserRuleCall_8_6_1_0 = (RuleCall)cExternalPortsAssignment_8_6_1.eContents().get(0); - private final Assignment cServiceAccessPointsAssignment_8_6_2 = (Assignment)cAlternatives_8_6.eContents().get(2); - private final RuleCall cServiceAccessPointsSAPParserRuleCall_8_6_2_0 = (RuleCall)cServiceAccessPointsAssignment_8_6_2.eContents().get(0); + private final Assignment cConnectionsAssignment_8_6_0 = (Assignment)cAlternatives_8_6.eContents().get(0); + private final RuleCall cConnectionsLayerConnectionParserRuleCall_8_6_0_0 = (RuleCall)cConnectionsAssignment_8_6_0.eContents().get(0); + private final Assignment cBindingsAssignment_8_6_1 = (Assignment)cAlternatives_8_6.eContents().get(1); + private final RuleCall cBindingsBindingParserRuleCall_8_6_1_0 = (RuleCall)cBindingsAssignment_8_6_1.eContents().get(0); + private final Assignment cServiceImplementationsAssignment_8_6_2 = (Assignment)cAlternatives_8_6.eContents().get(2); + private final RuleCall cServiceImplementationsServiceImplementationParserRuleCall_8_6_2_0 = (RuleCall)cServiceImplementationsAssignment_8_6_2.eContents().get(0); private final Assignment cAttributesAssignment_8_6_3 = (Assignment)cAlternatives_8_6.eContents().get(3); private final RuleCall cAttributesAttributeParserRuleCall_8_6_3_0 = (RuleCall)cAttributesAssignment_8_6_3.eContents().get(0); private final Assignment cActorRefsAssignment_8_6_4 = (Assignment)cAlternatives_8_6.eContents().get(4); private final RuleCall cActorRefsActorRefParserRuleCall_8_6_4_0 = (RuleCall)cActorRefsAssignment_8_6_4.eContents().get(0); - private final Assignment cServiceImplementationsAssignment_8_6_5 = (Assignment)cAlternatives_8_6.eContents().get(5); - private final RuleCall cServiceImplementationsServiceImplementationParserRuleCall_8_6_5_0 = (RuleCall)cServiceImplementationsAssignment_8_6_5.eContents().get(0); - private final Assignment cBindingsAssignment_8_6_6 = (Assignment)cAlternatives_8_6.eContents().get(6); - private final RuleCall cBindingsBindingParserRuleCall_8_6_6_0 = (RuleCall)cBindingsAssignment_8_6_6.eContents().get(0); - private final Assignment cConnectionsAssignment_8_6_7 = (Assignment)cAlternatives_8_6.eContents().get(7); - private final RuleCall cConnectionsLayerConnectionParserRuleCall_8_6_7_0 = (RuleCall)cConnectionsAssignment_8_6_7.eContents().get(0); + private final Assignment cServiceAccessPointsAssignment_8_6_5 = (Assignment)cAlternatives_8_6.eContents().get(5); + private final RuleCall cServiceAccessPointsSAPParserRuleCall_8_6_5_0 = (RuleCall)cServiceAccessPointsAssignment_8_6_5.eContents().get(0); + private final Assignment cInternalPortsAssignment_8_6_6 = (Assignment)cAlternatives_8_6.eContents().get(6); + private final RuleCall cInternalPortsPortParserRuleCall_8_6_6_0 = (RuleCall)cInternalPortsAssignment_8_6_6.eContents().get(0); + private final Assignment cExternalPortsAssignment_8_6_7 = (Assignment)cAlternatives_8_6.eContents().get(7); + private final RuleCall cExternalPortsExternalPortParserRuleCall_8_6_7_0 = (RuleCall)cExternalPortsAssignment_8_6_7.eContents().get(0); private final Keyword cRightCurlyBracketKeyword_8_7 = (Keyword)cGroup_8.eContents().get(7); private final Group cGroup_9 = (Group)cGroup.eContents().get(9); private final Keyword cBehaviorKeyword_9_0 = (Keyword)cGroup_9.eContents().get(0); @@ -1779,10 +1779,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Assignment cBehaviorAnnotationsAssignment_9_3 = (Assignment)cGroup_9.eContents().get(3); private final RuleCall cBehaviorAnnotationsAnnotationParserRuleCall_9_3_0 = (RuleCall)cBehaviorAnnotationsAssignment_9_3.eContents().get(0); private final Alternatives cAlternatives_9_4 = (Alternatives)cGroup_9.eContents().get(4); - private final Assignment cStructorsAssignment_9_4_0 = (Assignment)cAlternatives_9_4.eContents().get(0); - private final RuleCall cStructorsClassStructorParserRuleCall_9_4_0_0 = (RuleCall)cStructorsAssignment_9_4_0.eContents().get(0); - private final Assignment cOperationsAssignment_9_4_1 = (Assignment)cAlternatives_9_4.eContents().get(1); - private final RuleCall cOperationsStandardOperationParserRuleCall_9_4_1_0 = (RuleCall)cOperationsAssignment_9_4_1.eContents().get(0); + private final Assignment cOperationsAssignment_9_4_0 = (Assignment)cAlternatives_9_4.eContents().get(0); + private final RuleCall cOperationsStandardOperationParserRuleCall_9_4_0_0 = (RuleCall)cOperationsAssignment_9_4_0.eContents().get(0); + private final Assignment cStructorsAssignment_9_4_1 = (Assignment)cAlternatives_9_4.eContents().get(1); + private final RuleCall cStructorsClassStructorParserRuleCall_9_4_1_0 = (RuleCall)cStructorsAssignment_9_4_1.eContents().get(0); private final Assignment cStateMachineAssignment_9_5 = (Assignment)cGroup_9.eContents().get(5); private final RuleCall cStateMachineStateMachineParserRuleCall_9_5_0 = (RuleCall)cStateMachineAssignment_9_5.eContents().get(0); private final Keyword cRightCurlyBracketKeyword_9_6 = (Keyword)cGroup_9.eContents().get(6); @@ -1797,23 +1797,23 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// since double containment is not supported we decided to define external ports as reference to interface ports //ActorClass: // (abstract?="abstract"? & commType=ComponentCommunicationType?) "ActorClass" name=ID docu=Documentation? ("extends" - // base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" (interfacePorts+=Port | - // serviceProvisionPoints+=SPP)* "}")? ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? - // ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (internalPorts+=Port | - // externalPorts+=ExternalPort | serviceAccessPoints+=SAP | attributes+=Attribute | actorRefs+=ActorRef | - // serviceImplementations+=ServiceImplementation | bindings+=Binding | connections+=LayerConnection)* "}")? ("Behavior" - // behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* (structors+=ClassStructor | - // operations+=StandardOperation)* stateMachine=StateMachine? "}")? "}"; + // base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" (serviceProvisionPoints+=SPP | + // interfacePorts+=Port)* "}")? ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? + // ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer + // (connections+=LayerConnection | bindings+=Binding | serviceImplementations+=ServiceImplementation | + // attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP | internalPorts+=Port | + // externalPorts+=ExternalPort)* "}")? ("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* + // (operations+=StandardOperation | structors+=ClassStructor)* stateMachine=StateMachine? "}")? "}"; public ParserRule getRule() { return rule; } //(abstract?="abstract"? & commType=ComponentCommunicationType?) "ActorClass" name=ID docu=Documentation? ("extends" - //base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" (interfacePorts+=Port | - //serviceProvisionPoints+=SPP)* "}")? ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? - //("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (internalPorts+=Port | - //externalPorts+=ExternalPort | serviceAccessPoints+=SAP | attributes+=Attribute | actorRefs+=ActorRef | - //serviceImplementations+=ServiceImplementation | bindings+=Binding | connections+=LayerConnection)* "}")? ("Behavior" - //behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* (structors+=ClassStructor | - //operations+=StandardOperation)* stateMachine=StateMachine? "}")? "}" + //base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" (serviceProvisionPoints+=SPP | + //interfacePorts+=Port)* "}")? ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? + //("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer + //(connections+=LayerConnection | bindings+=Binding | serviceImplementations+=ServiceImplementation | + //attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP | internalPorts+=Port | + //externalPorts+=ExternalPort)* "}")? ("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* + //(operations+=StandardOperation | structors+=ClassStructor)* stateMachine=StateMachine? "}")? "}" public Group getGroup() { return cGroup; } //abstract?="abstract"? & commType=ComponentCommunicationType? @@ -1870,7 +1870,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //Annotation public RuleCall getAnnotationsAnnotationParserRuleCall_6_0() { return cAnnotationsAnnotationParserRuleCall_6_0; } - //("Interface" "{" (interfacePorts+=Port | serviceProvisionPoints+=SPP)* "}")? + //("Interface" "{" (serviceProvisionPoints+=SPP | interfacePorts+=Port)* "}")? public Group getGroup_7() { return cGroup_7; } //"Interface" @@ -1879,28 +1879,29 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //"{" public Keyword getLeftCurlyBracketKeyword_7_1() { return cLeftCurlyBracketKeyword_7_1; } - //(interfacePorts+=Port | serviceProvisionPoints+=SPP)* + //(serviceProvisionPoints+=SPP | interfacePorts+=Port)* public Alternatives getAlternatives_7_2() { return cAlternatives_7_2; } - //interfacePorts+=Port - public Assignment getInterfacePortsAssignment_7_2_0() { return cInterfacePortsAssignment_7_2_0; } - - //Port - public RuleCall getInterfacePortsPortParserRuleCall_7_2_0_0() { return cInterfacePortsPortParserRuleCall_7_2_0_0; } - //serviceProvisionPoints+=SPP - public Assignment getServiceProvisionPointsAssignment_7_2_1() { return cServiceProvisionPointsAssignment_7_2_1; } + public Assignment getServiceProvisionPointsAssignment_7_2_0() { return cServiceProvisionPointsAssignment_7_2_0; } //SPP - public RuleCall getServiceProvisionPointsSPPParserRuleCall_7_2_1_0() { return cServiceProvisionPointsSPPParserRuleCall_7_2_1_0; } + public RuleCall getServiceProvisionPointsSPPParserRuleCall_7_2_0_0() { return cServiceProvisionPointsSPPParserRuleCall_7_2_0_0; } + + //interfacePorts+=Port + public Assignment getInterfacePortsAssignment_7_2_1() { return cInterfacePortsAssignment_7_2_1; } + + //Port + public RuleCall getInterfacePortsPortParserRuleCall_7_2_1_0() { return cInterfacePortsPortParserRuleCall_7_2_1_0; } //"}" public Keyword getRightCurlyBracketKeyword_7_3() { return cRightCurlyBracketKeyword_7_3; } //("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? - //("usercode3" userCode3=DetailCode)? (internalPorts+=Port | externalPorts+=ExternalPort | serviceAccessPoints+=SAP | - //attributes+=Attribute | actorRefs+=ActorRef | serviceImplementations+=ServiceImplementation | bindings+=Binding | - //connections+=LayerConnection)* "}")? + //("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer + //(connections+=LayerConnection | bindings+=Binding | serviceImplementations+=ServiceImplementation | + //attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP | internalPorts+=Port | + //externalPorts+=ExternalPort)* "}")? public Group getGroup_8() { return cGroup_8; } //"Structure" @@ -1951,28 +1952,30 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //DetailCode public RuleCall getUserCode3DetailCodeParserRuleCall_8_5_1_0() { return cUserCode3DetailCodeParserRuleCall_8_5_1_0; } - //(internalPorts+=Port | externalPorts+=ExternalPort | serviceAccessPoints+=SAP | attributes+=Attribute | - //actorRefs+=ActorRef | serviceImplementations+=ServiceImplementation | bindings+=Binding | - //connections+=LayerConnection)* + //// workaround: reverse the order for serializer + //(connections+=LayerConnection | bindings+=Binding | serviceImplementations+=ServiceImplementation | + //attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP | internalPorts+=Port | + //externalPorts+=ExternalPort)* public Alternatives getAlternatives_8_6() { return cAlternatives_8_6; } - //internalPorts+=Port - public Assignment getInternalPortsAssignment_8_6_0() { return cInternalPortsAssignment_8_6_0; } + //// workaround: reverse the order for serializer + //connections+=LayerConnection + public Assignment getConnectionsAssignment_8_6_0() { return cConnectionsAssignment_8_6_0; } - //Port - public RuleCall getInternalPortsPortParserRuleCall_8_6_0_0() { return cInternalPortsPortParserRuleCall_8_6_0_0; } + //LayerConnection + public RuleCall getConnectionsLayerConnectionParserRuleCall_8_6_0_0() { return cConnectionsLayerConnectionParserRuleCall_8_6_0_0; } - //externalPorts+=ExternalPort - public Assignment getExternalPortsAssignment_8_6_1() { return cExternalPortsAssignment_8_6_1; } + //bindings+=Binding + public Assignment getBindingsAssignment_8_6_1() { return cBindingsAssignment_8_6_1; } - //ExternalPort - public RuleCall getExternalPortsExternalPortParserRuleCall_8_6_1_0() { return cExternalPortsExternalPortParserRuleCall_8_6_1_0; } + //Binding + public RuleCall getBindingsBindingParserRuleCall_8_6_1_0() { return cBindingsBindingParserRuleCall_8_6_1_0; } - //serviceAccessPoints+=SAP - public Assignment getServiceAccessPointsAssignment_8_6_2() { return cServiceAccessPointsAssignment_8_6_2; } + //serviceImplementations+=ServiceImplementation + public Assignment getServiceImplementationsAssignment_8_6_2() { return cServiceImplementationsAssignment_8_6_2; } - //SAP - public RuleCall getServiceAccessPointsSAPParserRuleCall_8_6_2_0() { return cServiceAccessPointsSAPParserRuleCall_8_6_2_0; } + //ServiceImplementation + public RuleCall getServiceImplementationsServiceImplementationParserRuleCall_8_6_2_0() { return cServiceImplementationsServiceImplementationParserRuleCall_8_6_2_0; } //attributes+=Attribute public Assignment getAttributesAssignment_8_6_3() { return cAttributesAssignment_8_6_3; } @@ -1986,29 +1989,29 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //ActorRef public RuleCall getActorRefsActorRefParserRuleCall_8_6_4_0() { return cActorRefsActorRefParserRuleCall_8_6_4_0; } - //serviceImplementations+=ServiceImplementation - public Assignment getServiceImplementationsAssignment_8_6_5() { return cServiceImplementationsAssignment_8_6_5; } + //serviceAccessPoints+=SAP + public Assignment getServiceAccessPointsAssignment_8_6_5() { return cServiceAccessPointsAssignment_8_6_5; } - //ServiceImplementation - public RuleCall getServiceImplementationsServiceImplementationParserRuleCall_8_6_5_0() { return cServiceImplementationsServiceImplementationParserRuleCall_8_6_5_0; } + //SAP + public RuleCall getServiceAccessPointsSAPParserRuleCall_8_6_5_0() { return cServiceAccessPointsSAPParserRuleCall_8_6_5_0; } - //bindings+=Binding - public Assignment getBindingsAssignment_8_6_6() { return cBindingsAssignment_8_6_6; } + //internalPorts+=Port + public Assignment getInternalPortsAssignment_8_6_6() { return cInternalPortsAssignment_8_6_6; } - //Binding - public RuleCall getBindingsBindingParserRuleCall_8_6_6_0() { return cBindingsBindingParserRuleCall_8_6_6_0; } + //Port + public RuleCall getInternalPortsPortParserRuleCall_8_6_6_0() { return cInternalPortsPortParserRuleCall_8_6_6_0; } - //connections+=LayerConnection - public Assignment getConnectionsAssignment_8_6_7() { return cConnectionsAssignment_8_6_7; } + //externalPorts+=ExternalPort + public Assignment getExternalPortsAssignment_8_6_7() { return cExternalPortsAssignment_8_6_7; } - //LayerConnection - public RuleCall getConnectionsLayerConnectionParserRuleCall_8_6_7_0() { return cConnectionsLayerConnectionParserRuleCall_8_6_7_0; } + //ExternalPort + public RuleCall getExternalPortsExternalPortParserRuleCall_8_6_7_0() { return cExternalPortsExternalPortParserRuleCall_8_6_7_0; } //"}" public Keyword getRightCurlyBracketKeyword_8_7() { return cRightCurlyBracketKeyword_8_7; } - //("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* (structors+=ClassStructor | - //operations+=StandardOperation)* stateMachine=StateMachine? "}")? + //("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* (operations+=StandardOperation | + //structors+=ClassStructor)* stateMachine=StateMachine? "}")? public Group getGroup_9() { return cGroup_9; } //"Behavior" @@ -2029,20 +2032,20 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //Annotation public RuleCall getBehaviorAnnotationsAnnotationParserRuleCall_9_3_0() { return cBehaviorAnnotationsAnnotationParserRuleCall_9_3_0; } - //(structors+=ClassStructor | operations+=StandardOperation)* + //(operations+=StandardOperation | structors+=ClassStructor)* public Alternatives getAlternatives_9_4() { return cAlternatives_9_4; } - //structors+=ClassStructor - public Assignment getStructorsAssignment_9_4_0() { return cStructorsAssignment_9_4_0; } - - //ClassStructor - public RuleCall getStructorsClassStructorParserRuleCall_9_4_0_0() { return cStructorsClassStructorParserRuleCall_9_4_0_0; } - //operations+=StandardOperation - public Assignment getOperationsAssignment_9_4_1() { return cOperationsAssignment_9_4_1; } + public Assignment getOperationsAssignment_9_4_0() { return cOperationsAssignment_9_4_0; } //StandardOperation - public RuleCall getOperationsStandardOperationParserRuleCall_9_4_1_0() { return cOperationsStandardOperationParserRuleCall_9_4_1_0; } + public RuleCall getOperationsStandardOperationParserRuleCall_9_4_0_0() { return cOperationsStandardOperationParserRuleCall_9_4_0_0; } + + //structors+=ClassStructor + public Assignment getStructorsAssignment_9_4_1() { return cStructorsAssignment_9_4_1; } + + //ClassStructor + public RuleCall getStructorsClassStructorParserRuleCall_9_4_1_0() { return cStructorsClassStructorParserRuleCall_9_4_1_0; } //stateMachine=StateMachine? public Assignment getStateMachineAssignment_9_5() { return cStateMachineAssignment_9_5; } @@ -2303,21 +2306,21 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Assignment cAnnotationsAssignment_4 = (Assignment)cGroup.eContents().get(4); private final RuleCall cAnnotationsAnnotationParserRuleCall_4_0 = (RuleCall)cAnnotationsAssignment_4.eContents().get(0); private final Alternatives cAlternatives_5 = (Alternatives)cGroup.eContents().get(5); - private final Assignment cSubSystemsAssignment_5_0 = (Assignment)cAlternatives_5.eContents().get(0); - private final RuleCall cSubSystemsSubSystemRefParserRuleCall_5_0_0 = (RuleCall)cSubSystemsAssignment_5_0.eContents().get(0); + private final Assignment cConnectionsAssignment_5_0 = (Assignment)cAlternatives_5.eContents().get(0); + private final RuleCall cConnectionsLayerConnectionParserRuleCall_5_0_0 = (RuleCall)cConnectionsAssignment_5_0.eContents().get(0); private final Assignment cBindingsAssignment_5_1 = (Assignment)cAlternatives_5.eContents().get(1); private final RuleCall cBindingsBindingParserRuleCall_5_1_0 = (RuleCall)cBindingsAssignment_5_1.eContents().get(0); - private final Assignment cConnectionsAssignment_5_2 = (Assignment)cAlternatives_5.eContents().get(2); - private final RuleCall cConnectionsLayerConnectionParserRuleCall_5_2_0 = (RuleCall)cConnectionsAssignment_5_2.eContents().get(0); + private final Assignment cSubSystemsAssignment_5_2 = (Assignment)cAlternatives_5.eContents().get(2); + private final RuleCall cSubSystemsSubSystemRefParserRuleCall_5_2_0 = (RuleCall)cSubSystemsAssignment_5_2.eContents().get(0); private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6); //LogicalSystem: - // "LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* (subSystems+=SubSystemRef | - // bindings+=Binding | connections+=LayerConnection)* "}"; + // "LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* (connections+=LayerConnection | + // bindings+=Binding | subSystems+=SubSystemRef)* "}"; public ParserRule getRule() { return rule; } - //"LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* (subSystems+=SubSystemRef | bindings+=Binding | - //connections+=LayerConnection)* "}" + //"LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* (connections+=LayerConnection | + //bindings+=Binding | subSystems+=SubSystemRef)* "}" public Group getGroup() { return cGroup; } //"LogicalSystem" @@ -2344,14 +2347,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //Annotation public RuleCall getAnnotationsAnnotationParserRuleCall_4_0() { return cAnnotationsAnnotationParserRuleCall_4_0; } - //(subSystems+=SubSystemRef | bindings+=Binding | connections+=LayerConnection)* + //(connections+=LayerConnection | bindings+=Binding | subSystems+=SubSystemRef)* public Alternatives getAlternatives_5() { return cAlternatives_5; } - //subSystems+=SubSystemRef - public Assignment getSubSystemsAssignment_5_0() { return cSubSystemsAssignment_5_0; } + //connections+=LayerConnection + public Assignment getConnectionsAssignment_5_0() { return cConnectionsAssignment_5_0; } - //SubSystemRef - public RuleCall getSubSystemsSubSystemRefParserRuleCall_5_0_0() { return cSubSystemsSubSystemRefParserRuleCall_5_0_0; } + //LayerConnection + public RuleCall getConnectionsLayerConnectionParserRuleCall_5_0_0() { return cConnectionsLayerConnectionParserRuleCall_5_0_0; } //bindings+=Binding public Assignment getBindingsAssignment_5_1() { return cBindingsAssignment_5_1; } @@ -2359,11 +2362,11 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //Binding public RuleCall getBindingsBindingParserRuleCall_5_1_0() { return cBindingsBindingParserRuleCall_5_1_0; } - //connections+=LayerConnection - public Assignment getConnectionsAssignment_5_2() { return cConnectionsAssignment_5_2; } + //subSystems+=SubSystemRef + public Assignment getSubSystemsAssignment_5_2() { return cSubSystemsAssignment_5_2; } - //LayerConnection - public RuleCall getConnectionsLayerConnectionParserRuleCall_5_2_0() { return cConnectionsLayerConnectionParserRuleCall_5_2_0; } + //SubSystemRef + public RuleCall getSubSystemsSubSystemRefParserRuleCall_5_2_0() { return cSubSystemsSubSystemRefParserRuleCall_5_2_0; } //"}" public Keyword getRightCurlyBracketKeyword_6() { return cRightCurlyBracketKeyword_6; } @@ -2461,33 +2464,33 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Assignment cUserCode3Assignment_7_1 = (Assignment)cGroup_7.eContents().get(1); private final RuleCall cUserCode3DetailCodeParserRuleCall_7_1_0 = (RuleCall)cUserCode3Assignment_7_1.eContents().get(0); private final Alternatives cAlternatives_8 = (Alternatives)cGroup.eContents().get(8); - private final Assignment cRelayPortsAssignment_8_0 = (Assignment)cAlternatives_8.eContents().get(0); - private final RuleCall cRelayPortsPortParserRuleCall_8_0_0 = (RuleCall)cRelayPortsAssignment_8_0.eContents().get(0); - private final Assignment cServiceProvisionPointsAssignment_8_1 = (Assignment)cAlternatives_8.eContents().get(1); - private final RuleCall cServiceProvisionPointsSPPParserRuleCall_8_1_0 = (RuleCall)cServiceProvisionPointsAssignment_8_1.eContents().get(0); - private final Assignment cActorRefsAssignment_8_2 = (Assignment)cAlternatives_8.eContents().get(2); - private final RuleCall cActorRefsActorRefParserRuleCall_8_2_0 = (RuleCall)cActorRefsAssignment_8_2.eContents().get(0); + private final Assignment cActorInstanceMappingsAssignment_8_0 = (Assignment)cAlternatives_8.eContents().get(0); + private final RuleCall cActorInstanceMappingsActorInstanceMappingParserRuleCall_8_0_0 = (RuleCall)cActorInstanceMappingsAssignment_8_0.eContents().get(0); + private final Assignment cThreadsAssignment_8_1 = (Assignment)cAlternatives_8.eContents().get(1); + private final RuleCall cThreadsLogicalThreadParserRuleCall_8_1_0 = (RuleCall)cThreadsAssignment_8_1.eContents().get(0); + private final Assignment cConnectionsAssignment_8_2 = (Assignment)cAlternatives_8.eContents().get(2); + private final RuleCall cConnectionsLayerConnectionParserRuleCall_8_2_0 = (RuleCall)cConnectionsAssignment_8_2.eContents().get(0); private final Assignment cBindingsAssignment_8_3 = (Assignment)cAlternatives_8.eContents().get(3); private final RuleCall cBindingsBindingParserRuleCall_8_3_0 = (RuleCall)cBindingsAssignment_8_3.eContents().get(0); - private final Assignment cConnectionsAssignment_8_4 = (Assignment)cAlternatives_8.eContents().get(4); - private final RuleCall cConnectionsLayerConnectionParserRuleCall_8_4_0 = (RuleCall)cConnectionsAssignment_8_4.eContents().get(0); - private final Assignment cThreadsAssignment_8_5 = (Assignment)cAlternatives_8.eContents().get(5); - private final RuleCall cThreadsLogicalThreadParserRuleCall_8_5_0 = (RuleCall)cThreadsAssignment_8_5.eContents().get(0); - private final Assignment cActorInstanceMappingsAssignment_8_6 = (Assignment)cAlternatives_8.eContents().get(6); - private final RuleCall cActorInstanceMappingsActorInstanceMappingParserRuleCall_8_6_0 = (RuleCall)cActorInstanceMappingsAssignment_8_6.eContents().get(0); + private final Assignment cActorRefsAssignment_8_4 = (Assignment)cAlternatives_8.eContents().get(4); + private final RuleCall cActorRefsActorRefParserRuleCall_8_4_0 = (RuleCall)cActorRefsAssignment_8_4.eContents().get(0); + private final Assignment cServiceProvisionPointsAssignment_8_5 = (Assignment)cAlternatives_8.eContents().get(5); + private final RuleCall cServiceProvisionPointsSPPParserRuleCall_8_5_0 = (RuleCall)cServiceProvisionPointsAssignment_8_5.eContents().get(0); + private final Assignment cRelayPortsAssignment_8_6 = (Assignment)cAlternatives_8.eContents().get(6); + private final RuleCall cRelayPortsPortParserRuleCall_8_6_0 = (RuleCall)cRelayPortsAssignment_8_6.eContents().get(0); private final Keyword cRightCurlyBracketKeyword_9 = (Keyword)cGroup.eContents().get(9); //SubSystemClass: // "SubSystemClass" name=ID docu=Documentation? "{" annotations+=Annotation* ("usercode1" userCode1=DetailCode)? - // ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (relayPorts+=Port | - // serviceProvisionPoints+=SPP | actorRefs+=ActorRef | bindings+=Binding | connections+=LayerConnection | - // threads+=LogicalThread | actorInstanceMappings+=ActorInstanceMapping)* "}"; + // ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer + // (actorInstanceMappings+=ActorInstanceMapping | threads+=LogicalThread | connections+=LayerConnection | + // bindings+=Binding | actorRefs+=ActorRef | serviceProvisionPoints+=SPP | relayPorts+=Port)* "}"; public ParserRule getRule() { return rule; } //"SubSystemClass" name=ID docu=Documentation? "{" annotations+=Annotation* ("usercode1" userCode1=DetailCode)? - //("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (relayPorts+=Port | - //serviceProvisionPoints+=SPP | actorRefs+=ActorRef | bindings+=Binding | connections+=LayerConnection | - //threads+=LogicalThread | actorInstanceMappings+=ActorInstanceMapping)* "}" + //("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer + //(actorInstanceMappings+=ActorInstanceMapping | threads+=LogicalThread | connections+=LayerConnection | bindings+=Binding + //| actorRefs+=ActorRef | serviceProvisionPoints+=SPP | relayPorts+=Port)* "}" public Group getGroup() { return cGroup; } //"SubSystemClass" @@ -2550,27 +2553,29 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //DetailCode public RuleCall getUserCode3DetailCodeParserRuleCall_7_1_0() { return cUserCode3DetailCodeParserRuleCall_7_1_0; } - //(relayPorts+=Port | serviceProvisionPoints+=SPP | actorRefs+=ActorRef | bindings+=Binding | connections+=LayerConnection - //| threads+=LogicalThread | actorInstanceMappings+=ActorInstanceMapping)* + //// workaround: reverse the order for serializer + //(actorInstanceMappings+=ActorInstanceMapping | threads+=LogicalThread | connections+=LayerConnection | bindings+=Binding + //| actorRefs+=ActorRef | serviceProvisionPoints+=SPP | relayPorts+=Port)* public Alternatives getAlternatives_8() { return cAlternatives_8; } - //relayPorts+=Port - public Assignment getRelayPortsAssignment_8_0() { return cRelayPortsAssignment_8_0; } + //// workaround: reverse the order for serializer + //actorInstanceMappings+=ActorInstanceMapping + public Assignment getActorInstanceMappingsAssignment_8_0() { return cActorInstanceMappingsAssignment_8_0; } - //Port - public RuleCall getRelayPortsPortParserRuleCall_8_0_0() { return cRelayPortsPortParserRuleCall_8_0_0; } + //ActorInstanceMapping + public RuleCall getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_0_0() { return cActorInstanceMappingsActorInstanceMappingParserRuleCall_8_0_0; } - //serviceProvisionPoints+=SPP - public Assignment getServiceProvisionPointsAssignment_8_1() { return cServiceProvisionPointsAssignment_8_1; } + //threads+=LogicalThread + public Assignment getThreadsAssignment_8_1() { return cThreadsAssignment_8_1; } - //SPP - public RuleCall getServiceProvisionPointsSPPParserRuleCall_8_1_0() { return cServiceProvisionPointsSPPParserRuleCall_8_1_0; } + //LogicalThread + public RuleCall getThreadsLogicalThreadParserRuleCall_8_1_0() { return cThreadsLogicalThreadParserRuleCall_8_1_0; } - //actorRefs+=ActorRef - public Assignment getActorRefsAssignment_8_2() { return cActorRefsAssignment_8_2; } + //connections+=LayerConnection + public Assignment getConnectionsAssignment_8_2() { return cConnectionsAssignment_8_2; } - //ActorRef - public RuleCall getActorRefsActorRefParserRuleCall_8_2_0() { return cActorRefsActorRefParserRuleCall_8_2_0; } + //LayerConnection + public RuleCall getConnectionsLayerConnectionParserRuleCall_8_2_0() { return cConnectionsLayerConnectionParserRuleCall_8_2_0; } //bindings+=Binding public Assignment getBindingsAssignment_8_3() { return cBindingsAssignment_8_3; } @@ -2578,23 +2583,23 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //Binding public RuleCall getBindingsBindingParserRuleCall_8_3_0() { return cBindingsBindingParserRuleCall_8_3_0; } - //connections+=LayerConnection - public Assignment getConnectionsAssignment_8_4() { return cConnectionsAssignment_8_4; } + //actorRefs+=ActorRef + public Assignment getActorRefsAssignment_8_4() { return cActorRefsAssignment_8_4; } - //LayerConnection - public RuleCall getConnectionsLayerConnectionParserRuleCall_8_4_0() { return cConnectionsLayerConnectionParserRuleCall_8_4_0; } + //ActorRef + public RuleCall getActorRefsActorRefParserRuleCall_8_4_0() { return cActorRefsActorRefParserRuleCall_8_4_0; } - //threads+=LogicalThread - public Assignment getThreadsAssignment_8_5() { return cThreadsAssignment_8_5; } + //serviceProvisionPoints+=SPP + public Assignment getServiceProvisionPointsAssignment_8_5() { return cServiceProvisionPointsAssignment_8_5; } - //LogicalThread - public RuleCall getThreadsLogicalThreadParserRuleCall_8_5_0() { return cThreadsLogicalThreadParserRuleCall_8_5_0; } + //SPP + public RuleCall getServiceProvisionPointsSPPParserRuleCall_8_5_0() { return cServiceProvisionPointsSPPParserRuleCall_8_5_0; } - //actorInstanceMappings+=ActorInstanceMapping - public Assignment getActorInstanceMappingsAssignment_8_6() { return cActorInstanceMappingsAssignment_8_6; } + //relayPorts+=Port + public Assignment getRelayPortsAssignment_8_6() { return cRelayPortsAssignment_8_6; } - //ActorInstanceMapping - public RuleCall getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_6_0() { return cActorInstanceMappingsActorInstanceMappingParserRuleCall_8_6_0; } + //Port + public RuleCall getRelayPortsPortParserRuleCall_8_6_0() { return cRelayPortsPortParserRuleCall_8_6_0; } //"}" public Keyword getRightCurlyBracketKeyword_9() { return cRightCurlyBracketKeyword_9; } @@ -3593,8 +3598,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// TODOHRR: define detail level language? //DataClass: // "DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1" - // userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (attributes+=Attribute - // | structors+=ClassStructor | operations+=StandardOperation)* "}"; + // userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? + // (operations+=StandardOperation | structors+=ClassStructor | attributes+=Attribute)* "}"; public DataClassElements getDataClassAccess() { return pDataClass; } @@ -3722,8 +3727,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //PortClass: - // {PortClass} "{" ("usercode" userCode=DetailCode)? (attributes+=Attribute | operations+=PortOperation | - // msgHandlers+=MessageHandler)* "}"; + // {PortClass} "{" ("usercode" userCode=DetailCode)? (msgHandlers+=MessageHandler | operations+=PortOperation | + // attributes+=Attribute)* "}"; public PortClassElements getPortClassAccess() { return pPortClass; } @@ -3783,13 +3788,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// since double containment is not supported we decided to define external ports as reference to interface ports //ActorClass: // (abstract?="abstract"? & commType=ComponentCommunicationType?) "ActorClass" name=ID docu=Documentation? ("extends" - // base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" (interfacePorts+=Port | - // serviceProvisionPoints+=SPP)* "}")? ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? - // ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (internalPorts+=Port | - // externalPorts+=ExternalPort | serviceAccessPoints+=SAP | attributes+=Attribute | actorRefs+=ActorRef | - // serviceImplementations+=ServiceImplementation | bindings+=Binding | connections+=LayerConnection)* "}")? ("Behavior" - // behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* (structors+=ClassStructor | - // operations+=StandardOperation)* stateMachine=StateMachine? "}")? "}"; + // base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" (serviceProvisionPoints+=SPP | + // interfacePorts+=Port)* "}")? ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? + // ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer + // (connections+=LayerConnection | bindings+=Binding | serviceImplementations+=ServiceImplementation | + // attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP | internalPorts+=Port | + // externalPorts+=ExternalPort)* "}")? ("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* + // (operations+=StandardOperation | structors+=ClassStructor)* stateMachine=StateMachine? "}")? "}"; public ActorClassElements getActorClassAccess() { return pActorClass; } @@ -3860,8 +3865,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //LogicalSystem: - // "LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* (subSystems+=SubSystemRef | - // bindings+=Binding | connections+=LayerConnection)* "}"; + // "LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* (connections+=LayerConnection | + // bindings+=Binding | subSystems+=SubSystemRef)* "}"; public LogicalSystemElements getLogicalSystemAccess() { return pLogicalSystem; } @@ -3892,9 +3897,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //SubSystemClass: // "SubSystemClass" name=ID docu=Documentation? "{" annotations+=Annotation* ("usercode1" userCode1=DetailCode)? - // ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? (relayPorts+=Port | - // serviceProvisionPoints+=SPP | actorRefs+=ActorRef | bindings+=Binding | connections+=LayerConnection | - // threads+=LogicalThread | actorInstanceMappings+=ActorInstanceMapping)* "}"; + // ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer + // (actorInstanceMappings+=ActorInstanceMapping | threads+=LogicalThread | connections+=LayerConnection | + // bindings+=Binding | actorRefs+=ActorRef | serviceProvisionPoints+=SPP | relayPorts+=Port)* "}"; public SubSystemClassElements getSubSystemClassAccess() { return pSubSystemClass; } diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext index 2d36748cd..d5b8d2587 100644 --- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext +++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext @@ -80,9 +80,9 @@ DataClass: ('usercode2' userCode2=DetailCode)? ('usercode3' userCode3=DetailCode)? ( - attributes+=Attribute | + operations+=StandardOperation | structors+=ClassStructor | - operations+=StandardOperation + attributes+=Attribute )* '}'; @@ -151,9 +151,9 @@ PortClass: '{' ('usercode' userCode=DetailCode)? ( - attributes+=Attribute | + msgHandlers+=MessageHandler | operations+=PortOperation | - msgHandlers+=MessageHandler + attributes+=Attribute )* '}'; @@ -187,8 +187,8 @@ ActorClass: annotations+=Annotation* ('Interface' '{' ( - interfacePorts+=Port | - serviceProvisionPoints+=SPP + serviceProvisionPoints+=SPP | + interfacePorts+=Port )* '}')? ('Structure' (structureDocu=Documentation)? '{' @@ -196,21 +196,22 @@ ActorClass: ('usercode2' userCode2=DetailCode)? ('usercode3' userCode3=DetailCode)? ( - internalPorts+=Port | - externalPorts+=ExternalPort | - serviceAccessPoints+=SAP | + // workaround: reverse the order for serializer + connections+=LayerConnection | + bindings+=Binding | + serviceImplementations+=ServiceImplementation | attributes+=Attribute | actorRefs+=ActorRef | - serviceImplementations+=ServiceImplementation | - bindings+=Binding | - connections+=LayerConnection + serviceAccessPoints+=SAP | + internalPorts+=Port | + externalPorts+=ExternalPort )* '}')? ('Behavior' (behaviorDocu=Documentation)? '{' behaviorAnnotations+=Annotation* ( - structors+=ClassStructor | - operations+=StandardOperation + operations+=StandardOperation | + structors+=ClassStructor )* (stateMachine=StateMachine)? '}')? @@ -235,9 +236,9 @@ LogicalSystem: 'LogicalSystem' name=ID (docu=Documentation)? '{' annotations+=Annotation* ( - subSystems+=SubSystemRef | + connections+=LayerConnection | bindings+=Binding | - connections+=LayerConnection + subSystems+=SubSystemRef )* '}'; @@ -253,13 +254,14 @@ SubSystemClass: ('usercode2' userCode2=DetailCode)? ('usercode3' userCode3=DetailCode)? ( - relayPorts+=Port | - serviceProvisionPoints+=SPP | - actorRefs+=ActorRef | - bindings+=Binding | - connections+=LayerConnection | + // workaround: reverse the order for serializer + actorInstanceMappings+=ActorInstanceMapping | threads+=LogicalThread | - actorInstanceMappings+=ActorInstanceMapping + connections+=LayerConnection | + bindings+=Binding | + actorRefs+=ActorRef | + serviceProvisionPoints+=SPP | + relayPorts+=Port )* '}'; |