From 04647080b992f0e78286475c0d079b90728e2e6c Mon Sep 17 00:00:00 2001 From: Henrik Rentz-Reichert Date: Tue, 29 Aug 2017 17:07:49 +0200 Subject: Bug 521498 - [genmodel, generators] gen. only explicitly passed models * generate only models that are passed on the command line * also in non-lib mode generate all ROOM classes Change-Id: Ib0766d77ba9de3c1b4de4d9b97c0a301241603a2 --- .../core/genmodel/etricegen/AbstractInstance.java | 2 +- .../core/genmodel/etricegen/ActorInstance.java | 2 +- .../genmodel/etricegen/ActorInterfaceInstance.java | 2 +- .../core/genmodel/etricegen/BindingInstance.java | 2 +- .../genmodel/etricegen/ConnectionInstance.java | 2 +- .../core/genmodel/etricegen/ETriceGenPackage.java | 126 +++++----- .../genmodel/etricegen/ExpandedActorClass.java | 2 +- .../core/genmodel/etricegen/InstanceBase.java | 2 +- .../genmodel/etricegen/InterfaceItemInstance.java | 2 +- .../core/genmodel/etricegen/OpenBinding.java | 2 +- .../genmodel/etricegen/OpenServiceConnection.java | 2 +- .../genmodel/etricegen/OptionalActorInstance.java | 2 +- .../core/genmodel/etricegen/PortInstance.java | 2 +- .../etrice/core/genmodel/etricegen/PortKind.java | 6 + .../etrice/core/genmodel/etricegen/Root.java | 102 ++++---- .../core/genmodel/etricegen/SAPInstance.java | 2 +- .../core/genmodel/etricegen/SPPInstance.java | 2 +- .../genmodel/etricegen/ServiceImplInstance.java | 2 +- .../core/genmodel/etricegen/StructureInstance.java | 2 +- .../core/genmodel/etricegen/SubSystemInstance.java | 2 +- .../core/genmodel/etricegen/SystemInstance.java | 2 +- .../etrice/core/genmodel/etricegen/Wire.java | 2 +- .../core/genmodel/etricegen/WiredActorClass.java | 2 +- .../genmodel/etricegen/WiredStructureClass.java | 2 +- .../genmodel/etricegen/WiredSubSystemClass.java | 2 +- .../etricegen/impl/AbstractInstanceImpl.java | 2 +- .../genmodel/etricegen/impl/ActorInstanceImpl.java | 2 +- .../etricegen/impl/ActorInterfaceInstanceImpl.java | 2 +- .../etricegen/impl/BindingInstanceImpl.java | 2 +- .../etricegen/impl/ConnectionInstanceImpl.java | 2 +- .../etricegen/impl/ETriceGenPackageImpl.java | 43 ++-- .../etricegen/impl/ExpandedActorClassImpl.java | 2 +- .../genmodel/etricegen/impl/InstanceBaseImpl.java | 2 +- .../etricegen/impl/InterfaceItemInstanceImpl.java | 2 +- .../genmodel/etricegen/impl/OpenBindingImpl.java | 2 +- .../etricegen/impl/OpenServiceConnectionImpl.java | 2 +- .../etricegen/impl/OptionalActorInstanceImpl.java | 2 +- .../genmodel/etricegen/impl/PortInstanceImpl.java | 2 +- .../core/genmodel/etricegen/impl/RootImpl.java | 262 +++++++++------------ .../genmodel/etricegen/impl/SAPInstanceImpl.java | 2 +- .../genmodel/etricegen/impl/SPPInstanceImpl.java | 2 +- .../etricegen/impl/ServiceImplInstanceImpl.java | 2 +- .../etricegen/impl/StructureInstanceImpl.java | 2 +- .../etricegen/impl/SubSystemInstanceImpl.java | 2 +- .../etricegen/impl/SystemInstanceImpl.java | 2 +- .../core/genmodel/etricegen/impl/WireImpl.java | 2 +- .../etricegen/impl/WiredActorClassImpl.java | 2 +- .../etricegen/impl/WiredStructureClassImpl.java | 2 +- .../etricegen/impl/WiredSubSystemClassImpl.java | 2 +- .../genmodel/etricegen/util/ETriceGenSwitch.java | 2 +- 50 files changed, 307 insertions(+), 322 deletions(-) (limited to 'plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen') diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/AbstractInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/AbstractInstance.java index 0926c87b7..ec4a5f05d 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/AbstractInstance.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/AbstractInstance.java @@ -20,10 +20,10 @@ import org.eclipse.emf.common.util.EList; * *

* The following features are supported: + *

* - *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getAbstractInstance() * @model abstract="true" diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInstance.java index 5e97b3efd..ee0a80718 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInstance.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInstance.java @@ -28,12 +28,12 @@ import org.eclipse.etrice.core.room.SubSystemClass; * *

* The following features are supported: + *

* - *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getActorInstance() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInterfaceInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInterfaceInstance.java index d6f42df51..4d3d1d784 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInterfaceInstance.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInterfaceInstance.java @@ -21,13 +21,13 @@ import org.eclipse.etrice.core.room.ActorClass; * *

* The following features are supported: + *

* - *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getActorInterfaceInstance() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/BindingInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/BindingInstance.java index c94bf65ca..b809780d0 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/BindingInstance.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/BindingInstance.java @@ -27,11 +27,11 @@ import org.eclipse.etrice.core.room.Binding; * *

* The following features are supported: + *

* - *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getBindingInstance() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ConnectionInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ConnectionInstance.java index 64d848571..ff35ec963 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ConnectionInstance.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ConnectionInstance.java @@ -24,13 +24,13 @@ import org.eclipse.etrice.core.room.SPP; * *

* The following features are supported: + *

