diff options
| author | Juergen Haug | 2018-11-30 16:31:07 +0000 |
|---|---|---|
| committer | Juergen Haug | 2018-12-07 10:13:24 +0000 |
| commit | 20e755c32b20df508e24cfa66135e9de61cdd45e (patch) | |
| tree | e1abd9068983df923e97d78ad10cd9ab32aea13d | |
| parent | 64e94a354d0ad0f312dea4bfacfefc11834b8d99 (diff) | |
| download | org.eclipse.etrice-20e755c32b20df508e24cfa66135e9de61cdd45e.tar.gz org.eclipse.etrice-20e755c32b20df508e24cfa66135e9de61cdd45e.tar.xz org.eclipse.etrice-20e755c32b20df508e24cfa66135e9de61cdd45e.zip | |
Bug 541849 - added common super RoomElement to model hierarchy
Change-Id: I51f0d2826ed3baa85ce28bd21e9511832def5a17
56 files changed, 444 insertions, 251 deletions
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 dcaf5d9f7..9d43d8e9a 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 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="room" nsURI="http://www.eclipse.org/etrice/Room" nsPrefix="room"> - <eClassifiers xsi:type="ecore:EClass" name="RoomModel"> + <eClassifiers xsi:type="ecore:EClass" name="RoomModel" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The root object for the ROOM model. It gives access to {@link Import imports} and
the {@link SubSystemClass sub system},
{@link ActorClass actor}, {@link ProtocolClass protocol} and
{@link DataClass data} classes defined.
"/> </eAnnotations> @@ -10,14 +10,14 @@ <details key="documentation" value="<br>The model name is a dot separated fully qualified name and is
used to provide a name space. The generators may use that also
to place the generated code into separate directories.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1" - eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Import" + eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Import" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a list of all imported models.
"/> @@ -68,10 +68,10 @@ </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="annotationTypes" upperBound="-1" - eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//AnnotationType" + eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//AnnotationType" containment="true"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="RoomClass"> + <eClassifiers xsi:type="ecore:EClass" name="RoomClass" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This class is the super class of all classes
of the ROOM class model:
<ul>
 <li>{@link DataType}</li>
 <li>{@link GeneralProtocolClass}</li>
 <li>{@link StructureClass}</li>
</ul>
"/> </eAnnotations> @@ -80,7 +80,7 @@ <details key="documentation" value="<br>By this name the actor class is referred to in the model.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> @@ -92,7 +92,7 @@ <details key="documentation" value="<br>This class is the super class of the structural classes
<ul>
 <li>{@link ActorContainerClass}</li>
 <li>{@link LogicalSystem}</li>
