diff options
Diffstat (limited to 'plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse')
53 files changed, 345 insertions, 337 deletions
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/RoomGenmodelValidator.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/RoomGenmodelValidator.java index 49b45a362..142917c15 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/RoomGenmodelValidator.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/RoomGenmodelValidator.java @@ -104,7 +104,10 @@ public class RoomGenmodelValidator implements ICustomValidator { // System.out.println("checking model " + model.getName()); ArrayList<RoomModel> models = new ArrayList<RoomModel>(); + ArrayList<RoomModel> importedModels = new ArrayList<RoomModel>(); + models.add(model); + Resource resource = model.eResource(); if (resource != null) { ResourceSet rs = resource.getResourceSet(); @@ -112,18 +115,16 @@ public class RoomGenmodelValidator implements ICustomValidator { EcoreUtil.resolveAll(rs); for (Resource res : rs.getResources()) { for (EObject obj : res.getContents()) { - if (obj instanceof RoomModel) - models.add((RoomModel) obj); + if (obj instanceof RoomModel && obj!=model) + importedModels.add((RoomModel) obj); } } } } - if (models.isEmpty()) - models.add(model); Diag diagnostician = new Diag(messageAcceptor); GeneratorModelBuilder builder = new GeneratorModelBuilder(new NullLogger(), diagnostician); - builder.createGeneratorModel(models, true); + builder.createGeneratorModel(models, importedModels, true); // System.out.println("done checking model " + model.getName() + " with result: " // + (diagnostician.isFailed() ? "failed" : "ok")); diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/GeneratorModelBuilder.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/GeneratorModelBuilder.java index 3a2f3745b..a63f69ec8 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/GeneratorModelBuilder.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/GeneratorModelBuilder.java @@ -134,8 +134,8 @@ public class GeneratorModelBuilder { this.diagnostician = diagnostician; } - public Root createGeneratorModel(List<RoomModel> models, boolean asLibrary) { - return createGeneratorModel(models, asLibrary, false); + public Root createGeneratorModel(List<RoomModel> mainModels, List<RoomModel> importedModels, boolean asLibrary) { + return createGeneratorModel(mainModels, importedModels, asLibrary, false); } /** @@ -153,14 +153,16 @@ public class GeneratorModelBuilder { * contain also inherited state graph items and where RefinedStates * are removed and their contents is relocated. * - * @param models + * @param mainModels all models for which code should be generated + * @param importedModels all imported models * @param asLibrary * @param debug if true more output is produced * @return the root of the newly created instance model */ - public Root createGeneratorModel(List<RoomModel> models, boolean asLibrary, boolean debug) { + public Root createGeneratorModel(List<RoomModel> mainModels, List<RoomModel> importedModels, boolean asLibrary, boolean debug) { Root root = ETriceGenFactory.eINSTANCE.createRoot(); - root.getModels().addAll(models); + root.getModels().addAll(mainModels); + root.getImportedModels().addAll(importedModels); root.setLibrary(asLibrary); this.debug = debug; @@ -173,7 +175,7 @@ public class GeneratorModelBuilder { checkRelayPorts(root); boolean hasSystem = false; - for (RoomModel mdl : models) { + for (RoomModel mdl : mainModels) { for (LogicalSystem sys : mdl.getSystems()) { hasSystem = true; SystemInstance si = createLogicalSystemInstance(sys); @@ -183,13 +185,14 @@ public class GeneratorModelBuilder { if (!hasSystem) { logger.logInfo("GeneratorModelBuilder: no SystemClass found, assuming SubSystemClasses as top level elements"); - for (RoomModel mdl : models) { + for (RoomModel mdl : mainModels) { for (SubSystemClass comp : mdl.getSubSystemClasses()) { root.getOwnSubSystemInstances().add(createSubSystemInstance(comp, comp.getName())); } } } + System.out.println("no. subsysinst = " + root.getSubSystemInstances().size()); if (!root.getSubSystemInstances().isEmpty()) { createOptionalActorInstanceTrees(root); @@ -322,6 +325,8 @@ public class GeneratorModelBuilder { private void createOptionalActorInstanceTrees(Root root) { root.computeSubClasses(); + System.out.println("createOptionalActorInstanceTrees"); + /* determine all optional actor classes * * For the sake of simplicity we have to do this for all models to really get all possibilities. @@ -333,8 +338,10 @@ public class GeneratorModelBuilder { for (RoomModel mdl : root.getModels()) { for (ActorClass ac : mdl.getActorClasses()) { for (ActorRef ar : ac.getActorRefs()) { - if (ar.getRefType()==ReferenceType.OPTIONAL) + if (ar.getRefType()==ReferenceType.OPTIONAL) { + System.out.println("createOptionalActorInstanceTrees " + ar.getType().getName()); optionalActors.put(ar.getType(), null); + } } } } @@ -1230,9 +1237,16 @@ public class GeneratorModelBuilder { * @param root - the model root */ private void createExpandedActorClasses(Root root) { - for (ActorClass ac : root.getUsedActorClasses()) { + for (ActorClass ac : root.getActorClasses()) { root.getXpActorClasses().add(createExpandedActorClass(ac)); } + + // the C generator also needs actor classes to connect with + for (RoomModel model : root.getImportedModels()) { + for (ActorClass ac : model.getActorClasses()) { + root.getXpActorClasses().add(createExpandedActorClass(ac)); + } + } } /** diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/Wiring.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/Wiring.java index 555c592e6..7e88bca4c 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/Wiring.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/Wiring.java @@ -37,6 +37,7 @@ import org.eclipse.etrice.core.room.ProtocolClass; import org.eclipse.etrice.core.room.RefSAPoint; import org.eclipse.etrice.core.room.ReferenceType; import org.eclipse.etrice.core.room.RelaySAPoint; +import org.eclipse.etrice.core.room.RoomModel; import org.eclipse.etrice.core.room.SAP; import org.eclipse.etrice.core.room.ServiceImplementation; import org.eclipse.etrice.core.room.SubSystemClass; @@ -179,10 +180,17 @@ public class Wiring { } public void createWiredClasses() { - for (ActorClass ac : root.getUsedActorClasses()) { + for (ActorClass ac : root.getActorClasses()) { getWiredActorClass(ac); } + // the wiring model also needs actor classes to connect with + for (RoomModel model : root.getImportedModels()) { + for (ActorClass ac : model.getActorClasses()) { + getWiredActorClass(ac); + } + } + for (SubSystemClass ssc : root.getSubSystemClasses()) { createWiredSubSystemClass(ssc); } 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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.AbstractInstance#getPorts <em>Ports</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ActorInstance#getActorClass <em>Actor Class</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ActorInstance#getReplIdx <em>Repl Idx</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ActorInstance#getUnindexedName <em>Unindexed Name</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ActorInterfaceInstance#getActorClass <em>Actor Class</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ActorInterfaceInstance#getProvidedServices <em>Provided Services</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ActorInterfaceInstance#getOptionalInstances <em>Optional Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ActorInterfaceInstance#isArray <em>Array</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.BindingInstance#getPorts <em>Ports</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.BindingInstance#getBinding <em>Binding</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getFromAI <em>From AI</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getFromSPP <em>From SPP</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getToSPP <em>To SPP</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getConnection <em>Connection</em>}</li> * </ul> - * </p> * * @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 '<em><b>Xp Actor Classes</b></em>' containment reference list. + * The feature id for the '<em><b>Imported Models</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ROOT__XP_ACTOR_CLASSES = 5; + int ROOT__IMPORTED_MODELS = 5; /** - * The feature id for the '<em><b>Used Data Classes</b></em>' reference list. + * The feature id for the '<em><b>Xp Actor Classes</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ROOT__USED_DATA_CLASSES = 6; + int ROOT__XP_ACTOR_CLASSES = 6; /** - * The feature id for the '<em><b>Used Protocol Classes</b></em>' reference list. + * The feature id for the '<em><b>Data Classes</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ROOT__USED_PROTOCOL_CLASSES = 7; + int ROOT__DATA_CLASSES = 7; /** - * The feature id for the '<em><b>Used Actor Classes</b></em>' reference list. + * The feature id for the '<em><b>Protocol Classes</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ROOT__USED_ACTOR_CLASSES = 8; + int ROOT__PROTOCOL_CLASSES = 8; /** - * The feature id for the '<em><b>Used Room Models</b></em>' reference list. + * The feature id for the '<em><b>Actor Classes</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ROOT__USED_ROOM_MODELS = 9; + int ROOT__ACTOR_CLASSES = 9; /** - * The feature id for the '<em><b>Sub System Classes</b></em>' reference list. + * The feature id for the '<em><b>Enum Classes</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ROOT__SUB_SYSTEM_CLASSES = 10; + int ROOT__ENUM_CLASSES = 10; /** - * The feature id for the '<em><b>Optional Instances</b></em>' containment reference list. + * The feature id for the '<em><b>Sub System Classes</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ROOT__OPTIONAL_INSTANCES = 11; + int ROOT__SUB_SYSTEM_CLASSES = 11; /** - * The feature id for the '<em><b>Optional Actor Classes</b></em>' reference list. + * The feature id for the '<em><b>Optional Instances</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ROOT__OPTIONAL_ACTOR_CLASSES = 12; + int ROOT__OPTIONAL_INSTANCES = 12; /** - * The feature id for the '<em><b>Wired Instances</b></em>' containment reference list. + * The feature id for the '<em><b>Optional Actor Classes</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ROOT__WIRED_INSTANCES = 13; + int ROOT__OPTIONAL_ACTOR_CLASSES = 13; /** - * The feature id for the '<em><b>Used Enum Classes</b></em>' reference list. + * The feature id for the '<em><b>Wired Instances</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ROOT__USED_ENUM_CLASSES = 14; + int ROOT__WIRED_INSTANCES = 14; /** * The number of structural features of the '<em>Root</em>' class. @@ -2182,6 +2182,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 <em>Imported Models</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference list '<em>Imported Models</em>'. + * @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 <em>Xp Actor Classes</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -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 <em>Used Data Classes</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getDataClasses <em>Data Classes</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Used Data Classes</em>'. - * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedDataClasses() + * @return the meta object for the reference list '<em>Data Classes</em>'. + * @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 <em>Used Protocol Classes</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getProtocolClasses <em>Protocol Classes</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Used Protocol Classes</em>'. - * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedProtocolClasses() + * @return the meta object for the reference list '<em>Protocol Classes</em>'. + * @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 <em>Used Actor Classes</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getActorClasses <em>Actor Classes</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Used Actor Classes</em>'. - * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedActorClasses() + * @return the meta object for the reference list '<em>Actor Classes</em>'. + * @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 <em>Used Room Models</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getEnumClasses <em>Enum Classes</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Used Room Models</em>'. - * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedRoomModels() + * @return the meta object for the reference list '<em>Enum Classes</em>'. + * @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 <em>Sub System Classes</em>}'. @@ -2281,17 +2292,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 <em>Used Enum Classes</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Used Enum Classes</em>'. - * @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 <em>Instance Base</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3221,6 +3221,14 @@ public interface ETriceGenPackage extends EPackage { EReference ROOT__MODELS = eINSTANCE.getRoot_Models(); /** + * The meta object literal for the '<em><b>Imported Models</b></em>' reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference ROOT__IMPORTED_MODELS = eINSTANCE.getRoot_ImportedModels(); + + /** * The meta object literal for the '<em><b>Xp Actor Classes</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3229,36 +3237,36 @@ public interface ETriceGenPackage extends EPackage { EReference ROOT__XP_ACTOR_CLASSES = eINSTANCE.getRoot_XpActorClasses(); /** - * The meta object literal for the '<em><b>Used Data Classes</b></em>' reference list feature. + * The meta object literal for the '<em><b>Data Classes</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference ROOT__USED_DATA_CLASSES = eINSTANCE.getRoot_UsedDataClasses(); + EReference ROOT__DATA_CLASSES = eINSTANCE.getRoot_DataClasses(); /** - * The meta object literal for the '<em><b>Used Protocol Classes</b></em>' reference list feature. + * The meta object literal for the '<em><b>Protocol Classes</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference ROOT__USED_PROTOCOL_CLASSES = eINSTANCE.getRoot_UsedProtocolClasses(); + EReference ROOT__PROTOCOL_CLASSES = eINSTANCE.getRoot_ProtocolClasses(); /** - * The meta object literal for the '<em><b>Used Actor Classes</b></em>' reference list feature. + * The meta object literal for the '<em><b>Actor Classes</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference ROOT__USED_ACTOR_CLASSES = eINSTANCE.getRoot_UsedActorClasses(); + EReference ROOT__ACTOR_CLASSES = eINSTANCE.getRoot_ActorClasses(); /** - * The meta object literal for the '<em><b>Used Room Models</b></em>' reference list feature. + * The meta object literal for the '<em><b>Enum Classes</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference ROOT__USED_ROOM_MODELS = eINSTANCE.getRoot_UsedRoomModels(); + EReference ROOT__ENUM_CLASSES = eINSTANCE.getRoot_EnumClasses(); /** * The meta object literal for the '<em><b>Sub System Classes</b></em>' reference list feature. @@ -3293,14 +3301,6 @@ public interface ETriceGenPackage extends EPackage { EReference ROOT__WIRED_INSTANCES = eINSTANCE.getRoot_WiredInstances(); /** - * The meta object literal for the '<em><b>Used Enum Classes</b></em>' reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference ROOT__USED_ENUM_CLASSES = eINSTANCE.getRoot_UsedEnumClasses(); - - /** * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl <em>Instance Base</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> 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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass#getActorClass <em>Actor Class</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getName <em>Name</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getPath <em>Path</em>}</li> @@ -35,7 +36,6 @@ import org.eclipse.emf.ecore.EObject; * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getThreadId <em>Thread Id</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getNObjIDs <em>NObj IDs</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance#getProtocol <em>Protocol</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance#getPeers <em>Peers</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.OpenBinding#getPath <em>Path</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.OpenBinding#getPort <em>Port</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.OpenServiceConnection#getPath <em>Path</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.OpenServiceConnection#getProtocol <em>Protocol</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.OptionalActorInstance#getActorClass <em>Actor Class</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.OptionalActorInstance#getRequiredServices <em>Required Services</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.PortInstance#getPort <em>Port</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.PortInstance#getKind <em>Kind</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.PortInstance#getBindings <em>Bindings</em>}</li> * </ul> - * </p> * * @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 '<em><b>Port Kind</b></em>' literal with the specified literal value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param literal the literal. + * @return the matching enumerator or <code>null</code>. * @generated */ public static PortKind get(String literal) { @@ -159,6 +161,8 @@ public enum PortKind implements Enumerator { * Returns the '<em><b>Port Kind</b></em>' literal with the specified name. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param name the name. + * @return the matching enumerator or <code>null</code>. * @generated */ public static PortKind getByName(String name) { @@ -175,6 +179,8 @@ public enum PortKind implements Enumerator { * Returns the '<em><b>Port Kind</b></em>' literal with the specified integer value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param value the integer value. + * @return the matching enumerator or <code>null</code>. * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#isLibrary <em>Library</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getSystemInstances <em>System Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getOwnSubSystemInstances <em>Own Sub System Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getSubSystemInstances <em>Sub System Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getModels <em>Models</em>}</li> + * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getImportedModels <em>Imported Models</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getXpActorClasses <em>Xp Actor Classes</em>}</li> - * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedDataClasses <em>Used Data Classes</em>}</li> - * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedProtocolClasses <em>Used Protocol Classes</em>}</li> - * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedActorClasses <em>Used Actor Classes</em>}</li> - * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedRoomModels <em>Used Room Models</em>}</li> + * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getDataClasses <em>Data Classes</em>}</li> + * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getProtocolClasses <em>Protocol Classes</em>}</li> + * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getActorClasses <em>Actor Classes</em>}</li> + * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getEnumClasses <em>Enum Classes</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getSubSystemClasses <em>Sub System Classes</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getOptionalInstances <em>Optional Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getOptionalActorClasses <em>Optional Actor Classes</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getWiredInstances <em>Wired Instances</em>}</li> - * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedEnumClasses <em>Used Enum Classes</em>}</li> * </ul> - * </p> * * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot() * @model @@ -142,6 +142,22 @@ public interface Root extends EObject { EList<RoomModel> getModels(); /** + * Returns the value of the '<em><b>Imported Models</b></em>' reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.RoomModel}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Imported Models</em>' reference list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Imported Models</em>' reference list. + * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_ImportedModels() + * @model + * @generated + */ + EList<RoomModel> getImportedModels(); + + /** * Returns the value of the '<em><b>Xp Actor Classes</b></em>' containment reference list. * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass}. * <!-- begin-user-doc --> @@ -157,68 +173,68 @@ public interface Root extends EObject { EList<ExpandedActorClass> getXpActorClasses(); /** - * Returns the value of the '<em><b>Used Data Classes</b></em>' reference list. + * Returns the value of the '<em><b>Data Classes</b></em>' reference list. * The list contents are of type {@link org.eclipse.etrice.core.room.DataClass}. * <!-- begin-user-doc --> * <p> - * 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 '<em>Data Classes</em>' reference list isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Used Data Classes</em>' reference list. - * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedDataClasses() + * @return the value of the '<em>Data Classes</em>' reference list. + * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_DataClasses() * @model transient="true" volatile="true" derived="true" * @generated */ - EList<DataClass> getUsedDataClasses(); + EList<DataClass> getDataClasses(); /** - * Returns the value of the '<em><b>Used Protocol Classes</b></em>' reference list. + * Returns the value of the '<em><b>Protocol Classes</b></em>' reference list. * The list contents are of type {@link org.eclipse.etrice.core.room.ProtocolClass}. * <!-- begin-user-doc --> * <p> - * 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 '<em>Protocol Classes</em>' reference list isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Used Protocol Classes</em>' reference list. - * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedProtocolClasses() + * @return the value of the '<em>Protocol Classes</em>' reference list. + * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_ProtocolClasses() * @model transient="true" volatile="true" derived="true" * @generated */ - EList<ProtocolClass> getUsedProtocolClasses(); + EList<ProtocolClass> getProtocolClasses(); /** - * Returns the value of the '<em><b>Used Actor Classes</b></em>' reference list. + * Returns the value of the '<em><b>Actor Classes</b></em>' reference list. * The list contents are of type {@link org.eclipse.etrice.core.room.ActorClass}. * <!-- begin-user-doc --> * <p> - * 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 '<em>Actor Classes</em>' reference list isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Used Actor Classes</em>' reference list. - * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedActorClasses() + * @return the value of the '<em>Actor Classes</em>' reference list. + * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_ActorClasses() * @model transient="true" volatile="true" derived="true" * @generated */ - EList<ActorClass> getUsedActorClasses(); + EList<ActorClass> getActorClasses(); /** - * Returns the value of the '<em><b>Used Room Models</b></em>' reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.RoomModel}. + * Returns the value of the '<em><b>Enum Classes</b></em>' reference list. + * The list contents are of type {@link org.eclipse.etrice.core.room.EnumerationType}. * <!-- begin-user-doc --> * <p> - * 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 '<em>Enum Classes</em>' reference list isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Used Room Models</em>' reference list. - * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedRoomModels() + * @return the value of the '<em>Enum Classes</em>' reference list. + * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_EnumClasses() * @model transient="true" volatile="true" derived="true" * @generated */ - EList<RoomModel> getUsedRoomModels(); + EList<EnumerationType> getEnumClasses(); /** * Returns the value of the '<em><b>Sub System Classes</b></em>' reference list. @@ -285,22 +301,6 @@ public interface Root extends EObject { EList<WiredStructureClass> getWiredInstances(); /** - * Returns the value of the '<em><b>Used Enum Classes</b></em>' reference list. - * The list contents are of type {@link org.eclipse.etrice.core.room.EnumerationType}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Used Enum Classes</em>' reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Used Enum Classes</em>' reference list. - * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedEnumClasses() - * @model transient="true" volatile="true" derived="true" - * @generated - */ - EList<EnumerationType> getUsedEnumClasses(); - - /** * <!-- begin-user-doc --> * @param cls a room class * @return all room models referenced directly or indirectly by this room class @@ -367,6 +367,14 @@ public interface Root extends EObject { * @model * @generated */ + ExpandedActorClass getExpandedActorClass(ActorClass ac); + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @model + * @generated + */ StructureInstance getInstance(String path); /** 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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.SAPInstance#getSap <em>Sap</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getSpp <em>Spp</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getIncoming <em>Incoming</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getOutgoing <em>Outgoing</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance#getSvcImpl <em>Svc Impl</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getInstances <em>Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getSaps <em>Saps</em>}</li> @@ -37,7 +38,6 @@ import org.eclipse.etrice.core.room.ActorRef; * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getAllContainedInstances <em>All Contained Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getOrderedIfItemInstances <em>Ordered If Item Instances</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance#getSubSystemClass <em>Sub System Class</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance#getMaxObjId <em>Max Obj Id</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.SystemInstance#getInstances <em>Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.SystemInstance#getLogicalSystem <em>Logical System</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Wire#isDataDriven <em>Data Driven</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Wire#getPath1 <em>Path1</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Wire#getPath2 <em>Path2</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.WiredActorClass#getActorClass <em>Actor Class</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.WiredStructureClass#getWires <em>Wires</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.WiredStructureClass#getOpenBindings <em>Open Bindings</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.WiredStructureClass#getProvidedServices <em>Provided Services</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.WiredStructureClass#getRequiredServices <em>Required Services</em>}</li> * </ul> - * </p> * * @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; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.WiredSubSystemClass#getSubSystemClass <em>Sub System Class</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.AbstractInstanceImpl#getPorts <em>Ports</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInstanceImpl#getActorClass <em>Actor Class</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInstanceImpl#getReplIdx <em>Repl Idx</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInstanceImpl#getUnindexedName <em>Unindexed Name</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInterfaceInstanceImpl#getActorClass <em>Actor Class</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInterfaceInstanceImpl#getProvidedServices <em>Provided Services</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInterfaceInstanceImpl#getOptionalInstances <em>Optional Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInterfaceInstanceImpl#isArray <em>Array</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.BindingInstanceImpl#getPorts <em>Ports</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.BindingInstanceImpl#getBinding <em>Binding</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ConnectionInstanceImpl#getFromAI <em>From AI</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ConnectionInstanceImpl#getFromSPP <em>From SPP</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ConnectionInstanceImpl#getToSPP <em>To SPP</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ConnectionInstanceImpl#getConnection <em>Connection</em>}</li> * </ul> - * </p> * * @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 * <!-- end-user-doc --> * @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 * <!-- end-user-doc --> * @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 * <!-- end-user-doc --> * @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 * <!-- end-user-doc --> * @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 * <!-- end-user-doc --> * @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 * <!-- end-user-doc --> * @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 * <!-- end-user-doc --> * @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 * <!-- end-user-doc --> * @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 * <!-- end-user-doc --> * @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 * <!-- end-user-doc --> * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ExpandedActorClassImpl#getActorClass <em>Actor Class</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl#getName <em>Name</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl#getPath <em>Path</em>}</li> @@ -37,7 +38,6 @@ import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance; * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl#getThreadId <em>Thread Id</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl#getNObjIDs <em>NObj IDs</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InterfaceItemInstanceImpl#getProtocol <em>Protocol</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InterfaceItemInstanceImpl#getPeers <em>Peers</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.OpenBindingImpl#getPath <em>Path</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.OpenBindingImpl#getPort <em>Port</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.OpenServiceConnectionImpl#getPath <em>Path</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.OpenServiceConnectionImpl#getProtocol <em>Protocol</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.OptionalActorInstanceImpl#getActorClass <em>Actor Class</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.OptionalActorInstanceImpl#getRequiredServices <em>Required Services</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.PortInstanceImpl#getPort <em>Port</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.PortInstanceImpl#getKind <em>Kind</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.PortInstanceImpl#getBindings <em>Bindings</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#isLibrary <em>Library</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getSystemInstances <em>System Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getOwnSubSystemInstances <em>Own Sub System Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getSubSystemInstances <em>Sub System Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getModels <em>Models</em>}</li> + * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getImportedModels <em>Imported Models</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getXpActorClasses <em>Xp Actor Classes</em>}</li> - * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getUsedDataClasses <em>Used Data Classes</em>}</li> - * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getUsedProtocolClasses <em>Used Protocol Classes</em>}</li> - * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getUsedActorClasses <em>Used Actor Classes</em>}</li> - * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getUsedRoomModels <em>Used Room Models</em>}</li> + * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getDataClasses <em>Data Classes</em>}</li> + * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getProtocolClasses <em>Protocol Classes</em>}</li> + * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getActorClasses <em>Actor Classes</em>}</li> + * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getEnumClasses <em>Enum Classes</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getSubSystemClasses <em>Sub System Classes</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getOptionalInstances <em>Optional Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getOptionalActorClasses <em>Optional Actor Classes</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getWiredInstances <em>Wired Instances</em>}</li> - * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl#getUsedEnumClasses <em>Used Enum Classes</em>}</li> * </ul> - * </p> * * @generated */ @@ -156,6 +152,16 @@ public class RootImpl extends EObjectImpl implements Root { protected EList<RoomModel> models; /** + * The cached value of the '{@link #getImportedModels() <em>Imported Models</em>}' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getImportedModels() + * @generated + * @ordered + */ + protected EList<RoomModel> importedModels; + + /** * The cached value of the '{@link #getXpActorClasses() <em>Xp Actor Classes</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -252,23 +258,23 @@ public class RootImpl extends EObjectImpl implements Root { * <!-- end-user-doc --> * @generated */ - public EList<ExpandedActorClass> getXpActorClasses() { - if (xpActorClasses == null) { - xpActorClasses = new EObjectContainmentEList<ExpandedActorClass>(ExpandedActorClass.class, this, ETriceGenPackage.ROOT__XP_ACTOR_CLASSES); + public EList<RoomModel> getImportedModels() { + if (importedModels == null) { + importedModels = new EObjectResolvingEList<RoomModel>(RoomModel.class, this, ETriceGenPackage.ROOT__IMPORTED_MODELS); } - return xpActorClasses; + return importedModels; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated NOT + * @generated */ - public EList<DataClass> getUsedDataClasses() { - if (usedDataClasses==null) { - computeUsedClasses(); + public EList<ExpandedActorClass> getXpActorClasses() { + if (xpActorClasses == null) { + xpActorClasses = new EObjectContainmentEList<ExpandedActorClass>(ExpandedActorClass.class, this, ETriceGenPackage.ROOT__XP_ACTOR_CLASSES); } - return usedDataClasses; + return xpActorClasses; } /** @@ -276,11 +282,11 @@ public class RootImpl extends EObjectImpl implements Root { * <!-- end-user-doc --> * @generated NOT */ - public EList<EnumerationType> getUsedEnumClasses() { - if (usedEnumClasses==null) { + public EList<DataClass> getDataClasses() { + if (dataClasses==null) { computeUsedClasses(); } - return usedEnumClasses; + return dataClasses; } /** @@ -288,11 +294,11 @@ public class RootImpl extends EObjectImpl implements Root { * <!-- end-user-doc --> * @generated NOT */ - public EList<ProtocolClass> getUsedProtocolClasses() { - if (usedProtocolClasses==null) { + public EList<EnumerationType> getEnumClasses() { + if (enumClasses==null) { computeUsedClasses(); } - return usedProtocolClasses; + return enumClasses; } /** @@ -300,11 +306,11 @@ public class RootImpl extends EObjectImpl implements Root { * <!-- end-user-doc --> * @generated NOT */ - public EList<ActorClass> getUsedActorClasses() { - if (usedActorClasses==null) { + public EList<ProtocolClass> getProtocolClasses() { + if (protocolClasses==null) { computeUsedClasses(); } - return usedActorClasses; + return protocolClasses; } /** @@ -312,11 +318,11 @@ public class RootImpl extends EObjectImpl implements Root { * <!-- end-user-doc --> * @generated NOT */ - public EList<RoomModel> getUsedRoomModels() { - if (usedRoomModels==null) { + public EList<ActorClass> getActorClasses() { + if (actorClasses==null) { computeUsedClasses(); } - return usedRoomModels; + return actorClasses; } private BasicEList<SubSystemClass> subSystemClasses = null; @@ -498,6 +504,19 @@ public class RootImpl extends EObjectImpl implements Root { * <!-- end-user-doc --> * @generated NOT */ + public ExpandedActorClass getExpandedActorClass(ActorClass ac) { + for (ExpandedActorClass xpac : getXpActorClasses()) { + if (xpac.getActorClass()==ac) + return xpac; + } + return null; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated NOT + */ public StructureInstance getInstance(String path) { if (!path.startsWith(Character.toString(InstanceBase.pathDelim))) 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<? extends RoomModel>)newValue); return; + case ETriceGenPackage.ROOT__IMPORTED_MODELS: + getImportedModels().clear(); + getImportedModels().addAll((Collection<? extends RoomModel>)newValue); + return; case ETriceGenPackage.ROOT__XP_ACTOR_CLASSES: getXpActorClasses().clear(); getXpActorClasses().addAll((Collection<? extends ExpandedActorClass>)newValue); return; - case ETriceGenPackage.ROOT__USED_DATA_CLASSES: - getUsedDataClasses().clear(); - getUsedDataClasses().addAll((Collection<? extends DataClass>)newValue); + case ETriceGenPackage.ROOT__DATA_CLASSES: + getDataClasses().clear(); + getDataClasses().addAll((Collection<? extends DataClass>)newValue); return; - case ETriceGenPackage.ROOT__USED_PROTOCOL_CLASSES: - getUsedProtocolClasses().clear(); - getUsedProtocolClasses().addAll((Collection<? extends ProtocolClass>)newValue); + case ETriceGenPackage.ROOT__PROTOCOL_CLASSES: + getProtocolClasses().clear(); + getProtocolClasses().addAll((Collection<? extends ProtocolClass>)newValue); return; - case ETriceGenPackage.ROOT__USED_ACTOR_CLASSES: - getUsedActorClasses().clear(); - getUsedActorClasses().addAll((Collection<? extends ActorClass>)newValue); + case ETriceGenPackage.ROOT__ACTOR_CLASSES: + getActorClasses().clear(); + getActorClasses().addAll((Collection<? extends ActorClass>)newValue); return; - case ETriceGenPackage.ROOT__USED_ROOM_MODELS: - getUsedRoomModels().clear(); - getUsedRoomModels().addAll((Collection<? extends RoomModel>)newValue); + case ETriceGenPackage.ROOT__ENUM_CLASSES: + getEnumClasses().clear(); + getEnumClasses().addAll((Collection<? extends EnumerationType>)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<? extends WiredStructureClass>)newValue); return; - case ETriceGenPackage.ROOT__USED_ENUM_CLASSES: - getUsedEnumClasses().clear(); - getUsedEnumClasses().addAll((Collection<? extends EnumerationType>)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<DataClass> usedDataClasses = null; - private BasicEList<EnumerationType> usedEnumClasses = null; - private BasicEList<ProtocolClass> usedProtocolClasses = null; - private BasicEList<ActorClass> usedActorClasses = null; - private BasicEList<RoomModel> usedRoomModels = null; + private BasicEList<DataClass> dataClasses = null; + private BasicEList<EnumerationType> enumClasses = null; + private BasicEList<ProtocolClass> protocolClasses = null; + private BasicEList<ActorClass> actorClasses = null; private void computeUsedClasses() { - if (isLibrary()) { - usedDataClasses = new BasicEList<DataClass>(); - usedEnumClasses = new BasicEList<EnumerationType>(); - usedProtocolClasses = new BasicEList<ProtocolClass>(); - usedActorClasses = new BasicEList<ActorClass>(); - usedRoomModels = new BasicEList<RoomModel>(); - subSystemClasses = new BasicEList<SubSystemClass>(); - 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<ActorClass> actorClasses = new HashSet<ActorClass>(); - for (SubSystemInstance ci : getSubSystemInstances()) { - TreeIterator<EObject> 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<DataClass> dataClasses = new HashSet<DataClass>(); - HashSet<EnumerationType> enumClasses = new HashSet<EnumerationType>(); - HashSet<ProtocolClass> protocolClasses = new HashSet<ProtocolClass>(); - HashSet<RoomModel> models = new HashSet<RoomModel>(); + dataClasses = new BasicEList<DataClass>(); + enumClasses = new BasicEList<EnumerationType>(); + protocolClasses = new BasicEList<ProtocolClass>(); + actorClasses = new BasicEList<ActorClass>(); + subSystemClasses = new BasicEList<SubSystemClass>(); + 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<DataClass>(dataClasses); - usedEnumClasses = new BasicEList<EnumerationType>(enumClasses); - usedProtocolClasses = new BasicEList<ProtocolClass>(protocolClasses); - usedActorClasses = new BasicEList<ActorClass>(actorClasses); - usedRoomModels = new BasicEList<RoomModel>(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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SAPInstanceImpl#getSap <em>Sap</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SPPInstanceImpl#getSpp <em>Spp</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SPPInstanceImpl#getIncoming <em>Incoming</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SPPInstanceImpl#getOutgoing <em>Outgoing</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ServiceImplInstanceImpl#getSvcImpl <em>Svc Impl</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getInstances <em>Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getSaps <em>Saps</em>}</li> @@ -55,7 +56,6 @@ import org.eclipse.etrice.core.room.ActorClass; * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getAllContainedInstances <em>All Contained Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getOrderedIfItemInstances <em>Ordered If Item Instances</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SubSystemInstanceImpl#getSubSystemClass <em>Sub System Class</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SubSystemInstanceImpl#getMaxObjId <em>Max Obj Id</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SystemInstanceImpl#getInstances <em>Instances</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SystemInstanceImpl#getLogicalSystem <em>Logical System</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.WireImpl#isDataDriven <em>Data Driven</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.WireImpl#getPath1 <em>Path1</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.WireImpl#getPath2 <em>Path2</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.WiredActorClassImpl#getActorClass <em>Actor Class</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.WiredStructureClassImpl#getWires <em>Wires</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.WiredStructureClassImpl#getOpenBindings <em>Open Bindings</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.WiredStructureClassImpl#getProvidedServices <em>Provided Services</em>}</li> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.WiredStructureClassImpl#getRequiredServices <em>Required Services</em>}</li> * </ul> - * </p> * * @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; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.WiredSubSystemClassImpl#getSubSystemClass <em>Sub System Class</em>}</li> * </ul> - * </p> * * @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<T> extends Switch<T> { * Checks whether this is a switch for the given package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @parameter ePackage the package in question. + * @param ePackage the package in question. * @return whether this is a switch for the given package. * @generated */ |