* - *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getConnectionInstance() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ETriceGenPackage.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ETriceGenPackage.java index 935160f44..b43db7179 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ETriceGenPackage.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ETriceGenPackage.java @@ -122,94 +122,94 @@ public interface ETriceGenPackage extends EPackage { int ROOT__MODELS = 4; /** - * The feature id for the 'Xp Actor Classes' containment reference list. + * The feature id for the 'Imported Models' reference list. * * * @generated * @ordered */ - int ROOT__XP_ACTOR_CLASSES = 5; + int ROOT__IMPORTED_MODELS = 5; /** - * The feature id for the 'Used Data Classes' reference list. + * The feature id for the 'Xp Actor Classes' containment reference list. * * * @generated * @ordered */ - int ROOT__USED_DATA_CLASSES = 6; + int ROOT__XP_ACTOR_CLASSES = 6; /** - * The feature id for the 'Used Protocol Classes' reference list. + * The feature id for the 'Data Classes' reference list. * * * @generated * @ordered */ - int ROOT__USED_PROTOCOL_CLASSES = 7; + int ROOT__DATA_CLASSES = 7; /** - * The feature id for the 'Used Actor Classes' reference list. + * The feature id for the 'Protocol Classes' reference list. * * * @generated * @ordered */ - int ROOT__USED_ACTOR_CLASSES = 8; + int ROOT__PROTOCOL_CLASSES = 8; /** - * The feature id for the 'Used Room Models' reference list. + * The feature id for the 'Actor Classes' reference list. * * * @generated * @ordered */ - int ROOT__USED_ROOM_MODELS = 9; + int ROOT__ACTOR_CLASSES = 9; /** - * The feature id for the 'Sub System Classes' reference list. + * The feature id for the 'Enum Classes' reference list. * * * @generated * @ordered */ - int ROOT__SUB_SYSTEM_CLASSES = 10; + int ROOT__ENUM_CLASSES = 10; /** - * The feature id for the 'Optional Instances' containment reference list. + * The feature id for the 'Sub System Classes' reference list. * * * @generated * @ordered */ - int ROOT__OPTIONAL_INSTANCES = 11; + int ROOT__SUB_SYSTEM_CLASSES = 11; /** - * The feature id for the 'Optional Actor Classes' reference list. + * The feature id for the 'Optional Instances' containment reference list. * * * @generated * @ordered */ - int ROOT__OPTIONAL_ACTOR_CLASSES = 12; + int ROOT__OPTIONAL_INSTANCES = 12; /** - * The feature id for the 'Wired Instances' containment reference list. + * The feature id for the 'Optional Actor Classes' reference list. * * * @generated * @ordered */ - int ROOT__WIRED_INSTANCES = 13; + int ROOT__OPTIONAL_ACTOR_CLASSES = 13; /** - * The feature id for the 'Used Enum Classes' reference list. + * The feature id for the 'Wired Instances' containment reference list. * * * @generated * @ordered */ - int ROOT__USED_ENUM_CLASSES = 14; + int ROOT__WIRED_INSTANCES = 14; /** * The number of structural features of the 'Root' class. @@ -2181,6 +2181,17 @@ public interface ETriceGenPackage extends EPackage { */ EReference getRoot_Models(); + /** + * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getImportedModels Imported Models}'. + * + * + * @return the meta object for the reference list 'Imported Models'. + * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getImportedModels() + * @see #getRoot() + * @generated + */ + EReference getRoot_ImportedModels(); + /** * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getXpActorClasses Xp Actor Classes}'. * @@ -2193,48 +2204,48 @@ public interface ETriceGenPackage extends EPackage { EReference getRoot_XpActorClasses(); /** - * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedDataClasses Used Data Classes}'. + * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getDataClasses Data Classes}'. * * - * @return the meta object for the reference list 'Used Data Classes'. - * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedDataClasses() + * @return the meta object for the reference list 'Data Classes'. + * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getDataClasses() * @see #getRoot() * @generated */ - EReference getRoot_UsedDataClasses(); + EReference getRoot_DataClasses(); /** - * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedProtocolClasses Used Protocol Classes}'. + * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getProtocolClasses Protocol Classes}'. * * - * @return the meta object for the reference list 'Used Protocol Classes'. - * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedProtocolClasses() + * @return the meta object for the reference list 'Protocol Classes'. + * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getProtocolClasses() * @see #getRoot() * @generated */ - EReference getRoot_UsedProtocolClasses(); + EReference getRoot_ProtocolClasses(); /** - * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedActorClasses Used Actor Classes}'. + * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getActorClasses Actor Classes}'. * * - * @return the meta object for the reference list 'Used Actor Classes'. - * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedActorClasses() + * @return the meta object for the reference list 'Actor Classes'. + * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getActorClasses() * @see #getRoot() * @generated */ - EReference getRoot_UsedActorClasses(); + EReference getRoot_ActorClasses(); /** - * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedRoomModels Used Room Models}'. + * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getEnumClasses Enum Classes}'. * * - * @return the meta object for the reference list 'Used Room Models'. - * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedRoomModels() + * @return the meta object for the reference list 'Enum Classes'. + * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getEnumClasses() * @see #getRoot() * @generated */ - EReference getRoot_UsedRoomModels(); + EReference getRoot_EnumClasses(); /** * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getSubSystemClasses Sub System Classes}'. @@ -2280,17 +2291,6 @@ public interface ETriceGenPackage extends EPackage { */ EReference getRoot_WiredInstances(); - /** - * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedEnumClasses Used Enum Classes}'. - * - * - * @return the meta object for the reference list 'Used Enum Classes'. - * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedEnumClasses() - * @see #getRoot() - * @generated - */ - EReference getRoot_UsedEnumClasses(); - /** * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase Instance Base}'. * @@ -3220,6 +3220,14 @@ public interface ETriceGenPackage extends EPackage { */ EReference ROOT__MODELS = eINSTANCE.getRoot_Models(); + /** + * The meta object literal for the 'Imported Models' reference list feature. + * + * + * @generated + */ + EReference ROOT__IMPORTED_MODELS = eINSTANCE.getRoot_ImportedModels(); + /** * The meta object literal for the 'Xp Actor Classes' containment reference list feature. * @@ -3229,36 +3237,36 @@ public interface ETriceGenPackage extends EPackage { EReference ROOT__XP_ACTOR_CLASSES = eINSTANCE.getRoot_XpActorClasses(); /** - * The meta object literal for the 'Used Data Classes' reference list feature. + * The meta object literal for the 'Data Classes' reference list feature. * * * @generated */ - EReference ROOT__USED_DATA_CLASSES = eINSTANCE.getRoot_UsedDataClasses(); + EReference ROOT__DATA_CLASSES = eINSTANCE.getRoot_DataClasses(); /** - * The meta object literal for the 'Used Protocol Classes' reference list feature. + * The meta object literal for the 'Protocol Classes' reference list feature. * * * @generated */ - EReference ROOT__USED_PROTOCOL_CLASSES = eINSTANCE.getRoot_UsedProtocolClasses(); + EReference ROOT__PROTOCOL_CLASSES = eINSTANCE.getRoot_ProtocolClasses(); /** - * The meta object literal for the 'Used Actor Classes' reference list feature. + * The meta object literal for the 'Actor Classes' reference list feature. * * * @generated */ - EReference ROOT__USED_ACTOR_CLASSES = eINSTANCE.getRoot_UsedActorClasses(); + EReference ROOT__ACTOR_CLASSES = eINSTANCE.getRoot_ActorClasses(); /** - * The meta object literal for the 'Used Room Models' reference list feature. + * The meta object literal for the 'Enum Classes' reference list feature. * * * @generated */ - EReference ROOT__USED_ROOM_MODELS = eINSTANCE.getRoot_UsedRoomModels(); + EReference ROOT__ENUM_CLASSES = eINSTANCE.getRoot_EnumClasses(); /** * The meta object literal for the 'Sub System Classes' reference list feature. @@ -3292,14 +3300,6 @@ public interface ETriceGenPackage extends EPackage { */ EReference ROOT__WIRED_INSTANCES = eINSTANCE.getRoot_WiredInstances(); - /** - * The meta object literal for the 'Used Enum Classes' reference list feature. - * - * - * @generated - */ - EReference ROOT__USED_ENUM_CLASSES = eINSTANCE.getRoot_UsedEnumClasses(); - /** * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl Instance Base}' class. * diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ExpandedActorClass.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ExpandedActorClass.java index 0cd82fae9..980dfc04c 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ExpandedActorClass.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ExpandedActorClass.java @@ -26,10 +26,10 @@ import org.eclipse.etrice.core.room.VarDecl; * *

* The following features are supported: + *

* - *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getExpandedActorClass() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InstanceBase.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InstanceBase.java index 542f9d837..b33b002dd 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InstanceBase.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InstanceBase.java @@ -28,6 +28,7 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

* - *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInstanceBase() * @model abstract="true" diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InterfaceItemInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InterfaceItemInstance.java index b745ddd95..3f2f0d7b5 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InterfaceItemInstance.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InterfaceItemInstance.java @@ -29,11 +29,11 @@ import org.eclipse.etrice.core.room.ProtocolClass; * *

* The following features are supported: + *

* - *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInterfaceItemInstance() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/OpenBinding.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/OpenBinding.java index 25964bbb3..43ce40822 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/OpenBinding.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/OpenBinding.java @@ -24,11 +24,11 @@ import org.eclipse.etrice.core.room.Port; * *

* The following features are supported: + *

* - *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getOpenBinding() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/OpenServiceConnection.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/OpenServiceConnection.java index f9449db39..d9e7adfd4 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/OpenServiceConnection.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/OpenServiceConnection.java @@ -24,11 +24,11 @@ import org.eclipse.etrice.core.room.ProtocolClass; * *

* The following features are supported: + *

* - *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getOpenServiceConnection() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/OptionalActorInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/OptionalActorInstance.java index ca34e8ec6..6987f7313 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/OptionalActorInstance.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/OptionalActorInstance.java @@ -21,11 +21,11 @@ import org.eclipse.etrice.core.room.ActorClass; * *

* The following features are supported: + *

* - *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getOptionalActorInstance() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortInstance.java index bcaedd651..d052352e4 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortInstance.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortInstance.java @@ -24,12 +24,12 @@ import org.eclipse.etrice.core.room.Port; * *

* The following features are supported: + *

* - *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getPortInstance() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortKind.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortKind.java index 596a93fcb..83b056c82 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortKind.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortKind.java @@ -143,6 +143,8 @@ public enum PortKind implements Enumerator { * Returns the 'Port Kind' literal with the specified literal value. * * + * @param literal the literal. + * @return the matching enumerator or null. * @generated */ public static PortKind get(String literal) { @@ -159,6 +161,8 @@ public enum PortKind implements Enumerator { * Returns the 'Port Kind' literal with the specified name. * * + * @param name the name. + * @return the matching enumerator or null. * @generated */ public static PortKind getByName(String name) { @@ -175,6 +179,8 @@ public enum PortKind implements Enumerator { * Returns the 'Port Kind' literal with the specified integer value. * * + * @param value the integer value. + * @return the matching enumerator or null. * @generated */ public static PortKind get(int value) { diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java index 0ee1e8458..7e058a288 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java @@ -30,24 +30,24 @@ import org.eclipse.etrice.core.room.SubSystemClass; * *

* The following features are supported: + *

* - *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot() * @model @@ -141,6 +141,22 @@ public interface Root extends EObject { */ EList getModels(); + /** + * Returns the value of the 'Imported Models' reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.RoomModel}. + * + *

+ * If the meaning of the 'Imported Models' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Imported Models' reference list. + * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_ImportedModels() + * @model + * @generated + */ + EList getImportedModels(); + /** * Returns the value of the 'Xp Actor Classes' containment reference list. * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass}. @@ -157,68 +173,68 @@ public interface Root extends EObject { EList getXpActorClasses(); /** - * Returns the value of the 'Used Data Classes' reference list. + * Returns the value of the 'Data Classes' reference list. * The list contents are of type {@link org.eclipse.etrice.core.room.DataClass}. * *

- * This is a list of all used data classes (i.e. directly or indirectly referenced starting from the top level object - * which is a logical system or, if no such is present, a sub system). + * If the meaning of the 'Data Classes' reference list isn't clear, + * there really should be more of a description here... *

* - * @return the value of the 'Used Data Classes' reference list. - * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedDataClasses() + * @return the value of the 'Data Classes' reference list. + * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_DataClasses() * @model transient="true" volatile="true" derived="true" * @generated */ - EList getUsedDataClasses(); + EList getDataClasses(); /** - * Returns the value of the 'Used Protocol Classes' reference list. + * Returns the value of the 'Protocol Classes' reference list. * The list contents are of type {@link org.eclipse.etrice.core.room.ProtocolClass}. * *

- * This is a list of all used protocol classes (i.e. directly or indirectly referenced starting from the top level object - * which is a logical system or, if no such is present, a sub system). + * If the meaning of the 'Protocol Classes' reference list isn't clear, + * there really should be more of a description here... *

* - * @return the value of the 'Used Protocol Classes' reference list. - * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedProtocolClasses() + * @return the value of the 'Protocol Classes' reference list. + * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_ProtocolClasses() * @model transient="true" volatile="true" derived="true" * @generated */ - EList getUsedProtocolClasses(); + EList getProtocolClasses(); /** - * Returns the value of the 'Used Actor Classes' reference list. + * Returns the value of the 'Actor Classes' reference list. * The list contents are of type {@link org.eclipse.etrice.core.room.ActorClass}. * *

- * This is a list of all used actor classes (i.e. directly or indirectly referenced starting from the top level object - * which is a logical system or, if no such is present, a sub system). + * If the meaning of the 'Actor Classes' reference list isn't clear, + * there really should be more of a description here... *

* - * @return the value of the 'Used Actor Classes' reference list. - * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedActorClasses() + * @return the value of the 'Actor Classes' reference list. + * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_ActorClasses() * @model transient="true" volatile="true" derived="true" * @generated */ - EList getUsedActorClasses(); + EList getActorClasses(); /** - * Returns the value of the 'Used Room Models' reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.RoomModel}. + * Returns the value of the 'Enum Classes' reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.EnumerationType}. * *

- * This is a list of all used models (i.e. directly or indirectly referenced starting from the top level object - * which is a logical system or, if no such is present, a sub system). + * If the meaning of the 'Enum Classes' reference list isn't clear, + * there really should be more of a description here... *

* - * @return the value of the 'Used Room Models' reference list. - * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedRoomModels() + * @return the value of the 'Enum Classes' reference list. + * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_EnumClasses() * @model transient="true" volatile="true" derived="true" * @generated */ - EList getUsedRoomModels(); + EList getEnumClasses(); /** * Returns the value of the 'Sub System Classes' reference list. @@ -284,22 +300,6 @@ public interface Root extends EObject { */ EList getWiredInstances(); - /** - * Returns the value of the 'Used Enum Classes' reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.EnumerationType}. - * - *

- * If the meaning of the 'Used Enum Classes' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Used Enum Classes' reference list. - * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedEnumClasses() - * @model transient="true" volatile="true" derived="true" - * @generated - */ - EList getUsedEnumClasses(); - /** * * @param cls a room class @@ -361,6 +361,14 @@ public interface Root extends EObject { */ ExpandedActorClass getExpandedActorClass(ActorInstance ai); + /** + * + * + * @model + * @generated + */ + ExpandedActorClass getExpandedActorClass(ActorClass ac); + /** * * diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SAPInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SAPInstance.java index b4784ebc3..8c5d8ce9c 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SAPInstance.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SAPInstance.java @@ -22,10 +22,10 @@ import org.eclipse.etrice.core.room.SAP; * *

* The following features are supported: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.SAPInstance#getSap Sap}
    • *
- *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getSAPInstance() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SPPInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SPPInstance.java index 6e7798d23..ec5623142 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SPPInstance.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SPPInstance.java @@ -23,12 +23,12 @@ import org.eclipse.etrice.core.room.SPP; * *

* The following features are supported: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getSpp Spp}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getIncoming Incoming}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getOutgoing Outgoing}
    • *
- *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getSPPInstance() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ServiceImplInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ServiceImplInstance.java index 0ce7f4681..706d73591 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ServiceImplInstance.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ServiceImplInstance.java @@ -22,10 +22,10 @@ import org.eclipse.etrice.core.room.ServiceImplementation; * *

* The following features are supported: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance#getSvcImpl Svc Impl}
    • *
- *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getServiceImplInstance() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/StructureInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/StructureInstance.java index 501a884bd..fd793e9c4 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/StructureInstance.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/StructureInstance.java @@ -27,6 +27,7 @@ import org.eclipse.etrice.core.room.ActorRef; * *

* The following features are supported: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getInstances Instances}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getSaps Saps}
    • @@ -37,7 +38,6 @@ import org.eclipse.etrice.core.room.ActorRef; *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getAllContainedInstances All Contained Instances}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getOrderedIfItemInstances Ordered If Item Instances}
    • *
- *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getStructureInstance() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SubSystemInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SubSystemInstance.java index 0e7d6aa40..a422e72fe 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SubSystemInstance.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SubSystemInstance.java @@ -22,11 +22,11 @@ import org.eclipse.etrice.core.room.SubSystemClass; * *

* The following features are supported: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance#getSubSystemClass Sub System Class}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance#getMaxObjId Max Obj Id}
    • *
- *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getSubSystemInstance() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SystemInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SystemInstance.java index 352ba22be..7870894b1 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SystemInstance.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SystemInstance.java @@ -22,11 +22,11 @@ import org.eclipse.etrice.core.room.LogicalSystem; * *

* The following features are supported: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.SystemInstance#getInstances Instances}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.SystemInstance#getLogicalSystem Logical System}
    • *
- *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getSystemInstance() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Wire.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Wire.java index 0b10f7839..c0337c0d4 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Wire.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Wire.java @@ -22,12 +22,12 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.Wire#isDataDriven Data Driven}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.Wire#getPath1 Path1}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.Wire#getPath2 Path2}
    • *
- *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getWire() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/WiredActorClass.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/WiredActorClass.java index 671ee44d2..2713e7f33 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/WiredActorClass.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/WiredActorClass.java @@ -20,10 +20,10 @@ import org.eclipse.etrice.core.room.ActorClass; * *

* The following features are supported: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.WiredActorClass#getActorClass Actor Class}
    • *
- *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getWiredActorClass() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/WiredStructureClass.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/WiredStructureClass.java index 27eb25838..bc9e5bfea 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/WiredStructureClass.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/WiredStructureClass.java @@ -22,13 +22,13 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.WiredStructureClass#getWires Wires}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.WiredStructureClass#getOpenBindings Open Bindings}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.WiredStructureClass#getProvidedServices Provided Services}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.WiredStructureClass#getRequiredServices Required Services}
    • *
- *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getWiredStructureClass() * @model abstract="true" diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/WiredSubSystemClass.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/WiredSubSystemClass.java index e2208e20e..d05700351 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/WiredSubSystemClass.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/WiredSubSystemClass.java @@ -20,10 +20,10 @@ import org.eclipse.etrice.core.room.SubSystemClass; * *

* The following features are supported: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.WiredSubSystemClass#getSubSystemClass Sub System Class}
    • *
- *

* * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getWiredSubSystemClass() * @model diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/AbstractInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/AbstractInstanceImpl.java index b95215144..170ed3c43 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/AbstractInstanceImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/AbstractInstanceImpl.java @@ -32,10 +32,10 @@ import org.eclipse.etrice.core.room.ProtocolClass; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.AbstractInstanceImpl#getPorts Ports}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java index ac01e578a..d9d5ec35e 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java @@ -27,12 +27,12 @@ import org.eclipse.etrice.core.room.ActorClass; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInstanceImpl#getActorClass Actor Class}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInstanceImpl#getReplIdx Repl Idx}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInstanceImpl#getUnindexedName Unindexed Name}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInterfaceInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInterfaceInstanceImpl.java index 97e8c3400..9c937341a 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInterfaceInstanceImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInterfaceInstanceImpl.java @@ -31,13 +31,13 @@ import org.eclipse.etrice.core.room.ActorClass; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInterfaceInstanceImpl#getActorClass Actor Class}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInterfaceInstanceImpl#getProvidedServices Provided Services}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInterfaceInstanceImpl#getOptionalInstances Optional Instances}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInterfaceInstanceImpl#isArray Array}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/BindingInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/BindingInstanceImpl.java index 9574c85bd..0272cc8af 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/BindingInstanceImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/BindingInstanceImpl.java @@ -39,11 +39,11 @@ import org.eclipse.etrice.core.room.Binding; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.BindingInstanceImpl#getPorts Ports}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.BindingInstanceImpl#getBinding Binding}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ConnectionInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ConnectionInstanceImpl.java index 5aafbbf2d..84c17a3db 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ConnectionInstanceImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ConnectionInstanceImpl.java @@ -30,13 +30,13 @@ import org.eclipse.etrice.core.room.LayerConnection; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.ConnectionInstanceImpl#getFromAI From AI}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.ConnectionInstanceImpl#getFromSPP From SPP}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.ConnectionInstanceImpl#getToSPP To SPP}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.ConnectionInstanceImpl#getConnection Connection}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenPackageImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenPackageImpl.java index 5a25a75ef..ff18bb954 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenPackageImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenPackageImpl.java @@ -348,7 +348,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka * * @generated */ - public EReference getRoot_XpActorClasses() { + public EReference getRoot_ImportedModels() { return (EReference)rootEClass.getEStructuralFeatures().get(5); } @@ -357,7 +357,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka * * @generated */ - public EReference getRoot_UsedDataClasses() { + public EReference getRoot_XpActorClasses() { return (EReference)rootEClass.getEStructuralFeatures().get(6); } @@ -366,7 +366,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka * * @generated */ - public EReference getRoot_UsedProtocolClasses() { + public EReference getRoot_DataClasses() { return (EReference)rootEClass.getEStructuralFeatures().get(7); } @@ -375,7 +375,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka * * @generated */ - public EReference getRoot_UsedActorClasses() { + public EReference getRoot_ProtocolClasses() { return (EReference)rootEClass.getEStructuralFeatures().get(8); } @@ -384,7 +384,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka * * @generated */ - public EReference getRoot_UsedRoomModels() { + public EReference getRoot_ActorClasses() { return (EReference)rootEClass.getEStructuralFeatures().get(9); } @@ -393,7 +393,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka * * @generated */ - public EReference getRoot_SubSystemClasses() { + public EReference getRoot_EnumClasses() { return (EReference)rootEClass.getEStructuralFeatures().get(10); } @@ -402,7 +402,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka * * @generated */ - public EReference getRoot_OptionalInstances() { + public EReference getRoot_SubSystemClasses() { return (EReference)rootEClass.getEStructuralFeatures().get(11); } @@ -411,7 +411,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka * * @generated */ - public EReference getRoot_OptionalActorClasses() { + public EReference getRoot_OptionalInstances() { return (EReference)rootEClass.getEStructuralFeatures().get(12); } @@ -420,7 +420,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka * * @generated */ - public EReference getRoot_WiredInstances() { + public EReference getRoot_OptionalActorClasses() { return (EReference)rootEClass.getEStructuralFeatures().get(13); } @@ -429,7 +429,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka * * @generated */ - public EReference getRoot_UsedEnumClasses() { + public EReference getRoot_WiredInstances() { return (EReference)rootEClass.getEStructuralFeatures().get(14); } @@ -1187,16 +1187,16 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka createEReference(rootEClass, ROOT__OWN_SUB_SYSTEM_INSTANCES); createEReference(rootEClass, ROOT__SUB_SYSTEM_INSTANCES); createEReference(rootEClass, ROOT__MODELS); + createEReference(rootEClass, ROOT__IMPORTED_MODELS); createEReference(rootEClass, ROOT__XP_ACTOR_CLASSES); - createEReference(rootEClass, ROOT__USED_DATA_CLASSES); - createEReference(rootEClass, ROOT__USED_PROTOCOL_CLASSES); - createEReference(rootEClass, ROOT__USED_ACTOR_CLASSES); - createEReference(rootEClass, ROOT__USED_ROOM_MODELS); + createEReference(rootEClass, ROOT__DATA_CLASSES); + createEReference(rootEClass, ROOT__PROTOCOL_CLASSES); + createEReference(rootEClass, ROOT__ACTOR_CLASSES); + createEReference(rootEClass, ROOT__ENUM_CLASSES); createEReference(rootEClass, ROOT__SUB_SYSTEM_CLASSES); createEReference(rootEClass, ROOT__OPTIONAL_INSTANCES); createEReference(rootEClass, ROOT__OPTIONAL_ACTOR_CLASSES); createEReference(rootEClass, ROOT__WIRED_INSTANCES); - createEReference(rootEClass, ROOT__USED_ENUM_CLASSES); instanceBaseEClass = createEClass(INSTANCE_BASE); createEAttribute(instanceBaseEClass, INSTANCE_BASE__NAME); @@ -1359,16 +1359,16 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka initEReference(getRoot_OwnSubSystemInstances(), this.getSubSystemInstance(), null, "ownSubSystemInstances", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getRoot_SubSystemInstances(), this.getSubSystemInstance(), null, "subSystemInstances", null, 0, -1, Root.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEReference(getRoot_Models(), theRoomPackage.getRoomModel(), null, "models", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRoot_ImportedModels(), theRoomPackage.getRoomModel(), null, "importedModels", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getRoot_XpActorClasses(), this.getExpandedActorClass(), null, "xpActorClasses", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRoot_UsedDataClasses(), theRoomPackage.getDataClass(), null, "usedDataClasses", null, 0, -1, Root.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - initEReference(getRoot_UsedProtocolClasses(), theRoomPackage.getProtocolClass(), null, "usedProtocolClasses", null, 0, -1, Root.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - initEReference(getRoot_UsedActorClasses(), theRoomPackage.getActorClass(), null, "usedActorClasses", null, 0, -1, Root.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - initEReference(getRoot_UsedRoomModels(), theRoomPackage.getRoomModel(), null, "usedRoomModels", null, 0, -1, Root.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getRoot_DataClasses(), theRoomPackage.getDataClass(), null, "dataClasses", null, 0, -1, Root.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getRoot_ProtocolClasses(), theRoomPackage.getProtocolClass(), null, "protocolClasses", null, 0, -1, Root.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getRoot_ActorClasses(), theRoomPackage.getActorClass(), null, "actorClasses", null, 0, -1, Root.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getRoot_EnumClasses(), theRoomPackage.getEnumerationType(), null, "enumClasses", null, 0, -1, Root.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEReference(getRoot_SubSystemClasses(), theRoomPackage.getSubSystemClass(), null, "subSystemClasses", null, 0, -1, Root.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEReference(getRoot_OptionalInstances(), this.getOptionalActorInstance(), null, "optionalInstances", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getRoot_OptionalActorClasses(), theRoomPackage.getActorClass(), null, "optionalActorClasses", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getRoot_WiredInstances(), this.getWiredStructureClass(), null, "wiredInstances", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRoot_UsedEnumClasses(), theRoomPackage.getEnumerationType(), null, "usedEnumClasses", null, 0, -1, Root.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); EOperation op = addEOperation(rootEClass, theRoomPackage.getRoomModel(), "getReferencedModels", 0, -1, IS_UNIQUE, IS_ORDERED); addEParameter(op, theRoomPackage.getRoomClass(), "cls", 0, 1, IS_UNIQUE, IS_ORDERED); @@ -1388,6 +1388,9 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka op = addEOperation(rootEClass, this.getExpandedActorClass(), "getExpandedActorClass", 0, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, this.getActorInstance(), "ai", 0, 1, IS_UNIQUE, IS_ORDERED); + op = addEOperation(rootEClass, this.getExpandedActorClass(), "getExpandedActorClass", 0, 1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, theRoomPackage.getActorClass(), "ac", 0, 1, IS_UNIQUE, IS_ORDERED); + op = addEOperation(rootEClass, this.getStructureInstance(), "getInstance", 0, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, ecorePackage.getEString(), "path", 0, 1, IS_UNIQUE, IS_ORDERED); diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java index 4cf1314e6..dd5a909b0 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java @@ -45,10 +45,10 @@ import org.eclipse.etrice.core.room.util.RoomHelpers; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.ExpandedActorClassImpl#getActorClass Actor Class}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java index e83abcf93..4db7677b5 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java @@ -30,6 +30,7 @@ import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl#getName Name}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl#getPath Path}
    • @@ -37,7 +38,6 @@ import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance; *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl#getThreadId Thread Id}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl#getNObjIDs NObj IDs}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java index 5ee34d7d6..7c4c7be10 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java @@ -36,11 +36,11 @@ import org.eclipse.etrice.core.room.SPP; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.InterfaceItemInstanceImpl#getProtocol Protocol}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.InterfaceItemInstanceImpl#getPeers Peers}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenBindingImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenBindingImpl.java index 9456156fc..631708963 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenBindingImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenBindingImpl.java @@ -30,11 +30,11 @@ import org.eclipse.etrice.core.room.Port; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.OpenBindingImpl#getPath Path}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.OpenBindingImpl#getPort Port}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenServiceConnectionImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenServiceConnectionImpl.java index dcc771ffb..0a25e0929 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenServiceConnectionImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenServiceConnectionImpl.java @@ -30,11 +30,11 @@ import org.eclipse.etrice.core.room.ProtocolClass; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.OpenServiceConnectionImpl#getPath Path}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.OpenServiceConnectionImpl#getProtocol Protocol}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OptionalActorInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OptionalActorInstanceImpl.java index a5f3e66bc..0fb5bafa9 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OptionalActorInstanceImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OptionalActorInstanceImpl.java @@ -33,11 +33,11 @@ import org.eclipse.etrice.core.room.ActorClass; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.OptionalActorInstanceImpl#getActorClass Actor Class}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.OptionalActorInstanceImpl#getRequiredServices Required Services}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java index 527cd3f15..923c0194a 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java @@ -36,12 +36,12 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.PortInstanceImpl#getPort Port}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.PortInstanceImpl#getKind Kind}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.PortInstanceImpl#getBindings Bindings}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java index 6cbb2040f..76f9aa414 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java @@ -17,7 +17,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; -import java.util.HashSet; import java.util.Set; import org.eclipse.emf.common.notify.Notification; @@ -25,9 +24,7 @@ import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.DelegatingEList; import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; @@ -36,7 +33,6 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.etrice.core.genmodel.etricegen.AbstractInstance; import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance; -import org.eclipse.etrice.core.genmodel.etricegen.ActorInterfaceInstance; import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage; import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass; import org.eclipse.etrice.core.genmodel.etricegen.InstanceBase; @@ -62,24 +58,24 @@ import org.eclipse.etrice.core.room.SubSystemClass; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#isLibrary Library}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getSystemInstances System Instances}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getOwnSubSystemInstances Own Sub System Instances}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getSubSystemInstances Sub System Instances}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getModels Models}
    • + *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getImportedModels Imported Models}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getXpActorClasses Xp Actor Classes}
    • - *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getUsedDataClasses Used Data Classes}
    • - *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getUsedProtocolClasses Used Protocol Classes}
    • - *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getUsedActorClasses Used Actor Classes}
    • - *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getUsedRoomModels Used Room Models}
    • + *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getDataClasses Data Classes}
    • + *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getProtocolClasses Protocol Classes}
    • + *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getActorClasses Actor Classes}
    • + *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getEnumClasses Enum Classes}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getSubSystemClasses Sub System Classes}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getOptionalInstances Optional Instances}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getOptionalActorClasses Optional Actor Classes}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getWiredInstances Wired Instances}
    • - *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getUsedEnumClasses Used Enum Classes}
    • *
- *

* * @generated */ @@ -155,6 +151,16 @@ public class RootImpl extends EObjectImpl implements Root { */ protected EList models; + /** + * The cached value of the '{@link #getImportedModels() Imported Models}' reference list. + * + * + * @see #getImportedModels() + * @generated + * @ordered + */ + protected EList importedModels; + /** * The cached value of the '{@link #getXpActorClasses() Xp Actor Classes}' containment reference list. * @@ -252,23 +258,23 @@ public class RootImpl extends EObjectImpl implements Root { * * @generated */ - public EList getXpActorClasses() { - if (xpActorClasses == null) { - xpActorClasses = new EObjectContainmentEList(ExpandedActorClass.class, this, ETriceGenPackage.ROOT__XP_ACTOR_CLASSES); + public EList getImportedModels() { + if (importedModels == null) { + importedModels = new EObjectResolvingEList(RoomModel.class, this, ETriceGenPackage.ROOT__IMPORTED_MODELS); } - return xpActorClasses; + return importedModels; } /** * * - * @generated NOT + * @generated */ - public EList getUsedDataClasses() { - if (usedDataClasses==null) { - computeUsedClasses(); + public EList getXpActorClasses() { + if (xpActorClasses == null) { + xpActorClasses = new EObjectContainmentEList(ExpandedActorClass.class, this, ETriceGenPackage.ROOT__XP_ACTOR_CLASSES); } - return usedDataClasses; + return xpActorClasses; } /** @@ -276,11 +282,11 @@ public class RootImpl extends EObjectImpl implements Root { * * @generated NOT */ - public EList getUsedEnumClasses() { - if (usedEnumClasses==null) { + public EList getDataClasses() { + if (dataClasses==null) { computeUsedClasses(); } - return usedEnumClasses; + return dataClasses; } /** @@ -288,11 +294,11 @@ public class RootImpl extends EObjectImpl implements Root { * * @generated NOT */ - public EList getUsedProtocolClasses() { - if (usedProtocolClasses==null) { + public EList getEnumClasses() { + if (enumClasses==null) { computeUsedClasses(); } - return usedProtocolClasses; + return enumClasses; } /** @@ -300,11 +306,11 @@ public class RootImpl extends EObjectImpl implements Root { * * @generated NOT */ - public EList getUsedActorClasses() { - if (usedActorClasses==null) { + public EList getProtocolClasses() { + if (protocolClasses==null) { computeUsedClasses(); } - return usedActorClasses; + return protocolClasses; } /** @@ -312,11 +318,11 @@ public class RootImpl extends EObjectImpl implements Root { * * @generated NOT */ - public EList getUsedRoomModels() { - if (usedRoomModels==null) { + public EList getActorClasses() { + if (actorClasses==null) { computeUsedClasses(); } - return usedRoomModels; + return actorClasses; } private BasicEList subSystemClasses = null; @@ -493,6 +499,19 @@ public class RootImpl extends EObjectImpl implements Root { return null; } + /** + * + * + * @generated NOT + */ + public ExpandedActorClass getExpandedActorClass(ActorClass ac) { + for (ExpandedActorClass xpac : getXpActorClasses()) { + if (xpac.getActorClass()==ac) + return xpac; + } + return null; + } + /** * * @@ -612,16 +631,18 @@ public class RootImpl extends EObjectImpl implements Root { return getSubSystemInstances(); case ETriceGenPackage.ROOT__MODELS: return getModels(); + case ETriceGenPackage.ROOT__IMPORTED_MODELS: + return getImportedModels(); case ETriceGenPackage.ROOT__XP_ACTOR_CLASSES: return getXpActorClasses(); - case ETriceGenPackage.ROOT__USED_DATA_CLASSES: - return getUsedDataClasses(); - case ETriceGenPackage.ROOT__USED_PROTOCOL_CLASSES: - return getUsedProtocolClasses(); - case ETriceGenPackage.ROOT__USED_ACTOR_CLASSES: - return getUsedActorClasses(); - case ETriceGenPackage.ROOT__USED_ROOM_MODELS: - return getUsedRoomModels(); + case ETriceGenPackage.ROOT__DATA_CLASSES: + return getDataClasses(); + case ETriceGenPackage.ROOT__PROTOCOL_CLASSES: + return getProtocolClasses(); + case ETriceGenPackage.ROOT__ACTOR_CLASSES: + return getActorClasses(); + case ETriceGenPackage.ROOT__ENUM_CLASSES: + return getEnumClasses(); case ETriceGenPackage.ROOT__SUB_SYSTEM_CLASSES: return getSubSystemClasses(); case ETriceGenPackage.ROOT__OPTIONAL_INSTANCES: @@ -630,8 +651,6 @@ public class RootImpl extends EObjectImpl implements Root { return getOptionalActorClasses(); case ETriceGenPackage.ROOT__WIRED_INSTANCES: return getWiredInstances(); - case ETriceGenPackage.ROOT__USED_ENUM_CLASSES: - return getUsedEnumClasses(); } return super.eGet(featureID, resolve, coreType); } @@ -660,25 +679,29 @@ public class RootImpl extends EObjectImpl implements Root { getModels().clear(); getModels().addAll((Collection)newValue); return; + case ETriceGenPackage.ROOT__IMPORTED_MODELS: + getImportedModels().clear(); + getImportedModels().addAll((Collection)newValue); + return; case ETriceGenPackage.ROOT__XP_ACTOR_CLASSES: getXpActorClasses().clear(); getXpActorClasses().addAll((Collection)newValue); return; - case ETriceGenPackage.ROOT__USED_DATA_CLASSES: - getUsedDataClasses().clear(); - getUsedDataClasses().addAll((Collection)newValue); + case ETriceGenPackage.ROOT__DATA_CLASSES: + getDataClasses().clear(); + getDataClasses().addAll((Collection)newValue); return; - case ETriceGenPackage.ROOT__USED_PROTOCOL_CLASSES: - getUsedProtocolClasses().clear(); - getUsedProtocolClasses().addAll((Collection)newValue); + case ETriceGenPackage.ROOT__PROTOCOL_CLASSES: + getProtocolClasses().clear(); + getProtocolClasses().addAll((Collection)newValue); return; - case ETriceGenPackage.ROOT__USED_ACTOR_CLASSES: - getUsedActorClasses().clear(); - getUsedActorClasses().addAll((Collection)newValue); + case ETriceGenPackage.ROOT__ACTOR_CLASSES: + getActorClasses().clear(); + getActorClasses().addAll((Collection)newValue); return; - case ETriceGenPackage.ROOT__USED_ROOM_MODELS: - getUsedRoomModels().clear(); - getUsedRoomModels().addAll((Collection)newValue); + case ETriceGenPackage.ROOT__ENUM_CLASSES: + getEnumClasses().clear(); + getEnumClasses().addAll((Collection)newValue); return; case ETriceGenPackage.ROOT__SUB_SYSTEM_CLASSES: getSubSystemClasses().clear(); @@ -696,10 +719,6 @@ public class RootImpl extends EObjectImpl implements Root { getWiredInstances().clear(); getWiredInstances().addAll((Collection)newValue); return; - case ETriceGenPackage.ROOT__USED_ENUM_CLASSES: - getUsedEnumClasses().clear(); - getUsedEnumClasses().addAll((Collection)newValue); - return; } super.eSet(featureID, newValue); } @@ -724,20 +743,23 @@ public class RootImpl extends EObjectImpl implements Root { case ETriceGenPackage.ROOT__MODELS: getModels().clear(); return; + case ETriceGenPackage.ROOT__IMPORTED_MODELS: + getImportedModels().clear(); + return; case ETriceGenPackage.ROOT__XP_ACTOR_CLASSES: getXpActorClasses().clear(); return; - case ETriceGenPackage.ROOT__USED_DATA_CLASSES: - getUsedDataClasses().clear(); + case ETriceGenPackage.ROOT__DATA_CLASSES: + getDataClasses().clear(); return; - case ETriceGenPackage.ROOT__USED_PROTOCOL_CLASSES: - getUsedProtocolClasses().clear(); + case ETriceGenPackage.ROOT__PROTOCOL_CLASSES: + getProtocolClasses().clear(); return; - case ETriceGenPackage.ROOT__USED_ACTOR_CLASSES: - getUsedActorClasses().clear(); + case ETriceGenPackage.ROOT__ACTOR_CLASSES: + getActorClasses().clear(); return; - case ETriceGenPackage.ROOT__USED_ROOM_MODELS: - getUsedRoomModels().clear(); + case ETriceGenPackage.ROOT__ENUM_CLASSES: + getEnumClasses().clear(); return; case ETriceGenPackage.ROOT__SUB_SYSTEM_CLASSES: getSubSystemClasses().clear(); @@ -751,9 +773,6 @@ public class RootImpl extends EObjectImpl implements Root { case ETriceGenPackage.ROOT__WIRED_INSTANCES: getWiredInstances().clear(); return; - case ETriceGenPackage.ROOT__USED_ENUM_CLASSES: - getUsedEnumClasses().clear(); - return; } super.eUnset(featureID); } @@ -776,16 +795,18 @@ public class RootImpl extends EObjectImpl implements Root { return !getSubSystemInstances().isEmpty(); case ETriceGenPackage.ROOT__MODELS: return models != null && !models.isEmpty(); + case ETriceGenPackage.ROOT__IMPORTED_MODELS: + return importedModels != null && !importedModels.isEmpty(); case ETriceGenPackage.ROOT__XP_ACTOR_CLASSES: return xpActorClasses != null && !xpActorClasses.isEmpty(); - case ETriceGenPackage.ROOT__USED_DATA_CLASSES: - return !getUsedDataClasses().isEmpty(); - case ETriceGenPackage.ROOT__USED_PROTOCOL_CLASSES: - return !getUsedProtocolClasses().isEmpty(); - case ETriceGenPackage.ROOT__USED_ACTOR_CLASSES: - return !getUsedActorClasses().isEmpty(); - case ETriceGenPackage.ROOT__USED_ROOM_MODELS: - return !getUsedRoomModels().isEmpty(); + case ETriceGenPackage.ROOT__DATA_CLASSES: + return !getDataClasses().isEmpty(); + case ETriceGenPackage.ROOT__PROTOCOL_CLASSES: + return !getProtocolClasses().isEmpty(); + case ETriceGenPackage.ROOT__ACTOR_CLASSES: + return !getActorClasses().isEmpty(); + case ETriceGenPackage.ROOT__ENUM_CLASSES: + return !getEnumClasses().isEmpty(); case ETriceGenPackage.ROOT__SUB_SYSTEM_CLASSES: return !getSubSystemClasses().isEmpty(); case ETriceGenPackage.ROOT__OPTIONAL_INSTANCES: @@ -794,8 +815,6 @@ public class RootImpl extends EObjectImpl implements Root { return optionalActorClasses != null && !optionalActorClasses.isEmpty(); case ETriceGenPackage.ROOT__WIRED_INSTANCES: return wiredInstances != null && !wiredInstances.isEmpty(); - case ETriceGenPackage.ROOT__USED_ENUM_CLASSES: - return !getUsedEnumClasses().isEmpty(); } return super.eIsSet(featureID); } @@ -818,80 +837,29 @@ public class RootImpl extends EObjectImpl implements Root { private RoomCrossReferencer crossReferencer = new RoomCrossReferencer(); - private BasicEList usedDataClasses = null; - private BasicEList usedEnumClasses = null; - private BasicEList usedProtocolClasses = null; - private BasicEList usedActorClasses = null; - private BasicEList usedRoomModels = null; + private BasicEList dataClasses = null; + private BasicEList enumClasses = null; + private BasicEList protocolClasses = null; + private BasicEList actorClasses = null; private void computeUsedClasses() { - if (isLibrary()) { - usedDataClasses = new BasicEList(); - usedEnumClasses = new BasicEList(); - usedProtocolClasses = new BasicEList(); - usedActorClasses = new BasicEList(); - usedRoomModels = new BasicEList(); - subSystemClasses = new BasicEList(); - for (RoomModel mdl : getModels()) { - usedDataClasses.addAll(mdl.getDataClasses()); - usedEnumClasses.addAll(mdl.getEnumerationTypes()); - - for (GeneralProtocolClass gpc : mdl.getProtocolClasses()) { - if (gpc instanceof ProtocolClass) - usedProtocolClasses.add((ProtocolClass) gpc); - } - - usedActorClasses.addAll(mdl.getActorClasses()); - subSystemClasses.addAll(mdl.getSubSystemClasses()); - usedRoomModels.add(mdl); - } - } - else { - // first we collect actor classes - HashSet actorClasses = new HashSet(); - for (SubSystemInstance ci : getSubSystemInstances()) { - TreeIterator it = ci.eAllContents(); - while (it.hasNext()) { - EObject obj = it.next(); - if (obj instanceof ActorInstance) { - ActorClass ac = ((ActorInstance)obj).getActorClass(); - actorClasses.add(ac); - } - else if (obj instanceof ActorInterfaceInstance) { - ActorInterfaceInstance aii = (ActorInterfaceInstance) obj; - actorClasses.add(aii.getActorClass()); - for (OptionalActorInstance oai : aii.getOptionalInstances()) { - actorClasses.add(oai.getActorClass()); - } - } - } - } - for (OptionalActorInstance oai: getOptionalInstances()) { - actorClasses.add(oai.getActorClass()); - } - - HashSet dataClasses = new HashSet(); - HashSet enumClasses = new HashSet(); - HashSet protocolClasses = new HashSet(); - HashSet models = new HashSet(); + dataClasses = new BasicEList(); + enumClasses = new BasicEList(); + protocolClasses = new BasicEList(); + actorClasses = new BasicEList(); + subSystemClasses = new BasicEList(); + for (RoomModel mdl : getModels()) { + dataClasses.addAll(mdl.getDataClasses()); + enumClasses.addAll(mdl.getEnumerationTypes()); - crossReferencer.getReferencedClassesAndModels(dataClasses, enumClasses, protocolClasses, - actorClasses, models); + for (GeneralProtocolClass gpc : mdl.getProtocolClasses()) { + if (gpc instanceof ProtocolClass) + protocolClasses.add((ProtocolClass) gpc); + } - usedDataClasses = new BasicEList(dataClasses); - usedEnumClasses = new BasicEList(enumClasses); - usedProtocolClasses = new BasicEList(protocolClasses); - usedActorClasses = new BasicEList(actorClasses); - usedRoomModels = new BasicEList(models); + actorClasses.addAll(mdl.getActorClasses()); + subSystemClasses.addAll(mdl.getSubSystemClasses()); } - - RoomClassComparator rcComp = new RoomClassComparator(); - RoomModelComparator mdlComp = new RoomModelComparator(); - Collections.sort(usedDataClasses, rcComp); - Collections.sort(usedEnumClasses, rcComp); - Collections.sort(usedProtocolClasses, rcComp); - Collections.sort(usedActorClasses, rcComp); - Collections.sort(usedRoomModels, mdlComp); } } //RootImpl diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java index f2955a36f..077c3110a 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java @@ -29,10 +29,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.SAPInstanceImpl#getSap Sap}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java index e087b3d7e..d3686a786 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java @@ -39,12 +39,12 @@ import org.eclipse.emf.ecore.util.InternalEList; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.SPPInstanceImpl#getSpp Spp}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.SPPInstanceImpl#getIncoming Incoming}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.SPPInstanceImpl#getOutgoing Outgoing}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java index b96b8e570..0a7923e3d 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java @@ -30,10 +30,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.ServiceImplInstanceImpl#getSvcImpl Svc Impl}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java index 50b508ce2..e7681c0ae 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java @@ -45,6 +45,7 @@ import org.eclipse.etrice.core.room.ActorClass; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getInstances Instances}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getSaps Saps}
    • @@ -55,7 +56,6 @@ import org.eclipse.etrice.core.room.ActorClass; *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getAllContainedInstances All Contained Instances}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getOrderedIfItemInstances Ordered If Item Instances}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java index 178bc9e54..d00a8909b 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java @@ -34,11 +34,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.SubSystemInstanceImpl#getSubSystemClass Sub System Class}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.SubSystemInstanceImpl#getMaxObjId Max Obj Id}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SystemInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SystemInstanceImpl.java index 09e226aca..20924bdaf 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SystemInstanceImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SystemInstanceImpl.java @@ -36,11 +36,11 @@ import org.eclipse.etrice.core.room.LogicalSystem; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.SystemInstanceImpl#getInstances Instances}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.SystemInstanceImpl#getLogicalSystem Logical System}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WireImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WireImpl.java index 0782ee9d4..d7b8f3e46 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WireImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WireImpl.java @@ -28,12 +28,12 @@ import org.eclipse.etrice.core.genmodel.etricegen.Wire; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.WireImpl#isDataDriven Data Driven}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.WireImpl#getPath1 Path1}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.WireImpl#getPath2 Path2}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredActorClassImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredActorClassImpl.java index dd2d53644..92867ed2c 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredActorClassImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredActorClassImpl.java @@ -29,10 +29,10 @@ import org.eclipse.etrice.core.room.ActorClass; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.WiredActorClassImpl#getActorClass Actor Class}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredStructureClassImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredStructureClassImpl.java index 7cfea3b4f..4c372538f 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredStructureClassImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredStructureClassImpl.java @@ -32,13 +32,13 @@ import org.eclipse.etrice.core.genmodel.etricegen.WiredStructureClass; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.WiredStructureClassImpl#getWires Wires}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.WiredStructureClassImpl#getOpenBindings Open Bindings}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.WiredStructureClassImpl#getProvidedServices Provided Services}
    • *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.WiredStructureClassImpl#getRequiredServices Required Services}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredSubSystemClassImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredSubSystemClassImpl.java index b622e4ad8..2d2e08628 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredSubSystemClassImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredSubSystemClassImpl.java @@ -29,10 +29,10 @@ import org.eclipse.etrice.core.room.SubSystemClass; * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.etrice.core.genmodel.etricegen.impl.WiredSubSystemClassImpl#getSubSystemClass Sub System Class}
    • *
- *

* * @generated */ diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java index 7bce5d0ec..b9de6a85f 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java @@ -56,7 +56,7 @@ public class ETriceGenSwitch extends Switch { * Checks whether this is a switch for the given package. * * - * @parameter ePackage the package in question. + * @param ePackage the package in question. * @return whether this is a switch for the given package. * @generated */ -- cgit v1.2.3