</ul>
"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1" - eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" + eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a list of structure class annotations.
"/> @@ -121,19 +121,19 @@ <details key="documentation" value="<br>This is a list of all interface SPPs.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode1" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode1" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode2" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode2" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode3" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode3" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> @@ -146,7 +146,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="VarDecl"> + <eClassifiers xsi:type="ecore:EClass" name="VarDecl" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>A variable declaration consists of a name and a type.
"/> </eAnnotations> @@ -162,12 +162,12 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="MessageData"> + <eClassifiers xsi:type="ecore:EClass" name="MessageData" eSuperTypes="#//RoomElement"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="deprecatedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EReference" name="refType" eType="#//RefableType" containment="true"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="RefableType"> + <eClassifiers xsi:type="ecore:EClass" name="RefableType" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a type with an optional reference attribute.
If 'ref' is {@code true} then by reference semantic is chosen.
"/> </eAnnotations> @@ -196,7 +196,7 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>A primitive type describes a type like int, char, float
and can represent the type with a certain precision
in the target language
"/> </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EEnum ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//LiteralType"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EEnum platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//LiteralType"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is one of the basic variable types.
"/> </eAnnotations> @@ -229,7 +229,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="literals" upperBound="-1" eType="#//EnumLiteral" containment="true"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="EnumLiteral"> + <eClassifiers xsi:type="ecore:EClass" name="EnumLiteral" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>A literal value of the enumeration.
It can have a value associated.
"/> </eAnnotations> @@ -248,7 +248,7 @@ <details key="documentation" value="<br>The name of the literal.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="literal" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//IntLiteral" + <eStructuralFeatures xsi:type="ecore:EReference" name="literal" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//IntLiteral" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The value of the literal. It is associated with a target type which defaults to
{@code int} and can be set explicitly using the {@link EnumerationType#getPrimitiveType()}
"/> @@ -280,25 +280,25 @@ </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1" - eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" + eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a list of data class annotations.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode1" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode1" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode2" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode2" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode3" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode3" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> @@ -319,7 +319,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Attribute"> + <eClassifiers xsi:type="ecore:EClass" name="Attribute" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>An attribute is a named member of a
<ul>
 <li>{@link DataClass}</li>
 <li>{@link ActorClass}</li>
 <li>{@link PortClass}</li>
</ul>
<p>
It can be of scalar or array type and is of a {@link RefableType}.
It is possible to assign a default value literal.
</p>
"/> </eAnnotations> @@ -344,14 +344,14 @@ <details key="documentation" value="<br>This is an optional default value literal.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Operation"> + <eClassifiers xsi:type="ecore:EClass" name="Operation" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The super class of
<ul>
 <li>{@link StandardOperation}</li>
 <li>{@link PortOperation}</li>
</ul>
"/> </eAnnotations> @@ -372,13 +372,13 @@ <details key="documentation" value="<br>This is an optional return type of the operation.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="detailCode" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="detailCode" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is the operation body written in code generator target language.
"/> @@ -401,7 +401,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ClassStructor"> + <eClassifiers xsi:type="ecore:EClass" name="ClassStructor" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>Represents either the constructor (ctor) or destructor (dtor) of a ROOM class.
"/> </eAnnotations> @@ -411,7 +411,7 @@ </eAnnotations> </eOperations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="detailCode" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="detailCode" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EEnum" name="CommunicationType"> @@ -424,7 +424,7 @@ <details key="documentation" value="<br>The super class of
<ul>
 <li>{@link ProtocolClass}</li>
 <li>{@link CompoundProtocolClass}</li>
</ul>
"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1" - eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" + eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a list of protocol class annotations.
"/> @@ -445,19 +445,19 @@ <details key="documentation" value="<br>The base class from which all messages are inherited.
The port classes and the semantics are not inherited.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode1" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode1" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode2" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode2" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode3" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode3" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> @@ -487,7 +487,7 @@ <details key="documentation" value="<br>This is the optional conjugate port class specification.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="semantics" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//ProtocolSemantics" + <eStructuralFeatures xsi:type="ecore:EReference" name="semantics" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//ProtocolSemantics" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is the optional semantics specification for this protocol.
"/> @@ -505,7 +505,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="SubProtocol"> + <eClassifiers xsi:type="ecore:EClass" name="SubProtocol" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The sub protocol is part of the {@link CompoundProtocolClass} and defines
kind of a named channel for messages. The sub protocols are used to associate an
end port with a particular channel.
"/> </eAnnotations> @@ -520,7 +520,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Message"> + <eClassifiers xsi:type="ecore:EClass" name="Message" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a concrete sub class of an {@link AbstractMessage}.
A message in ROOM is part of a {@link ProtocolClass}. Messages are exchanged via {@link Port}s.
For event driven protocols the message is an object that is deliverd using a message
service of the runtime. For data driven systems only messages holding data are valid. In this
case the conjugate port is the one holding (and writing) the data and the regular port is
reading the data.
"/> </eAnnotations> @@ -541,20 +541,20 @@ </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1" - eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" + eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="PortClass"> + <eClassifiers xsi:type="ecore:EClass" name="PortClass" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>A port class can be specified to customize the behavior of a {@link ProtocolClass}.
There can be one for regular ports and another one for conjugate ports independently.

<p>
Port classes can be used to define attributes and operations and message handlers
(or interceptors).
</p>
"/> </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> @@ -579,7 +579,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="MessageHandler"> + <eClassifiers xsi:type="ecore:EClass" name="MessageHandler" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The super class of
<ul>
 <li>{@link InMessageHandler}</li>
 <li>{@link OutMessageHandler}</li>
</ul>
"/> </eAnnotations> @@ -588,7 +588,7 @@ <details key="documentation" value="<br>This is the message that is handled.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="detailCode" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="detailCode" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is the handler code written in code generator target language.
"/> @@ -605,7 +605,7 @@ <details key="documentation" value="<br>Is a handler (or interceptor) for outgoing messages. In the generated code the
message is available. It is derived from {@link MessageHandler}.
"/> </eAnnotations> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ActorClass" eSuperTypes="#//ActorContainerClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//ModelComponent"> + <eClassifiers xsi:type="ecore:EClass" name="ActorClass" eSuperTypes="#//ActorContainerClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//ModelComponent"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>Together with {@link ProtocolClass} and {@link DataClass} one of
the main class types of the ROOM language.

<p>
The actor class in ROOM has three compartments which aren't represented as separate model objects.
To understand to which compartment an attribute or reference belongs to here is a list
<ul>
 <li>Interface: everything which is visible from the outside from a model point of view
 <ul>
 <li>{@link #getInterfacePorts}: a list of all interface {@link Port}s</li>
 <li>{@link ActorContainerClass#getServiceProvisionPoints()}: a list of all interface {@link SPP}s</li>
 </ul>
 <li>Structure: all internal structural aspects of an actor class</li>
 <ul>
 <li>{@link #getUserCode1}-3: user defined code with generator dependent meaning</li>
 <li>{@link #getInternalPorts}: a list of all internal end {@link Port}s</li>
 <li>{@link #getExternalPorts}: a list of all {@link ExternalPort}s (the interface ports that
 are end ports, not relay ports</li>
 <li>{@link #getServiceImplementations}: a list of all {@link ServiceImplementation}s</li>
 <li>{@link #getServiceAccessPoints}: a list of all {@link SAP}s used by this actor class</li>
 <li>{@link #getAttributes}: a list of all actor class {@link Attribute}s</li>
 <li>{@link #getActorRefs}: a list of all referenced actor classes (an {@link ActorRef}
 has the meaning of a composition)</li>
 <li>{@link #getBindings}: a list of all port {@link Binding}s of this actor class</li>
 <li>{@link #getConnections}: a list of all {@link LayerConnection}s</li>
 </ul>
 <li>Behavior: the behavioral aspects of an actor class</li>
 <ul>
 <li>{@link #getOperations}: a list of {@link Operation}s</li>
 <li>{@link #getStateMachine}: the {@link StateGraph state machine} definition</li>
 </ul>
</ul>
</p>
"/> </eAnnotations> @@ -634,12 +634,12 @@ <details key="body" value="return getName();
"/> </eAnnotations> </eOperations> - <eOperations name="getAbstractInterfaceItems" upperBound="-1" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//AbstractInterfaceItem"> + <eOperations name="getAbstractInterfaceItems" upperBound="-1" eType="ecore:EClass http://www.eclipse.org/etrice/core/fsm/FSM#//AbstractInterfaceItem"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="body" value="return new <%org.eclipse.emf.common.util.BasicEList%><AbstractInterfaceItem>(new <%org.eclipse.etrice.core.room.util.RoomHelpers%>().getInterfaceItems(this));
"/> </eAnnotations> </eOperations> - <eOperations name="getAllAbstractInterfaceItems" upperBound="-1" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//AbstractInterfaceItem"> + <eOperations name="getAllAbstractInterfaceItems" upperBound="-1" eType="ecore:EClass http://www.eclipse.org/etrice/core/fsm/FSM#//AbstractInterfaceItem"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="body" value="return new <%org.eclipse.emf.common.util.BasicEList%><AbstractInterfaceItem>(new <%org.eclipse.etrice.core.room.util.RoomHelpers%>().getAllInterfaceItems(this));
"/> </eAnnotations> @@ -650,7 +650,7 @@ <details key="documentation" value="<br>This is a list containing all ports of the actor interface.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="structureDocu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="structureDocu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation of the actor structure.
"/> @@ -686,14 +686,14 @@ <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 ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <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" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation of the actor behavior.
"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="behaviorAnnotations" upperBound="-1" - eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" + eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a list of annotations to the actor behavior.
"/> @@ -708,7 +708,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="structors" upperBound="-1" eType="#//ClassStructor" containment="true"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="InterfaceItem" eSuperTypes="../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//AbstractInterfaceItem"> + <eClassifiers xsi:type="ecore:EClass" name="InterfaceItem" eSuperTypes="platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//AbstractInterfaceItem #//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a concrete sub class of an {@link AbstractInterfaceItem}.

It is the super class of
<ul>
 <li>{@link Port}</li>
 <li>{@link SAP}</li>
 <li>{@link SPP}</li>
</ul>
"/> </eAnnotations> @@ -717,7 +717,7 @@ <details key="body" value="if (this instanceof <%org.eclipse.etrice.core.room.Port%>)
	return ((Port) this).getProtocol();
else if (this instanceof <%org.eclipse.etrice.core.room.SAP%>)
	return ((SAP) this).getProtocol();
else if (this instanceof <%org.eclipse.etrice.core.room.SPP%>)
	return ((SPP) this).getProtocol();
return null;
"/> </eAnnotations> </eOperations> - <eOperations name="getSemantics" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//ProtocolSemantics"> + <eOperations name="getSemantics" eType="ecore:EClass http://www.eclipse.org/etrice/core/fsm/FSM#//ProtocolSemantics"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="body" value="if (getGeneralProtocol() instanceof <%org.eclipse.etrice.core.room.ProtocolClass%>)
	return ((ProtocolClass)getGeneralProtocol()).getSemantics();
else
	return null;
"/> </eAnnotations> @@ -737,7 +737,7 @@ <details key="body" value="if (getGeneralProtocol() instanceof ProtocolClass)
 return ((ProtocolClass) getGeneralProtocol()).getCommType() == <%org.eclipse.etrice.core.room.CommunicationType%>.EVENT_DRIVEN;
else
 return false;
"/> </eAnnotations> </eOperations> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> @@ -770,10 +770,10 @@ </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1" - eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" + eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" containment="true"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ExternalPort"> + <eClassifiers xsi:type="ecore:EClass" name="ExternalPort" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>An external port is part of the actor structure and references an interface port.
An interface port which is referenced by an external port is an external end port.
If it is not referenced it is a relay port.

@see Port
"/> </eAnnotations> @@ -803,7 +803,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ServiceImplementation"> + <eClassifiers xsi:type="ecore:EClass" name="ServiceImplementation" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>A service implementation can be reagrded as the replicated peer port of all {@link SAP}s
that are bound to it following the service resolution logic.
"/> </eAnnotations> @@ -824,7 +824,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ActorContainerRef"> + <eClassifiers xsi:type="ecore:EClass" name="ActorContainerRef" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The super class of
<ul>
 <li>{@link SubSystemRef}</li>
 <li>{@link ActorRef}</li>
</ul>
The reference designates a specific role of the referenced structure class.
"/> </eAnnotations> @@ -838,7 +838,7 @@ <details key="documentation" value="<br>By this name the actor container reference is referred to in the model.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> @@ -878,7 +878,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="LogicalThread"> + <eClassifiers xsi:type="ecore:EClass" name="LogicalThread" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>A logical thread is addressed by the {@link ActorInstanceMapping}s of a {@link SubSystemClass}.
"/> </eAnnotations> @@ -888,7 +888,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ActorInstanceMapping"> + <eClassifiers xsi:type="ecore:EClass" name="ActorInstanceMapping" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>An actor instance mapping maps an actor instances (described as a path of actor references)
to a {@link LogicalThread}
"/> </eAnnotations> @@ -910,7 +910,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="RefPath"> + <eClassifiers xsi:type="ecore:EClass" name="RefPath" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>A path of strings that are interpreted as {@link org.eclipse.etrice.core.room.ActorRef}s starting at a {@link org.eclipse.etrice.core.room.SubSystemClass}.
"/> </eAnnotations> @@ -926,7 +926,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="RefSegment"> + <eClassifiers xsi:type="ecore:EClass" name="RefSegment" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>A segment of a {@link RefPath}. It consists of a name and an optional index.
If the index is not set it will be {@code -1}.
"/> </eAnnotations> @@ -947,7 +947,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Binding"> + <eClassifiers xsi:type="ecore:EClass" name="Binding" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>A binding connects two {@link Port}s.
To be able to distinguish the ports of two {@link ActorContainerRef}s of the same type
a {@link BindingEndPoint} is needed for disambiguation.
"/> </eAnnotations> @@ -964,7 +964,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="BindingEndPoint"> + <eClassifiers xsi:type="ecore:EClass" name="BindingEndPoint" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>A binding end point is a pair of an {@link ActorContainerRef} and a {@link Port} and is used
to uniquely describe a port of a sub actor. If the actor container ref is {@code null} then
a port of the actor class itself is addressed.
"/> </eAnnotations> @@ -984,7 +984,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="LayerConnection"> + <eClassifiers xsi:type="ecore:EClass" name="LayerConnection" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>Layer connections are used to connect {@link SAP}s and {@link ServiceImplementation}s.
The source is described by a {@link SAPoint} and the target by a {@link SPPoint}.
"/> </eAnnotations> @@ -1001,7 +1001,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="SAPoint"> + <eClassifiers xsi:type="ecore:EClass" name="SAPoint" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The super class of
<ul>
 <li>{@link RefSAPoint}</li>
 <li>{@link RelaySAPoint}</li>
</ul>
"/> </eAnnotations> @@ -1026,7 +1026,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="SPPoint"> + <eClassifiers xsi:type="ecore:EClass" name="SPPoint" eSuperTypes="#//RoomElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>Links to a {@link SPP} of an {@link ActorContainerRef}, i.e. an SPP of a sub actor
"/> </eAnnotations> @@ -1073,4 +1073,9 @@ <eLiterals name="PORT" value="7" literal="Port"/> <eLiterals name="MESSAGE" value="8" literal="Message"/> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="RoomElement" interface="true"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="<br>The marker interface for all classes belonging to the ROOM model.
"/> + </eAnnotations> + </eClassifiers> </ecore:EPackage> 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 647b1b01d..2f3b347a4 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 @@ -4,7 +4,7 @@ editorDirectory="/org.eclipse.etrice.core.room.editor/src" modelPluginID="org.eclipse.etrice.core.room" forceOverwrite="true" modelName="Room" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.room.edit" - editorPluginID="org.eclipse.etrice.core.room.editor" runtimeVersion="2.13" usedGenPackages="platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.genmodel#//fSM"> + editorPluginID="org.eclipse.etrice.core.room.editor" runtimeVersion="2.14" usedGenPackages="platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.genmodel#//fSM"> <genPackages prefix="Room" basePackage="org.eclipse.etrice.core" disposableProviderFactory="true" ecorePackage="Room.ecore#/"> <genEnums typeSafeEnumCompatible="false" ecoreEnum="Room.ecore#//CommunicationType"> @@ -276,5 +276,6 @@ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Room.ecore#//ActorRef/multiplicity"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Room.ecore#//ActorRef/type"/> </genClasses> + <genClasses ecoreClass="Room.ecore#//RoomElement"/> </genPackages> </genmodel:GenModel> diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerRef.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerRef.java index 6d471c2f3..c7c11226d 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerRef.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerRef.java @@ -2,8 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; - import org.eclipse.etrice.core.common.base.Documentation; /** @@ -33,7 +31,7 @@ import org.eclipse.etrice.core.common.base.Documentation; * @model * @generated */ -public interface ActorContainerRef extends EObject +public interface ActorContainerRef extends RoomElement { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorInstanceMapping.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorInstanceMapping.java index 263a5a625..e01725749 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorInstanceMapping.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorInstanceMapping.java @@ -4,8 +4,6 @@ package org.eclipse.etrice.core.room; import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; - /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Actor Instance Mapping</b></em>'. @@ -30,7 +28,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface ActorInstanceMapping extends EObject +public interface ActorInstanceMapping extends RoomElement { /** * Returns the value of the '<em><b>Path</b></em>' containment reference. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Attribute.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Attribute.java index b846ec1bd..a8e6e50ab 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Attribute.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Attribute.java @@ -2,8 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; - import org.eclipse.etrice.core.common.base.Documentation; /** @@ -40,7 +38,7 @@ import org.eclipse.etrice.core.common.base.Documentation; * @model * @generated */ -public interface Attribute extends EObject +public interface Attribute extends RoomElement { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Binding.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Binding.java index 725956879..e126ca182 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Binding.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Binding.java @@ -2,7 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> @@ -28,7 +27,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface Binding extends EObject +public interface Binding extends RoomElement { /** * Returns the value of the '<em><b>Endpoint1</b></em>' containment reference. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/BindingEndPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/BindingEndPoint.java index 33e658231..3b01e9fa2 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/BindingEndPoint.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/BindingEndPoint.java @@ -2,7 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> @@ -29,7 +28,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface BindingEndPoint extends EObject +public interface BindingEndPoint extends RoomElement { /** * Returns the value of the '<em><b>Actor Ref</b></em>' reference. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ClassStructor.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ClassStructor.java index 98896ece2..b7d42ed52 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ClassStructor.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ClassStructor.java @@ -2,8 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; - import org.eclipse.etrice.core.fsm.fSM.DetailCode; /** @@ -28,7 +26,7 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode; * @model * @generated */ -public interface ClassStructor extends EObject +public interface ClassStructor extends RoomElement { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EnumLiteral.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EnumLiteral.java index 64cd00704..f4c4a633b 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EnumLiteral.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EnumLiteral.java @@ -2,8 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; - import org.eclipse.etrice.core.common.base.IntLiteral; /** @@ -29,7 +27,7 @@ import org.eclipse.etrice.core.common.base.IntLiteral; * @model * @generated */ -public interface EnumLiteral extends EObject +public interface EnumLiteral extends RoomElement { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalPort.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalPort.java index 47a124eac..e220e97c4 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalPort.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalPort.java @@ -2,7 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> @@ -29,7 +28,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface ExternalPort extends EObject +public interface ExternalPort extends RoomElement { /** * Returns the value of the '<em><b>Interface Port</b></em>' reference. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InterfaceItem.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InterfaceItem.java index 405abd6e9..6a612dcb5 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InterfaceItem.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InterfaceItem.java @@ -39,7 +39,7 @@ import org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics; * @model * @generated */ -public interface InterfaceItem extends AbstractInterfaceItem +public interface InterfaceItem extends AbstractInterfaceItem, RoomElement { /** * Returns the value of the '<em><b>Docu</b></em>' containment reference. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LayerConnection.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LayerConnection.java index 5affb8c8c..d39160d39 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LayerConnection.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LayerConnection.java @@ -2,7 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> @@ -27,7 +26,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface LayerConnection extends EObject +public interface LayerConnection extends RoomElement { /** * Returns the value of the '<em><b>From</b></em>' containment reference. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalThread.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalThread.java index fe74463f5..a00fff374 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalThread.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalThread.java @@ -2,7 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> @@ -25,7 +24,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface LogicalThread extends EObject +public interface LogicalThread extends RoomElement { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Message.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Message.java index bf9eaa387..dbddf88a5 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Message.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Message.java @@ -4,8 +4,6 @@ package org.eclipse.etrice.core.room; import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; - import org.eclipse.etrice.core.common.base.Annotation; import org.eclipse.etrice.core.common.base.Documentation; @@ -39,7 +37,7 @@ import org.eclipse.etrice.core.common.base.Documentation; * @model * @generated */ -public interface Message extends EObject +public interface Message extends RoomElement { /** * Returns the value of the '<em><b>Priv</b></em>' attribute. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageData.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageData.java index a60d55dc9..5eb9895cf 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageData.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageData.java @@ -2,7 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> @@ -21,7 +20,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface MessageData extends EObject +public interface MessageData extends RoomElement { /** * Returns the value of the '<em><b>Deprecated Name</b></em>' attribute. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageHandler.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageHandler.java index 6c43a069e..11cc2e5df 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageHandler.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageHandler.java @@ -2,8 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; - import org.eclipse.etrice.core.fsm.fSM.DetailCode; /** @@ -32,7 +30,7 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode; * @model * @generated */ -public interface MessageHandler extends EObject +public interface MessageHandler extends RoomElement { /** * Returns the value of the '<em><b>Msg</b></em>' reference. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Operation.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Operation.java index 240e754d5..164262d7c 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Operation.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Operation.java @@ -4,8 +4,6 @@ package org.eclipse.etrice.core.room; import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; - import org.eclipse.etrice.core.common.base.Documentation; import org.eclipse.etrice.core.fsm.fSM.DetailCode; @@ -39,7 +37,7 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode; * @model * @generated */ -public interface Operation extends EObject +public interface Operation extends RoomElement { /** * Returns the value of the '<em><b>Name</b></em>' attribute. 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 b91781c91..188518b63 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 @@ -4,8 +4,6 @@ package org.eclipse.etrice.core.room; import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; - import org.eclipse.etrice.core.fsm.fSM.DetailCode; /** @@ -38,7 +36,7 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode; * @model * @generated */ -public interface PortClass extends EObject +public interface PortClass extends RoomElement { /** * Returns the value of the '<em><b>User Code</b></em>' containment reference. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefPath.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefPath.java index 0284b9ced..6f9245744 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefPath.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefPath.java @@ -4,8 +4,6 @@ package org.eclipse.etrice.core.room; import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; - /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Ref Path</b></em>'. @@ -27,7 +25,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface RefPath extends EObject +public interface RefPath extends RoomElement { /** * Returns the value of the '<em><b>Refs</b></em>' containment reference list. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSegment.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSegment.java index 8181e26de..8bdc7da52 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSegment.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSegment.java @@ -2,7 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> @@ -27,7 +26,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface RefSegment extends EObject +public interface RefSegment extends RoomElement { /** * Returns the value of the '<em><b>Ref</b></em>' attribute. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefableType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefableType.java index 74e7e4078..2f5b3e5f7 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefableType.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefableType.java @@ -2,7 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> @@ -27,7 +26,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface RefableType extends EObject +public interface RefableType extends RoomElement { /** * Returns the value of the '<em><b>Type</b></em>' reference. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomClass.java index 7fb20dd47..b5e5731b9 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomClass.java @@ -2,8 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; - import org.eclipse.etrice.core.common.base.Documentation; /** @@ -34,7 +32,7 @@ import org.eclipse.etrice.core.common.base.Documentation; * @model * @generated */ -public interface RoomClass extends EObject +public interface RoomClass extends RoomElement { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomElement.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomElement.java new file mode 100644 index 000000000..60ba47032 --- /dev/null +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomElement.java @@ -0,0 +1,24 @@ +/** + */ +package org.eclipse.etrice.core.room; + +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Element</b></em>'. + * <!-- end-user-doc --> + * + * <!-- begin-model-doc --> + * <br>The marker interface for all classes belonging to the ROOM model. + * + * <!-- end-model-doc --> + * + * + * @see org.eclipse.etrice.core.room.RoomPackage#getRoomElement() + * @model interface="true" abstract="true" + * @generated + */ +public interface RoomElement extends EObject +{ +} // RoomElement diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomModel.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomModel.java index cb9845aa8..9cd9a18b0 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomModel.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomModel.java @@ -4,8 +4,6 @@ package org.eclipse.etrice.core.room; import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; - import org.eclipse.etrice.core.common.base.AnnotationType; import org.eclipse.etrice.core.common.base.Documentation; import org.eclipse.etrice.core.common.base.Import; @@ -45,7 +43,7 @@ import org.eclipse.etrice.core.common.base.Import; * @model * @generated */ -public interface RoomModel extends EObject +public interface RoomModel extends RoomElement { /** * Returns the value of the '<em><b>Name</b></em>' attribute. 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 ef901b76a..4cdcc5fe6 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 @@ -60,6 +60,25 @@ public interface RoomPackage extends EPackage RoomPackage eINSTANCE = org.eclipse.etrice.core.room.impl.RoomPackageImpl.init(); /** + * The meta object id for the '{@link org.eclipse.etrice.core.room.RoomElement <em>Element</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.etrice.core.room.RoomElement + * @see org.eclipse.etrice.core.room.impl.RoomPackageImpl#getRoomElement() + * @generated + */ + int ROOM_ELEMENT = 51; + + /** + * The number of structural features of the '<em>Element</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ROOM_ELEMENT_FEATURE_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.RoomModelImpl <em>Model</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -76,7 +95,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_MODEL__NAME = 0; + int ROOM_MODEL__NAME = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Docu</b></em>' containment reference. @@ -85,7 +104,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_MODEL__DOCU = 1; + int ROOM_MODEL__DOCU = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Imports</b></em>' containment reference list. @@ -94,7 +113,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_MODEL__IMPORTS = 2; + int ROOM_MODEL__IMPORTS = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Primitive Types</b></em>' containment reference list. @@ -103,7 +122,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_MODEL__PRIMITIVE_TYPES = 3; + int ROOM_MODEL__PRIMITIVE_TYPES = ROOM_ELEMENT_FEATURE_COUNT + 3; /** * The feature id for the '<em><b>Enumeration Types</b></em>' containment reference list. @@ -112,7 +131,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_MODEL__ENUMERATION_TYPES = 4; + int ROOM_MODEL__ENUMERATION_TYPES = ROOM_ELEMENT_FEATURE_COUNT + 4; /** * The feature id for the '<em><b>External Types</b></em>' containment reference list. @@ -121,7 +140,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_MODEL__EXTERNAL_TYPES = 5; + int ROOM_MODEL__EXTERNAL_TYPES = ROOM_ELEMENT_FEATURE_COUNT + 5; /** * The feature id for the '<em><b>Data Classes</b></em>' containment reference list. @@ -130,7 +149,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_MODEL__DATA_CLASSES = 6; + int ROOM_MODEL__DATA_CLASSES = ROOM_ELEMENT_FEATURE_COUNT + 6; /** * The feature id for the '<em><b>Protocol Classes</b></em>' containment reference list. @@ -139,7 +158,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_MODEL__PROTOCOL_CLASSES = 7; + int ROOM_MODEL__PROTOCOL_CLASSES = ROOM_ELEMENT_FEATURE_COUNT + 7; /** * The feature id for the '<em><b>Actor Classes</b></em>' containment reference list. @@ -148,7 +167,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_MODEL__ACTOR_CLASSES = 8; + int ROOM_MODEL__ACTOR_CLASSES = ROOM_ELEMENT_FEATURE_COUNT + 8; /** * The feature id for the '<em><b>Sub System Classes</b></em>' containment reference list. @@ -157,7 +176,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_MODEL__SUB_SYSTEM_CLASSES = 9; + int ROOM_MODEL__SUB_SYSTEM_CLASSES = ROOM_ELEMENT_FEATURE_COUNT + 9; /** * The feature id for the '<em><b>Systems</b></em>' containment reference list. @@ -166,7 +185,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_MODEL__SYSTEMS = 10; + int ROOM_MODEL__SYSTEMS = ROOM_ELEMENT_FEATURE_COUNT + 10; /** * The feature id for the '<em><b>Annotation Types</b></em>' containment reference list. @@ -175,7 +194,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_MODEL__ANNOTATION_TYPES = 11; + int ROOM_MODEL__ANNOTATION_TYPES = ROOM_ELEMENT_FEATURE_COUNT + 11; /** * The number of structural features of the '<em>Model</em>' class. @@ -184,7 +203,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_MODEL_FEATURE_COUNT = 12; + int ROOM_MODEL_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 12; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.RoomClassImpl <em>Class</em>}' class. @@ -203,7 +222,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_CLASS__NAME = 0; + int ROOM_CLASS__NAME = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Docu</b></em>' containment reference. @@ -212,7 +231,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_CLASS__DOCU = 1; + int ROOM_CLASS__DOCU = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Class</em>' class. @@ -221,7 +240,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ROOM_CLASS_FEATURE_COUNT = 2; + int ROOM_CLASS_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.StructureClassImpl <em>Structure Class</em>}' class. @@ -413,7 +432,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int VAR_DECL__NAME = 0; + int VAR_DECL__NAME = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Ref Type</b></em>' containment reference. @@ -422,7 +441,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int VAR_DECL__REF_TYPE = 1; + int VAR_DECL__REF_TYPE = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Var Decl</em>' class. @@ -431,7 +450,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int VAR_DECL_FEATURE_COUNT = 2; + int VAR_DECL_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.MessageDataImpl <em>Message Data</em>}' class. @@ -450,7 +469,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int MESSAGE_DATA__DEPRECATED_NAME = 0; + int MESSAGE_DATA__DEPRECATED_NAME = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Ref Type</b></em>' containment reference. @@ -459,7 +478,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int MESSAGE_DATA__REF_TYPE = 1; + int MESSAGE_DATA__REF_TYPE = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Message Data</em>' class. @@ -468,7 +487,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int MESSAGE_DATA_FEATURE_COUNT = 2; + int MESSAGE_DATA_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.RefableTypeImpl <em>Refable Type</em>}' class. @@ -487,7 +506,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int REFABLE_TYPE__TYPE = 0; + int REFABLE_TYPE__TYPE = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Ref</b></em>' attribute. @@ -496,7 +515,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int REFABLE_TYPE__REF = 1; + int REFABLE_TYPE__REF = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Refable Type</em>' class. @@ -505,7 +524,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int REFABLE_TYPE_FEATURE_COUNT = 2; + int REFABLE_TYPE_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.DataTypeImpl <em>Data Type</em>}' class. @@ -726,7 +745,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ENUM_LITERAL__NAME = 0; + int ENUM_LITERAL__NAME = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Literal</b></em>' containment reference. @@ -735,7 +754,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ENUM_LITERAL__LITERAL = 1; + int ENUM_LITERAL__LITERAL = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Enum Literal</em>' class. @@ -744,7 +763,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ENUM_LITERAL_FEATURE_COUNT = 2; + int ENUM_LITERAL_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.ExternalTypeImpl <em>External Type</em>}' class. @@ -927,7 +946,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ATTRIBUTE__NAME = 0; + int ATTRIBUTE__NAME = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Size</b></em>' attribute. @@ -936,7 +955,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ATTRIBUTE__SIZE = 1; + int ATTRIBUTE__SIZE = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Type</b></em>' containment reference. @@ -945,7 +964,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ATTRIBUTE__TYPE = 2; + int ATTRIBUTE__TYPE = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Default Value Literal</b></em>' attribute. @@ -954,7 +973,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ATTRIBUTE__DEFAULT_VALUE_LITERAL = 3; + int ATTRIBUTE__DEFAULT_VALUE_LITERAL = ROOM_ELEMENT_FEATURE_COUNT + 3; /** * The feature id for the '<em><b>Docu</b></em>' containment reference. @@ -963,7 +982,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ATTRIBUTE__DOCU = 4; + int ATTRIBUTE__DOCU = ROOM_ELEMENT_FEATURE_COUNT + 4; /** * The number of structural features of the '<em>Attribute</em>' class. @@ -972,7 +991,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ATTRIBUTE_FEATURE_COUNT = 5; + int ATTRIBUTE_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 5; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.OperationImpl <em>Operation</em>}' class. @@ -991,7 +1010,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int OPERATION__NAME = 0; + int OPERATION__NAME = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Arguments</b></em>' containment reference list. @@ -1000,7 +1019,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int OPERATION__ARGUMENTS = 1; + int OPERATION__ARGUMENTS = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Return Type</b></em>' containment reference. @@ -1009,7 +1028,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int OPERATION__RETURN_TYPE = 2; + int OPERATION__RETURN_TYPE = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Docu</b></em>' containment reference. @@ -1018,7 +1037,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int OPERATION__DOCU = 3; + int OPERATION__DOCU = ROOM_ELEMENT_FEATURE_COUNT + 3; /** * The feature id for the '<em><b>Detail Code</b></em>' containment reference. @@ -1027,7 +1046,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int OPERATION__DETAIL_CODE = 4; + int OPERATION__DETAIL_CODE = ROOM_ELEMENT_FEATURE_COUNT + 4; /** * The number of structural features of the '<em>Operation</em>' class. @@ -1036,7 +1055,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int OPERATION_FEATURE_COUNT = 5; + int OPERATION_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 5; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.StandardOperationImpl <em>Standard Operation</em>}' class. @@ -1201,7 +1220,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int CLASS_STRUCTOR__NAME = 0; + int CLASS_STRUCTOR__NAME = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Detail Code</b></em>' containment reference. @@ -1210,7 +1229,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int CLASS_STRUCTOR__DETAIL_CODE = 1; + int CLASS_STRUCTOR__DETAIL_CODE = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Class Structor</em>' class. @@ -1219,7 +1238,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int CLASS_STRUCTOR_FEATURE_COUNT = 2; + int CLASS_STRUCTOR_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.GeneralProtocolClassImpl <em>General Protocol Class</em>}' class. @@ -1475,7 +1494,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int SUB_PROTOCOL__NAME = 0; + int SUB_PROTOCOL__NAME = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Protocol</b></em>' reference. @@ -1484,7 +1503,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int SUB_PROTOCOL__PROTOCOL = 1; + int SUB_PROTOCOL__PROTOCOL = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Sub Protocol</em>' class. @@ -1493,7 +1512,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int SUB_PROTOCOL_FEATURE_COUNT = 2; + int SUB_PROTOCOL_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.MessageImpl <em>Message</em>}' class. @@ -1512,7 +1531,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int MESSAGE__PRIV = 0; + int MESSAGE__PRIV = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -1521,7 +1540,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int MESSAGE__NAME = 1; + int MESSAGE__NAME = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Data</b></em>' containment reference. @@ -1530,7 +1549,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int MESSAGE__DATA = 2; + int MESSAGE__DATA = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Annotations</b></em>' containment reference list. @@ -1539,7 +1558,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int MESSAGE__ANNOTATIONS = 3; + int MESSAGE__ANNOTATIONS = ROOM_ELEMENT_FEATURE_COUNT + 3; /** * The feature id for the '<em><b>Docu</b></em>' containment reference. @@ -1548,7 +1567,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int MESSAGE__DOCU = 4; + int MESSAGE__DOCU = ROOM_ELEMENT_FEATURE_COUNT + 4; /** * The number of structural features of the '<em>Message</em>' class. @@ -1557,7 +1576,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int MESSAGE_FEATURE_COUNT = 5; + int MESSAGE_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 5; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.PortClassImpl <em>Port Class</em>}' class. @@ -1576,7 +1595,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int PORT_CLASS__USER_CODE = 0; + int PORT_CLASS__USER_CODE = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Msg Handlers</b></em>' containment reference list. @@ -1585,7 +1604,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int PORT_CLASS__MSG_HANDLERS = 1; + int PORT_CLASS__MSG_HANDLERS = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Operations</b></em>' containment reference list. @@ -1594,7 +1613,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int PORT_CLASS__OPERATIONS = 2; + int PORT_CLASS__OPERATIONS = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Attributes</b></em>' containment reference list. @@ -1603,7 +1622,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int PORT_CLASS__ATTRIBUTES = 3; + int PORT_CLASS__ATTRIBUTES = ROOM_ELEMENT_FEATURE_COUNT + 3; /** * The number of structural features of the '<em>Port Class</em>' class. @@ -1612,7 +1631,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int PORT_CLASS_FEATURE_COUNT = 4; + int PORT_CLASS_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 4; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.MessageHandlerImpl <em>Message Handler</em>}' class. @@ -1631,7 +1650,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int MESSAGE_HANDLER__MSG = 0; + int MESSAGE_HANDLER__MSG = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Detail Code</b></em>' containment reference. @@ -1640,7 +1659,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int MESSAGE_HANDLER__DETAIL_CODE = 1; + int MESSAGE_HANDLER__DETAIL_CODE = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Message Handler</em>' class. @@ -1649,7 +1668,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int MESSAGE_HANDLER_FEATURE_COUNT = 2; + int MESSAGE_HANDLER_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.InMessageHandlerImpl <em>In Message Handler</em>}' class. @@ -2105,7 +2124,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int EXTERNAL_PORT__INTERFACE_PORT = 0; + int EXTERNAL_PORT__INTERFACE_PORT = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The number of structural features of the '<em>External Port</em>' class. @@ -2114,7 +2133,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int EXTERNAL_PORT_FEATURE_COUNT = 1; + int EXTERNAL_PORT_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.SAPImpl <em>SAP</em>}' class. @@ -2225,7 +2244,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int SERVICE_IMPLEMENTATION__SPP = 0; + int SERVICE_IMPLEMENTATION__SPP = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The number of structural features of the '<em>Service Implementation</em>' class. @@ -2234,7 +2253,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int SERVICE_IMPLEMENTATION_FEATURE_COUNT = 1; + int SERVICE_IMPLEMENTATION_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.LogicalSystemImpl <em>Logical System</em>}' class. @@ -2326,7 +2345,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ACTOR_CONTAINER_REF__NAME = 0; + int ACTOR_CONTAINER_REF__NAME = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Docu</b></em>' containment reference. @@ -2335,7 +2354,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ACTOR_CONTAINER_REF__DOCU = 1; + int ACTOR_CONTAINER_REF__DOCU = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Actor Container Ref</em>' class. @@ -2344,7 +2363,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ACTOR_CONTAINER_REF_FEATURE_COUNT = 2; + int ACTOR_CONTAINER_REF_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.SubSystemRefImpl <em>Sub System Ref</em>}' class. @@ -2545,7 +2564,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int LOGICAL_THREAD__NAME = 0; + int LOGICAL_THREAD__NAME = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The number of structural features of the '<em>Logical Thread</em>' class. @@ -2554,7 +2573,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int LOGICAL_THREAD_FEATURE_COUNT = 1; + int LOGICAL_THREAD_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.ActorInstanceMappingImpl <em>Actor Instance Mapping</em>}' class. @@ -2573,7 +2592,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ACTOR_INSTANCE_MAPPING__PATH = 0; + int ACTOR_INSTANCE_MAPPING__PATH = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Thread</b></em>' reference. @@ -2582,7 +2601,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ACTOR_INSTANCE_MAPPING__THREAD = 1; + int ACTOR_INSTANCE_MAPPING__THREAD = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Actor Instance Mappings</b></em>' containment reference list. @@ -2591,7 +2610,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ACTOR_INSTANCE_MAPPING__ACTOR_INSTANCE_MAPPINGS = 2; + int ACTOR_INSTANCE_MAPPING__ACTOR_INSTANCE_MAPPINGS = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>Actor Instance Mapping</em>' class. @@ -2600,7 +2619,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int ACTOR_INSTANCE_MAPPING_FEATURE_COUNT = 3; + int ACTOR_INSTANCE_MAPPING_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.RefPathImpl <em>Ref Path</em>}' class. @@ -2619,7 +2638,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int REF_PATH__REFS = 0; + int REF_PATH__REFS = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The number of structural features of the '<em>Ref Path</em>' class. @@ -2628,7 +2647,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int REF_PATH_FEATURE_COUNT = 1; + int REF_PATH_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.RefSegmentImpl <em>Ref Segment</em>}' class. @@ -2647,7 +2666,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int REF_SEGMENT__REF = 0; + int REF_SEGMENT__REF = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Idx</b></em>' attribute. @@ -2656,7 +2675,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int REF_SEGMENT__IDX = 1; + int REF_SEGMENT__IDX = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Ref Segment</em>' class. @@ -2665,7 +2684,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int REF_SEGMENT_FEATURE_COUNT = 2; + int REF_SEGMENT_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.BindingImpl <em>Binding</em>}' class. @@ -2684,7 +2703,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int BINDING__ENDPOINT1 = 0; + int BINDING__ENDPOINT1 = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Endpoint2</b></em>' containment reference. @@ -2693,7 +2712,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int BINDING__ENDPOINT2 = 1; + int BINDING__ENDPOINT2 = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Binding</em>' class. @@ -2702,7 +2721,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int BINDING_FEATURE_COUNT = 2; + int BINDING_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.BindingEndPointImpl <em>Binding End Point</em>}' class. @@ -2721,7 +2740,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int BINDING_END_POINT__ACTOR_REF = 0; + int BINDING_END_POINT__ACTOR_REF = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Port</b></em>' reference. @@ -2730,7 +2749,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int BINDING_END_POINT__PORT = 1; + int BINDING_END_POINT__PORT = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Sub</b></em>' reference. @@ -2739,7 +2758,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int BINDING_END_POINT__SUB = 2; + int BINDING_END_POINT__SUB = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>Binding End Point</em>' class. @@ -2748,7 +2767,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int BINDING_END_POINT_FEATURE_COUNT = 3; + int BINDING_END_POINT_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.LayerConnectionImpl <em>Layer Connection</em>}' class. @@ -2767,7 +2786,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int LAYER_CONNECTION__FROM = 0; + int LAYER_CONNECTION__FROM = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>To</b></em>' containment reference. @@ -2776,7 +2795,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int LAYER_CONNECTION__TO = 1; + int LAYER_CONNECTION__TO = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Layer Connection</em>' class. @@ -2785,7 +2804,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int LAYER_CONNECTION_FEATURE_COUNT = 2; + int LAYER_CONNECTION_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.SAPointImpl <em>SA Point</em>}' class. @@ -2804,7 +2823,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int SA_POINT_FEATURE_COUNT = 0; + int SA_POINT_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.RefSAPointImpl <em>Ref SA Point</em>}' class. @@ -2879,7 +2898,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int SP_POINT__REF = 0; + int SP_POINT__REF = ROOM_ELEMENT_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Service</b></em>' reference. @@ -2888,7 +2907,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int SP_POINT__SERVICE = 1; + int SP_POINT__SERVICE = ROOM_ELEMENT_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>SP Point</em>' class. @@ -2897,7 +2916,7 @@ public interface RoomPackage extends EPackage * @generated * @ordered */ - int SP_POINT_FEATURE_COUNT = 2; + int SP_POINT_FEATURE_COUNT = ROOM_ELEMENT_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.impl.ActorRefImpl <em>Actor Ref</em>}' class. @@ -2971,7 +2990,7 @@ public interface RoomPackage extends EPackage * @see org.eclipse.etrice.core.room.impl.RoomPackageImpl#getCommunicationType() * @generated */ - int COMMUNICATION_TYPE = 51; + int COMMUNICATION_TYPE = 52; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.ReferenceType <em>Reference Type</em>}' enum. @@ -2981,7 +3000,7 @@ public interface RoomPackage extends EPackage * @see org.eclipse.etrice.core.room.impl.RoomPackageImpl#getReferenceType() * @generated */ - int REFERENCE_TYPE = 52; + int REFERENCE_TYPE = 53; /** * The meta object id for the '{@link org.eclipse.etrice.core.room.RoomAnnotationTargetEnum <em>Annotation Target Enum</em>}' enum. @@ -2991,7 +3010,7 @@ public interface RoomPackage extends EPackage * @see org.eclipse.etrice.core.room.impl.RoomPackageImpl#getRoomAnnotationTargetEnum() * @generated */ - int ROOM_ANNOTATION_TARGET_ENUM = 53; + int ROOM_ANNOTATION_TARGET_ENUM = 54; /** @@ -4968,6 +4987,16 @@ public interface RoomPackage extends EPackage EReference getActorRef_Type(); /** + * Returns the meta object for class '{@link org.eclipse.etrice.core.room.RoomElement <em>Element</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Element</em>'. + * @see org.eclipse.etrice.core.room.RoomElement + * @generated + */ + EClass getRoomElement(); + + /** * Returns the meta object for enum '{@link org.eclipse.etrice.core.room.CommunicationType <em>Communication Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -6595,6 +6624,16 @@ public interface RoomPackage extends EPackage EReference ACTOR_REF__TYPE = eINSTANCE.getActorRef_Type(); /** + * The meta object literal for the '{@link org.eclipse.etrice.core.room.RoomElement <em>Element</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.etrice.core.room.RoomElement + * @see org.eclipse.etrice.core.room.impl.RoomPackageImpl#getRoomElement() + * @generated + */ + EClass ROOM_ELEMENT = eINSTANCE.getRoomElement(); + + /** * The meta object literal for the '{@link org.eclipse.etrice.core.room.CommunicationType <em>Communication Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAPoint.java index 02286043e..e1d699a89 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAPoint.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAPoint.java @@ -2,7 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> @@ -23,6 +22,6 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface SAPoint extends EObject +public interface SAPoint extends RoomElement { } // SAPoint diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPoint.java index e72787710..54e36aff9 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPoint.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPoint.java @@ -2,7 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> @@ -26,7 +25,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface SPPoint extends EObject +public interface SPPoint extends RoomElement { /** * Returns the value of the '<em><b>Ref</b></em>' reference. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ServiceImplementation.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ServiceImplementation.java index 037a6b5ec..f734792d9 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ServiceImplementation.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ServiceImplementation.java @@ -2,7 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> @@ -26,7 +25,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface ServiceImplementation extends EObject +public interface ServiceImplementation extends RoomElement { /** * Returns the value of the '<em><b>Spp</b></em>' reference. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubProtocol.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubProtocol.java index dd3d61a8b..24d826066 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubProtocol.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubProtocol.java @@ -2,7 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> @@ -28,7 +27,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface SubProtocol extends EObject +public interface SubProtocol extends RoomElement { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/VarDecl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/VarDecl.java index c987dfb28..3982cf790 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/VarDecl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/VarDecl.java @@ -2,7 +2,6 @@ */ package org.eclipse.etrice.core.room; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> @@ -26,7 +25,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface VarDecl extends EObject +public interface VarDecl extends RoomElement { /** * Returns the value of the '<em><b>Name</b></em>' attribute. 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 54eddbcfb..19d3aa2f5 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 @@ -1091,7 +1091,7 @@ public class ActorClassImpl extends ActorContainerClassImpl implements ActorClas { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (abstract: "); result.append(abstract_); result.append(", commType: "); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerRefImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerRefImpl.java index 1853d6fe2..3261d5cca 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerRefImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerRefImpl.java @@ -275,7 +275,7 @@ public class ActorContainerRefImpl extends MinimalEObjectImpl.Container implemen { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorRefImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorRefImpl.java index 3b9fb317e..f22a93db5 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorRefImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorRefImpl.java @@ -288,7 +288,7 @@ public class ActorRefImpl extends ActorContainerRefImpl implements ActorRef { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (refType: "); result.append(refType); result.append(", multiplicity: "); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AttributeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AttributeImpl.java index 57799da7f..b163ab5a1 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AttributeImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AttributeImpl.java @@ -436,7 +436,7 @@ public class AttributeImpl extends MinimalEObjectImpl.Container implements Attri { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", size: "); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ClassStructorImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ClassStructorImpl.java index 0311f5123..72f448f94 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ClassStructorImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ClassStructorImpl.java @@ -267,7 +267,7 @@ public class ClassStructorImpl extends MinimalEObjectImpl.Container implements C { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EnumLiteralImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EnumLiteralImpl.java index 7d32f350b..667624a66 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EnumLiteralImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EnumLiteralImpl.java @@ -289,7 +289,7 @@ public class EnumLiteralImpl extends MinimalEObjectImpl.Container implements Enu { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalTypeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalTypeImpl.java index a09b735db..818d7a4c4 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalTypeImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalTypeImpl.java @@ -220,7 +220,7 @@ public class ExternalTypeImpl extends ComplexTypeImpl implements ExternalType { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (targetName: "); result.append(targetName); result.append(", defaultValueLiteral: "); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalThreadImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalThreadImpl.java index 5fe5dfe4d..0ec66f725 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalThreadImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalThreadImpl.java @@ -167,7 +167,7 @@ public class LogicalThreadImpl extends MinimalEObjectImpl.Container implements L { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageDataImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageDataImpl.java index 10164fc7b..03496f0c3 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageDataImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageDataImpl.java @@ -255,7 +255,7 @@ public class MessageDataImpl extends MinimalEObjectImpl.Container implements Mes { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (deprecatedName: "); result.append(deprecatedName); result.append(')'); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageImpl.java index b6def512a..57699fd4b 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageImpl.java @@ -429,7 +429,7 @@ public class MessageImpl extends MinimalEObjectImpl.Container implements Message { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (priv: "); result.append(priv); result.append(", name: "); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OperationImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OperationImpl.java index 33dc56a28..af6a19a1f 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OperationImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OperationImpl.java @@ -448,7 +448,7 @@ public class OperationImpl extends MinimalEObjectImpl.Container implements Opera { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortImpl.java index 91fe59bfd..b50633799 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortImpl.java @@ -360,7 +360,7 @@ public class PortImpl extends InterfaceItemImpl implements Port { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (conjugated: "); result.append(conjugated); result.append(", multiplicity: "); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PrimitiveTypeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PrimitiveTypeImpl.java index abf7e820e..ee437f716 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PrimitiveTypeImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PrimitiveTypeImpl.java @@ -330,7 +330,7 @@ public class PrimitiveTypeImpl extends DataTypeImpl implements PrimitiveType { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (type: "); result.append(type); result.append(", targetName: "); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java index 416eb56f6..e20998f19 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java @@ -763,7 +763,7 @@ public class ProtocolClassImpl extends GeneralProtocolClassImpl implements Proto { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (commType: "); result.append(commType); result.append(')'); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefableTypeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefableTypeImpl.java index 515e6f748..0f9c02cc5 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefableTypeImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefableTypeImpl.java @@ -234,7 +234,7 @@ public class RefableTypeImpl extends MinimalEObjectImpl.Container implements Ref { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (ref: "); result.append(ref); result.append(')'); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomClassImpl.java index 024ca9055..666950eea 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomClassImpl.java @@ -256,7 +256,7 @@ public class RoomClassImpl extends MinimalEObjectImpl.Container implements RoomC { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomModelImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomModelImpl.java index 250848511..2e68e5bee 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomModelImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomModelImpl.java @@ -654,7 +654,7 @@ public class RoomModelImpl extends MinimalEObjectImpl.Container implements RoomM { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); 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 d73d07d6d..5d13c4eb1 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 @@ -56,6 +56,7 @@ import org.eclipse.etrice.core.room.ReferenceType; import org.eclipse.etrice.core.room.RelaySAPoint; import org.eclipse.etrice.core.room.RoomAnnotationTargetEnum; import org.eclipse.etrice.core.room.RoomClass; +import org.eclipse.etrice.core.room.RoomElement; import org.eclipse.etrice.core.room.RoomFactory; import org.eclipse.etrice.core.room.RoomModel; import org.eclipse.etrice.core.room.RoomPackage; @@ -439,6 +440,13 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ + private EClass roomElementEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EEnum communicationTypeEEnum = null; /** @@ -484,7 +492,7 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * + * * <p>This method is used to initialize {@link RoomPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * <!-- begin-user-doc --> @@ -499,7 +507,8 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage if (isInited) return (RoomPackage)EPackage.Registry.INSTANCE.getEPackage(RoomPackage.eNS_URI); // Obtain or create and register package - RoomPackageImpl theRoomPackage = (RoomPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RoomPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RoomPackageImpl()); + Object registeredRoomPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + RoomPackageImpl theRoomPackage = registeredRoomPackage instanceof RoomPackageImpl ? (RoomPackageImpl)registeredRoomPackage : new RoomPackageImpl(); isInited = true; @@ -516,7 +525,6 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage // Mark meta-data to indicate it can't be changed theRoomPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(RoomPackage.eNS_URI, theRoomPackage); return theRoomPackage; @@ -2367,6 +2375,16 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage * <!-- end-user-doc --> * @generated */ + public EClass getRoomElement() + { + return roomElementEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EEnum getCommunicationType() { return communicationTypeEEnum; @@ -2657,6 +2675,8 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage createEAttribute(actorRefEClass, ACTOR_REF__MULTIPLICITY); createEReference(actorRefEClass, ACTOR_REF__TYPE); + roomElementEClass = createEClass(ROOM_ELEMENT); + // Create enums communicationTypeEEnum = createEEnum(COMMUNICATION_TYPE); referenceTypeEEnum = createEEnum(REFERENCE_TYPE); @@ -2696,32 +2716,58 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage // Set bounds for type parameters // Add supertypes to classes + roomModelEClass.getESuperTypes().add(this.getRoomElement()); + roomClassEClass.getESuperTypes().add(this.getRoomElement()); structureClassEClass.getESuperTypes().add(this.getRoomClass()); actorContainerClassEClass.getESuperTypes().add(this.getStructureClass()); + varDeclEClass.getESuperTypes().add(this.getRoomElement()); + messageDataEClass.getESuperTypes().add(this.getRoomElement()); + refableTypeEClass.getESuperTypes().add(this.getRoomElement()); dataTypeEClass.getESuperTypes().add(this.getRoomClass()); complexTypeEClass.getESuperTypes().add(this.getDataType()); primitiveTypeEClass.getESuperTypes().add(this.getDataType()); enumerationTypeEClass.getESuperTypes().add(this.getDataType()); + enumLiteralEClass.getESuperTypes().add(this.getRoomElement()); externalTypeEClass.getESuperTypes().add(this.getComplexType()); dataClassEClass.getESuperTypes().add(this.getComplexType()); + attributeEClass.getESuperTypes().add(this.getRoomElement()); + operationEClass.getESuperTypes().add(this.getRoomElement()); standardOperationEClass.getESuperTypes().add(this.getOperation()); portOperationEClass.getESuperTypes().add(this.getOperation()); + classStructorEClass.getESuperTypes().add(this.getRoomElement()); generalProtocolClassEClass.getESuperTypes().add(this.getRoomClass()); protocolClassEClass.getESuperTypes().add(this.getGeneralProtocolClass()); compoundProtocolClassEClass.getESuperTypes().add(this.getGeneralProtocolClass()); + subProtocolEClass.getESuperTypes().add(this.getRoomElement()); + messageEClass.getESuperTypes().add(this.getRoomElement()); + portClassEClass.getESuperTypes().add(this.getRoomElement()); + messageHandlerEClass.getESuperTypes().add(this.getRoomElement()); inMessageHandlerEClass.getESuperTypes().add(this.getMessageHandler()); outMessageHandlerEClass.getESuperTypes().add(this.getMessageHandler()); actorClassEClass.getESuperTypes().add(this.getActorContainerClass()); actorClassEClass.getESuperTypes().add(theFSMPackage.getModelComponent()); interfaceItemEClass.getESuperTypes().add(theFSMPackage.getAbstractInterfaceItem()); + interfaceItemEClass.getESuperTypes().add(this.getRoomElement()); portEClass.getESuperTypes().add(this.getInterfaceItem()); + externalPortEClass.getESuperTypes().add(this.getRoomElement()); sapEClass.getESuperTypes().add(this.getInterfaceItem()); sppEClass.getESuperTypes().add(this.getInterfaceItem()); + serviceImplementationEClass.getESuperTypes().add(this.getRoomElement()); logicalSystemEClass.getESuperTypes().add(this.getStructureClass()); + actorContainerRefEClass.getESuperTypes().add(this.getRoomElement()); subSystemRefEClass.getESuperTypes().add(this.getActorContainerRef()); subSystemClassEClass.getESuperTypes().add(this.getActorContainerClass()); + logicalThreadEClass.getESuperTypes().add(this.getRoomElement()); + actorInstanceMappingEClass.getESuperTypes().add(this.getRoomElement()); + refPathEClass.getESuperTypes().add(this.getRoomElement()); + refSegmentEClass.getESuperTypes().add(this.getRoomElement()); + bindingEClass.getESuperTypes().add(this.getRoomElement()); + bindingEndPointEClass.getESuperTypes().add(this.getRoomElement()); + layerConnectionEClass.getESuperTypes().add(this.getRoomElement()); + saPointEClass.getESuperTypes().add(this.getRoomElement()); refSAPointEClass.getESuperTypes().add(this.getSAPoint()); relaySAPointEClass.getESuperTypes().add(this.getSAPoint()); + spPointEClass.getESuperTypes().add(this.getRoomElement()); actorRefEClass.getESuperTypes().add(this.getActorContainerRef()); // Initialize classes and features; add operations and parameters @@ -2998,6 +3044,8 @@ public class RoomPackageImpl extends EPackageImpl implements RoomPackage initEAttribute(getActorRef_Multiplicity(), ecorePackage.getEInt(), "multiplicity", "1", 0, 1, ActorRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getActorRef_Type(), this.getActorClass(), null, "type", null, 0, 1, ActorRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(roomElementEClass, RoomElement.class, "RoomElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + // Initialize enums and add enum literals initEEnum(communicationTypeEEnum, CommunicationType.class, "CommunicationType"); addEEnumLiteral(communicationTypeEEnum, CommunicationType.EVENT_DRIVEN); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StandardOperationImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StandardOperationImpl.java index c3400bae4..0167e2b3e 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StandardOperationImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StandardOperationImpl.java @@ -166,7 +166,7 @@ public class StandardOperationImpl extends OperationImpl implements StandardOper { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (override: "); result.append(override); result.append(')'); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubProtocolImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubProtocolImpl.java index 2764919fd..547a9c397 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubProtocolImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubProtocolImpl.java @@ -234,7 +234,7 @@ public class SubProtocolImpl extends MinimalEObjectImpl.Container implements Sub { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/VarDeclImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/VarDeclImpl.java index f1dc4a0df..fe0d9371d 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/VarDeclImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/VarDeclImpl.java @@ -255,7 +255,7 @@ public class VarDeclImpl extends MinimalEObjectImpl.Container implements VarDecl { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomAdapterFactory.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomAdapterFactory.java index 99460678c..aa04c99e2 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomAdapterFactory.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomAdapterFactory.java @@ -334,6 +334,11 @@ public class RoomAdapterFactory extends AdapterFactoryImpl return createActorRefAdapter(); } @Override + public Adapter caseRoomElement(RoomElement object) + { + return createRoomElementAdapter(); + } + @Override public Adapter caseIInterfaceItemOwner(IInterfaceItemOwner object) { return createIInterfaceItemOwnerAdapter(); @@ -1136,6 +1141,21 @@ public class RoomAdapterFactory extends AdapterFactoryImpl } /** + * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.room.RoomElement <em>Element</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.etrice.core.room.RoomElement + * @generated + */ + public Adapter createRoomElementAdapter() + { + return null; + } + + /** * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.fsm.fSM.IInterfaceItemOwner <em>IInterface Item Owner</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomSwitch.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomSwitch.java index c51998737..e7c1d48ed 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomSwitch.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomSwitch.java @@ -80,6 +80,7 @@ public class RoomSwitch<T> extends Switch<T> { RoomModel roomModel = (RoomModel)theEObject; T result = caseRoomModel(roomModel); + if (result == null) result = caseRoomElement(roomModel); if (result == null) result = defaultCase(theEObject); return result; } @@ -87,6 +88,7 @@ public class RoomSwitch<T> extends Switch<T> { RoomClass roomClass = (RoomClass)theEObject; T result = caseRoomClass(roomClass); + if (result == null) result = caseRoomElement(roomClass); if (result == null) result = defaultCase(theEObject); return result; } @@ -95,6 +97,7 @@ public class RoomSwitch<T> extends Switch<T> StructureClass structureClass = (StructureClass)theEObject; T result = caseStructureClass(structureClass); if (result == null) result = caseRoomClass(structureClass); + if (result == null) result = caseRoomElement(structureClass); if (result == null) result = defaultCase(theEObject); return result; } @@ -104,6 +107,7 @@ public class RoomSwitch<T> extends Switch<T> T result = caseActorContainerClass(actorContainerClass); if (result == null) result = caseStructureClass(actorContainerClass); if (result == null) result = caseRoomClass(actorContainerClass); + if (result == null) result = caseRoomElement(actorContainerClass); if (result == null) result = defaultCase(theEObject); return result; } @@ -111,6 +115,7 @@ public class RoomSwitch<T> extends Switch<T> { VarDecl varDecl = (VarDecl)theEObject; T result = caseVarDecl(varDecl); + if (result == null) result = caseRoomElement(varDecl); if (result == null) result = defaultCase(theEObject); return result; } @@ -118,6 +123,7 @@ public class RoomSwitch<T> extends Switch<T> { MessageData messageData = (MessageData)theEObject; T result = caseMessageData(messageData); + if (result == null) result = caseRoomElement(messageData); if (result == null) result = defaultCase(theEObject); return result; } @@ -125,6 +131,7 @@ public class RoomSwitch<T> extends Switch<T> { RefableType refableType = (RefableType)theEObject; T result = caseRefableType(refableType); + if (result == null) result = caseRoomElement(refableType); if (result == null) result = defaultCase(theEObject); return result; } @@ -133,6 +140,7 @@ public class RoomSwitch<T> extends Switch<T> DataType dataType = (DataType)theEObject; T result = caseDataType(dataType); if (result == null) result = caseRoomClass(dataType); + if (result == null) result = caseRoomElement(dataType); if (result == null) result = defaultCase(theEObject); return result; } @@ -142,6 +150,7 @@ public class RoomSwitch<T> extends Switch<T> T result = caseComplexType(complexType); if (result == null) result = caseDataType(complexType); if (result == null) result = caseRoomClass(complexType); + if (result == null) result = caseRoomElement(complexType); if (result == null) result = defaultCase(theEObject); return result; } @@ -151,6 +160,7 @@ public class RoomSwitch<T> extends Switch<T> T result = casePrimitiveType(primitiveType); if (result == null) result = caseDataType(primitiveType); if (result == null) result = caseRoomClass(primitiveType); + if (result == null) result = caseRoomElement(primitiveType); if (result == null) result = defaultCase(theEObject); return result; } @@ -160,6 +170,7 @@ public class RoomSwitch<T> extends Switch<T> T result = caseEnumerationType(enumerationType); if (result == null) result = caseDataType(enumerationType); if (result == null) result = caseRoomClass(enumerationType); + if (result == null) result = caseRoomElement(enumerationType); if (result == null) result = defaultCase(theEObject); return result; } @@ -167,6 +178,7 @@ public class RoomSwitch<T> extends Switch<T> { EnumLiteral enumLiteral = (EnumLiteral)theEObject; T result = caseEnumLiteral(enumLiteral); + if (result == null) result = caseRoomElement(enumLiteral); if (result == null) result = defaultCase(theEObject); return result; } @@ -177,6 +189,7 @@ public class RoomSwitch<T> extends Switch<T> if (result == null) result = caseComplexType(externalType); if (result == null) result = caseDataType(externalType); if (result == null) result = caseRoomClass(externalType); + if (result == null) result = caseRoomElement(externalType); if (result == null) result = defaultCase(theEObject); return result; } @@ -187,6 +200,7 @@ public class RoomSwitch<T> extends Switch<T> if (result == null) result = caseComplexType(dataClass); if (result == null) result = caseDataType(dataClass); if (result == null) result = caseRoomClass(dataClass); + if (result == null) result = caseRoomElement(dataClass); if (result == null) result = defaultCase(theEObject); return result; } @@ -194,6 +208,7 @@ public class RoomSwitch<T> extends Switch<T> { Attribute attribute = (Attribute)theEObject; T result = caseAttribute(attribute); + if (result == null) result = caseRoomElement(attribute); if (result == null) result = defaultCase(theEObject); return result; } @@ -201,6 +216,7 @@ public class RoomSwitch<T> extends Switch<T> { Operation operation = (Operation)theEObject; T result = caseOperation(operation); + if (result == null) result = caseRoomElement(operation); if (result == null) result = defaultCase(theEObject); return result; } @@ -209,6 +225,7 @@ public class RoomSwitch<T> extends Switch<T> StandardOperation standardOperation = (StandardOperation)theEObject; T result = caseStandardOperation(standardOperation); if (result == null) result = caseOperation(standardOperation); + if (result == null) result = caseRoomElement(standardOperation); if (result == null) result = defaultCase(theEObject); return result; } @@ -217,6 +234,7 @@ public class RoomSwitch<T> extends Switch<T> PortOperation portOperation = (PortOperation)theEObject; T result = casePortOperation(portOperation); if (result == null) result = caseOperation(portOperation); + if (result == null) result = caseRoomElement(portOperation); if (result == null) result = defaultCase(theEObject); return result; } @@ -224,6 +242,7 @@ public class RoomSwitch<T> extends Switch<T> { ClassStructor classStructor = (ClassStructor)theEObject; T result = caseClassStructor(classStructor); + if (result == null) result = caseRoomElement(classStructor); if (result == null) result = defaultCase(theEObject); return result; } @@ -232,6 +251,7 @@ public class RoomSwitch<T> extends Switch<T> GeneralProtocolClass generalProtocolClass = (GeneralProtocolClass)theEObject; T result = caseGeneralProtocolClass(generalProtocolClass); if (result == null) result = caseRoomClass(generalProtocolClass); + if (result == null) result = caseRoomElement(generalProtocolClass); if (result == null) result = defaultCase(theEObject); return result; } @@ -241,6 +261,7 @@ public class RoomSwitch<T> extends Switch<T> T result = caseProtocolClass(protocolClass); if (result == null) result = caseGeneralProtocolClass(protocolClass); if (result == null) result = caseRoomClass(protocolClass); + if (result == null) result = caseRoomElement(protocolClass); if (result == null) result = defaultCase(theEObject); return result; } @@ -250,6 +271,7 @@ public class RoomSwitch<T> extends Switch<T> T result = caseCompoundProtocolClass(compoundProtocolClass); if (result == null) result = caseGeneralProtocolClass(compoundProtocolClass); if (result == null) result = caseRoomClass(compoundProtocolClass); + if (result == null) result = caseRoomElement(compoundProtocolClass); if (result == null) result = defaultCase(theEObject); return result; } @@ -257,6 +279,7 @@ public class RoomSwitch<T> extends Switch<T> { SubProtocol subProtocol = (SubProtocol)theEObject; T result = caseSubProtocol(subProtocol); + if (result == null) result = caseRoomElement(subProtocol); if (result == null) result = defaultCase(theEObject); return result; } @@ -264,6 +287,7 @@ public class RoomSwitch<T> extends Switch<T> { Message message = (Message)theEObject; T result = caseMessage(message); + if (result == null) result = caseRoomElement(message); if (result == null) result = defaultCase(theEObject); return result; } @@ -271,6 +295,7 @@ public class RoomSwitch<T> extends Switch<T> { PortClass portClass = (PortClass)theEObject; T result = casePortClass(portClass); + if (result == null) result = caseRoomElement(portClass); if (result == null) result = defaultCase(theEObject); return result; } @@ -278,6 +303,7 @@ public class RoomSwitch<T> extends Switch<T> { MessageHandler messageHandler = (MessageHandler)theEObject; T result = caseMessageHandler(messageHandler); + if (result == null) result = caseRoomElement(messageHandler); if (result == null) result = defaultCase(theEObject); return result; } @@ -286,6 +312,7 @@ public class RoomSwitch<T> extends Switch<T> InMessageHandler inMessageHandler = (InMessageHandler)theEObject; T result = caseInMessageHandler(inMessageHandler); if (result == null) result = caseMessageHandler(inMessageHandler); + if (result == null) result = caseRoomElement(inMessageHandler); if (result == null) result = defaultCase(theEObject); return result; } @@ -294,6 +321,7 @@ public class RoomSwitch<T> extends Switch<T> OutMessageHandler outMessageHandler = (OutMessageHandler)theEObject; T result = caseOutMessageHandler(outMessageHandler); if (result == null) result = caseMessageHandler(outMessageHandler); + if (result == null) result = caseRoomElement(outMessageHandler); if (result == null) result = defaultCase(theEObject); return result; } @@ -306,6 +334,7 @@ public class RoomSwitch<T> extends Switch<T> if (result == null) result = caseStructureClass(actorClass); if (result == null) result = caseIInterfaceItemOwner(actorClass); if (result == null) result = caseRoomClass(actorClass); + if (result == null) result = caseRoomElement(actorClass); if (result == null) result = defaultCase(theEObject); return result; } @@ -314,6 +343,7 @@ public class RoomSwitch<T> extends Switch<T> InterfaceItem interfaceItem = (InterfaceItem)theEObject; T result = caseInterfaceItem(interfaceItem); if (result == null) result = caseAbstractInterfaceItem(interfaceItem); + if (result == null) result = caseRoomElement(interfaceItem); if (result == null) result = defaultCase(theEObject); return result; } @@ -323,6 +353,7 @@ public class RoomSwitch<T> extends Switch<T> T result = casePort(port); if (result == null) result = caseInterfaceItem(port); if (result == null) result = caseAbstractInterfaceItem(port); + if (result == null) result = caseRoomElement(port); if (result == null) result = defaultCase(theEObject); return result; } @@ -330,6 +361,7 @@ public class RoomSwitch<T> extends Switch<T> { ExternalPort externalPort = (ExternalPort)theEObject; T result = caseExternalPort(externalPort); + if (result == null) result = caseRoomElement(externalPort); if (result == null) result = defaultCase(theEObject); return result; } @@ -339,6 +371,7 @@ public class RoomSwitch<T> extends Switch<T> T result = caseSAP(sap); if (result == null) result = caseInterfaceItem(sap); if (result == null) result = caseAbstractInterfaceItem(sap); + if (result == null) result = caseRoomElement(sap); if (result == null) result = defaultCase(theEObject); return result; } @@ -348,6 +381,7 @@ public class RoomSwitch<T> extends Switch<T> T result = caseSPP(spp); if (result == null) result = caseInterfaceItem(spp); if (result == null) result = caseAbstractInterfaceItem(spp); + if (result == null) result = caseRoomElement(spp); if (result == null) result = defaultCase(theEObject); return result; } @@ -355,6 +389,7 @@ public class RoomSwitch<T> extends Switch<T> { ServiceImplementation serviceImplementation = (ServiceImplementation)theEObject; T result = caseServiceImplementation(serviceImplementation); + if (result == null) result = caseRoomElement(serviceImplementation); if (result == null) result = defaultCase(theEObject); return result; } @@ -364,6 +399,7 @@ public class RoomSwitch<T> extends Switch<T> T result = caseLogicalSystem(logicalSystem); if (result == null) result = caseStructureClass(logicalSystem); if (result == null) result = caseRoomClass(logicalSystem); + if (result == null) result = caseRoomElement(logicalSystem); if (result == null) result = defaultCase(theEObject); return result; } @@ -371,6 +407,7 @@ public class RoomSwitch<T> extends Switch<T> { ActorContainerRef actorContainerRef = (ActorContainerRef)theEObject; T result = caseActorContainerRef(actorContainerRef); + if (result == null) result = caseRoomElement(actorContainerRef); if (result == null) result = defaultCase(theEObject); return result; } @@ -379,6 +416,7 @@ public class RoomSwitch<T> extends Switch<T> SubSystemRef subSystemRef = (SubSystemRef)theEObject; T result = caseSubSystemRef(subSystemRef); if (result == null) result = caseActorContainerRef(subSystemRef); + if (result == null) result = caseRoomElement(subSystemRef); if (result == null) result = defaultCase(theEObject); return result; } @@ -389,6 +427,7 @@ public class RoomSwitch<T> extends Switch<T> if (result == null) result = caseActorContainerClass(subSystemClass); if (result == null) result = caseStructureClass(subSystemClass); if (result == null) result = caseRoomClass(subSystemClass); + if (result == null) result = caseRoomElement(subSystemClass); if (result == null) result = defaultCase(theEObject); return result; } @@ -396,6 +435,7 @@ public class RoomSwitch<T> extends Switch<T> { LogicalThread logicalThread = (LogicalThread)theEObject; T result = caseLogicalThread(logicalThread); + if (result == null) result = caseRoomElement(logicalThread); if (result == null) result = defaultCase(theEObject); return result; } @@ -403,6 +443,7 @@ public class RoomSwitch<T> extends Switch<T> { ActorInstanceMapping actorInstanceMapping = (ActorInstanceMapping)theEObject; T result = caseActorInstanceMapping(actorInstanceMapping); + if (result == null) result = caseRoomElement(actorInstanceMapping); if (result == null) result = defaultCase(theEObject); return result; } @@ -410,6 +451,7 @@ public class RoomSwitch<T> extends Switch<T> { RefPath refPath = (RefPath)theEObject; T result = caseRefPath(refPath); + if (result == null) result = caseRoomElement(refPath); if (result == null) result = defaultCase(theEObject); return result; } @@ -417,6 +459,7 @@ public class RoomSwitch<T> extends Switch<T> { RefSegment refSegment = (RefSegment)theEObject; T result = caseRefSegment(refSegment); + if (result == null) result = caseRoomElement(refSegment); if (result == null) result = defaultCase(theEObject); return result; } @@ -424,6 +467,7 @@ public class RoomSwitch<T> extends Switch<T> { Binding binding = (Binding)theEObject; T result = caseBinding(binding); + if (result == null) result = caseRoomElement(binding); if (result == null) result = defaultCase(theEObject); return result; } @@ -431,6 +475,7 @@ public class RoomSwitch<T> extends Switch<T> { BindingEndPoint bindingEndPoint = (BindingEndPoint)theEObject; T result = caseBindingEndPoint(bindingEndPoint); + if (result == null) result = caseRoomElement(bindingEndPoint); if (result == null) result = defaultCase(theEObject); return result; } @@ -438,6 +483,7 @@ public class RoomSwitch<T> extends Switch<T> { LayerConnection layerConnection = (LayerConnection)theEObject; T result = caseLayerConnection(layerConnection); + if (result == null) result = caseRoomElement(layerConnection); if (result == null) result = defaultCase(theEObject); return result; } @@ -445,6 +491,7 @@ public class RoomSwitch<T> extends Switch<T> { SAPoint saPoint = (SAPoint)theEObject; T result = caseSAPoint(saPoint); + if (result == null) result = caseRoomElement(saPoint); if (result == null) result = defaultCase(theEObject); return result; } @@ -453,6 +500,7 @@ public class RoomSwitch<T> extends Switch<T> RefSAPoint refSAPoint = (RefSAPoint)theEObject; T result = caseRefSAPoint(refSAPoint); if (result == null) result = caseSAPoint(refSAPoint); + if (result == null) result = caseRoomElement(refSAPoint); if (result == null) result = defaultCase(theEObject); return result; } @@ -461,6 +509,7 @@ public class RoomSwitch<T> extends Switch<T> RelaySAPoint relaySAPoint = (RelaySAPoint)theEObject; T result = caseRelaySAPoint(relaySAPoint); if (result == null) result = caseSAPoint(relaySAPoint); + if (result == null) result = caseRoomElement(relaySAPoint); if (result == null) result = defaultCase(theEObject); return result; } @@ -468,6 +517,7 @@ public class RoomSwitch<T> extends Switch<T> { SPPoint spPoint = (SPPoint)theEObject; T result = caseSPPoint(spPoint); + if (result == null) result = caseRoomElement(spPoint); if (result == null) result = defaultCase(theEObject); return result; } @@ -476,6 +526,14 @@ public class RoomSwitch<T> extends Switch<T> ActorRef actorRef = (ActorRef)theEObject; T result = caseActorRef(actorRef); if (result == null) result = caseActorContainerRef(actorRef); + if (result == null) result = caseRoomElement(actorRef); + if (result == null) result = defaultCase(theEObject); + return result; + } + case RoomPackage.ROOM_ELEMENT: + { + RoomElement roomElement = (RoomElement)theEObject; + T result = caseRoomElement(roomElement); if (result == null) result = defaultCase(theEObject); return result; } @@ -1300,6 +1358,22 @@ public class RoomSwitch<T> extends Switch<T> } /** + * Returns the result of interpreting the object as an instance of '<em>Element</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Element</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseRoomElement(RoomElement object) + { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>IInterface Item Owner</em>'. * <!-- begin-user-doc --> * This implementation returns null; diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java index 00cbeea37..d7ed9d9ab 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java @@ -374,24 +374,24 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer { * docu=Documentation? * base=[ActorClass|FQN]? * annotations+=Annotation* - * interfacePorts+=Port? - * (serviceProvisionPoints+=SPP? interfacePorts+=Port?)* + * serviceProvisionPoints+=SPP? + * (interfacePorts+=Port? serviceProvisionPoints+=SPP?)* * structureDocu=Documentation? * userCode1=DetailCode? * userCode2=DetailCode? * userCode3=DetailCode? - * actorRefs+=ActorRef? + * serviceImplementations+=ServiceImplementation? * ( * ( * connections+=LayerConnection | * bindings+=Binding | - * serviceImplementations+=ServiceImplementation | * attributes+=Attribute | + * actorRefs+=ActorRef | * serviceAccessPoints+=SAP | * internalPorts+=Port | * externalPorts+=ExternalPort * )? - * actorRefs+=ActorRef? + * serviceImplementations+=ServiceImplementation? * )* * behaviorDocu=Documentation? * behaviorAnnotations+=Annotation* diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.xtend b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.xtend index 8af44324c..8a45b4507 100644 --- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.xtend +++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.xtend @@ -29,7 +29,14 @@ class DocuPostprocessor { val pckg = metamodel.EPackage //------------------------------------------------------------------ - var cls = pckg.getClass("RoomModel") + var cls = pckg.getClass("RoomElement") + cls.setDocumentation( + ''' + The marker interface for all classes belonging to the ROOM model. + ''') + + //------------------------------------------------------------------ + cls = pckg.getClass("RoomModel") cls.setDocumentation( ''' The root object for the ROOM model. It gives access to {@link Import imports} and diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/postprocessing/ImplPostprocessor.xtend b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/postprocessing/ImplPostprocessor.xtend index 1ac3dc585..cc4c28706 100644 --- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/postprocessing/ImplPostprocessor.xtend +++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/postprocessing/ImplPostprocessor.xtend @@ -19,12 +19,24 @@ import org.eclipse.etrice.core.fsm.fSM.FSMPackage import org.eclipse.xtext.GeneratedMetamodel import static extension org.eclipse.etrice.core.common.postprocessing.PostprocessingHelpers.* +import org.eclipse.emf.ecore.EClass +import org.eclipse.emf.ecore.EcoreFactory class ImplPostprocessor { def process(GeneratedMetamodel metamodel) { val roomPackage = metamodel.EPackage + // marker interface 'RoomElement' + val roomElementClass = EcoreFactory::eINSTANCE.createEClass => [ + name = 'RoomElement' + interface = true + ] + roomPackage.EClassifiers.filter(EClass).filter[!ESuperTypes.exists[EPackage == roomPackage]].forEach [ + ESuperTypes += roomElementClass + ] + roomPackage.EClassifiers += roomElementClass + val port = roomPackage.getClass("Port") port.getAttribute("multiplicity").setDefaultValueLiteral("1") port.addOperation("isReplicated", EcorePackage.eINSTANCE.getEClassifier("EBoolean"), 1, |