Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-05-22 08:34:18 +0000
committerHenrik Rentz-Reichert2012-05-22 08:34:18 +0000
commitcee30da694b0026705301c88ccb8769c0ef0d599 (patch)
treec7483d96458c5179870bd62b74a30d7a61128388
parent08ab5b100ebdc97ddd9a9bc868007f8d03e4f336 (diff)
downloadorg.eclipse.etrice-cee30da694b0026705301c88ccb8769c0ef0d599.tar.gz
org.eclipse.etrice-cee30da694b0026705301c88ccb8769c0ef0d599.tar.xz
org.eclipse.etrice-cee30da694b0026705301c88ccb8769c0ef0d599.zip
[generator, core.genmodel] factored out etricegen to new plug-in core.genmodel
-rw-r--r--features/org.eclipse.etrice.feature/feature.xml7
-rw-r--r--features/org.eclipse.etrice.tests.feature/feature.xml7
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/.classpath8
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/.gitignore1
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/.project28
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF20
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/about.html28
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/build.properties14
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/model/etricegen.ecore206
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/model/etricegen.genmodel173
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/model/howto.txt3
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/plugin.properties8
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/plugin.xml26
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/Activator.java30
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/SetupGenmodel.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/SetupGenerator.java)8
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/base/ILogger.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ILogger.java)2
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/GeneratorModelBuilder.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/builder/GeneratorModelBuilder.java)38
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/ValidationException.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/builder/ValidationException.java)6
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActiveTrigger.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ActiveTrigger.java)34
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInstance.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ActorInstance.java)20
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/BindingInstance.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/BindingInstance.java)14
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ConnectionInstance.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ConnectionInstance.java)39
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ETriceGenFactory.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ETriceGenFactory.java)6
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ETriceGenPackage.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ETriceGenPackage.java)534
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ExpandedActorClass.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ExpandedActorClass.java)19
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/IDiagnostician.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/IDiagnostician.java)2
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ITransitionChainVisitor.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ITransitionChainVisitor.java)2
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InstanceBase.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/InstanceBase.java)28
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InstanceBase.java.bak130
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InterfaceItemInstance.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/InterfaceItemInstance.java)11
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortInstance.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/PortInstance.java)36
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortKind.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/PortKind.java)4
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/Root.java)97
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java.bak223
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SAPInstance.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/SAPInstance.java)10
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SPPInstance.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/SPPInstance.java)35
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ServiceImplInstance.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ServiceImplInstance.java)10
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/StructureInstance.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/StructureInstance.java)60
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SubSystemInstance.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/SubSystemInstance.java)20
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/TransitionChain.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/TransitionChain.java)22
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActiveTriggerImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ActiveTriggerImpl.java)26
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ActorInstanceImpl.java)17
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java.bak255
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/BindingInstanceImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/BindingInstanceImpl.java)12
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ConnectionInstanceImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ConnectionInstanceImpl.java)23
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenFactoryImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ETriceGenFactoryImpl.java)4
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenPackageImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ETriceGenPackageImpl.java)78
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ExpandedActorClassImpl.java)45
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java.bak409
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/InstanceBaseImpl.java)20
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java.bak309
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/InterfaceItemInstanceImpl.java)18
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java.bak181
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/PortInstanceImpl.java)21
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java.bak303
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/RootImpl.java)38
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java.bak464
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/SAPInstanceImpl.java)10
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java.bak161
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/SPPInstanceImpl.java)18
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java.bak322
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ServiceImplInstanceImpl.java)9
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java.bak161
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/StructureInstanceImpl.java)48
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java.bak430
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/SubSystemInstanceImpl.java)14
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java.bak199
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/TransitionChainImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/TransitionChainImpl.java)17
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/TransitionChainImpl.java.bak265
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenAdapterFactory.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenAdapterFactory.java)68
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenResourceFactoryImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenResourceFactoryImpl.java)4
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenResourceImpl.java (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenResourceImpl.java)4
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java535
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java.bak (renamed from plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenSwitch.java)26
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/RoomModelValidator.java6
-rw-r--r--plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/Main.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend6
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/StateMachineGen.xtend2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend12
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/Validator.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java6
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java4
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java4
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java14
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java4
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/Main.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/DocGen.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.xtend10
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/MainGen.xtend2
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java4
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java10
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/Main.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend6
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaTranslationProvider.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/MainGen.xtend2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/StateMachineGen.xtend2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend6
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/Validator.java4
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java6
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java4
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java4
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java10
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java4
-rw-r--r--plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF24
-rw-r--r--plugins/org.eclipse.etrice.generator/plugin.xml6
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java8
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/CodegenHelpers.java2
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/Diagnostician.java2
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/GeneratorBaseModule.java3
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ILineOutputLogger.java2
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/IRoomGenerator.java2
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ActiveTriggerValidator.java28
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ActorInstanceValidator.java21
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/BindingInstanceValidator.java23
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ConnectionInstanceValidator.java26
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/CounterValidator.java20
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ExpandedActorClassValidator.java21
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/IDiagnosticianValidator.java19
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ITransitionChainVisitorValidator.java19
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/InstanceBaseValidator.java24
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/InterfaceItemInstanceValidator.java23
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/PortInstanceValidator.java28
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/RootValidator.java37
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/SAPInstanceValidator.java21
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/SPPInstanceValidator.java27
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ServiceImplInstanceValidator.java21
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/StructureInstanceValidator.java38
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/SubSystemInstanceValidator.java21
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/TransitionChainValidator.java26
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/AbstractTransitionChainGenerator.java4
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.xtend2
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/PrepareFileSystem.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend2
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend14
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TransitionChainVisitor.java6
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java2
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java6
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java4
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java2
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java14
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/.classpath7
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/.gitignore1
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/.project28
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF13
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/about.html28
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/build.properties5
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/models/connected_ports.room (renamed from tests/org.eclipse.etrice.generator.tests/models/connected_ports.room)0
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/models/hierarchy.room (renamed from tests/org.eclipse.etrice.generator.tests/models/hierarchy.room)0
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/models/layers.room (renamed from tests/org.eclipse.etrice.generator.tests/models/layers.room)0
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/models/ports.room (renamed from tests/org.eclipse.etrice.generator.tests/models/ports.room)0
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/models/states.room (renamed from tests/org.eclipse.etrice.generator.tests/models/states.room)0
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/models/states_inheritance.room (renamed from tests/org.eclipse.etrice.generator.tests/models/states_inheritance.room)0
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/models/states_triggers.room (renamed from tests/org.eclipse.etrice.generator.tests/models/states_triggers.room)0
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/models/structure_inheritance.room (renamed from tests/org.eclipse.etrice.generator.tests/models/structure_inheritance.room)0
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/models/test.room (renamed from tests/org.eclipse.etrice.generator.tests/models/test.room)0
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/org.eclipse.etrice.core.genmodel.tests.launch41
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/GenmodelTestsActivator.java22
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestConnectedPorts.java (renamed from tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestConnectedPorts.java)10
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestHierarchy.java (renamed from tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestHierarchy.java)8
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java (renamed from tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestInstanceModelBuilderBase.java)14
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestLayers.java (renamed from tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestLayers.java)12
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestPorts.java (renamed from tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestPorts.java)8
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStates.java (renamed from tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestStates.java)8
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesAndTriggers.java (renamed from tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestStatesAndTriggers.java)8
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesInheritance.java (renamed from tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestStatesInheritance.java)8
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStructureInheritance.java (renamed from tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestStructureInheritance.java)18
-rw-r--r--tests/org.eclipse.etrice.generator.tests/org.eclipse.etrice.generator.tests.launch1
187 files changed, 6063 insertions, 1439 deletions
diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index 543592228..ab0e0fed9 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -216,4 +216,11 @@ http://www.eclipse.org/legal/epl-v10.html
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.etrice.core.genmodel"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml
index 91624f76f..ce2f711e1 100644
--- a/features/org.eclipse.etrice.tests.feature/feature.xml
+++ b/features/org.eclipse.etrice.tests.feature/feature.xml
@@ -88,4 +88,11 @@ http://www.eclipse.org/legal/epl-v10.html
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.etrice.core.genmodel.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/plugins/org.eclipse.etrice.core.genmodel/.classpath b/plugins/org.eclipse.etrice.core.genmodel/.classpath
new file mode 100644
index 000000000..3b679e683
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="model"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.eclipse.etrice.core.genmodel/.gitignore b/plugins/org.eclipse.etrice.core.genmodel/.gitignore
new file mode 100644
index 000000000..092357e47
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/.gitignore
@@ -0,0 +1 @@
+bin
diff --git a/plugins/org.eclipse.etrice.core.genmodel/.project b/plugins/org.eclipse.etrice.core.genmodel/.project
new file mode 100644
index 000000000..97ba7004c
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.etrice.core.genmodel</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.etrice.core.genmodel/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.core.genmodel/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..1119a8550
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Tue May 22 07:58:45 CEST 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..5e1ab842d
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.etrice.core.genmodel;singleton:=true
+Bundle-Version: 0.2.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.etrice.core.genmodel,
+ org.eclipse.etrice.core.genmodel.base,
+ org.eclipse.etrice.core.genmodel.builder,
+ org.eclipse.etrice.core.genmodel.etricegen,
+ org.eclipse.etrice.core.genmodel.etricegen.impl,
+ org.eclipse.etrice.core.genmodel.etricegen.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.etrice.core.room;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.etrice.core.genmodel/about.html b/plugins/org.eclipse.etrice.core.genmodel/about.html
new file mode 100644
index 000000000..f47dbddbb
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2006</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.genmodel/build.properties b/plugins/org.eclipse.etrice.core.genmodel/build.properties
new file mode 100644
index 000000000..1a3a48b22
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/build.properties
@@ -0,0 +1,14 @@
+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+bin.includes = .,\
+ model/,\
+ META-INF/,\
+ plugin.xml,\
+ plugin.properties
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/plugins/org.eclipse.etrice.core.genmodel/model/etricegen.ecore b/plugins/org.eclipse.etrice.core.genmodel/model/etricegen.ecore
new file mode 100644
index 000000000..c9cb9bcaf
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/model/etricegen.ecore
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="etricegen"
+ nsURI="http://www.eclipse.org/etrice/generator" nsPrefix="etricegen">
+ <eClassifiers xsi:type="ecore:EClass" name="Root">
+ <eOperations name="getReferencedModels" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//RoomModel">
+ <eParameters name="cls" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//RoomClass"/>
+ </eOperations>
+ <eOperations name="getReferencedProtocolClasses" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ProtocolClass">
+ <eParameters name="cls" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ActorClass"/>
+ </eOperations>
+ <eOperations name="getExpandedActorClass" eType="#//ExpandedActorClass">
+ <eParameters name="ai" eType="#//ActorInstance"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="library" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="subSystemInstances" upperBound="-1"
+ eType="#//SubSystemInstance" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="models" upperBound="-1"
+ eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//RoomModel"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="xpActorClasses" upperBound="-1"
+ eType="#//ExpandedActorClass" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="usedDataClasses" upperBound="-1"
+ eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//DataClass"
+ volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="usedProtocolClasses" upperBound="-1"
+ eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ProtocolClass"
+ volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="usedActorClasses" upperBound="-1"
+ eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ActorClass"
+ volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="usedRoomModels" upperBound="-1"
+ eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//RoomModel"
+ volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="subSystemClasses" upperBound="-1"
+ eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//SubSystemClass"
+ volatile="true" transient="true" derived="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="InstanceBase" abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ changeable="false" volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="objId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="threadId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+ changeable="false" defaultValueLiteral="-1" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="nObjIDs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+ changeable="false" volatile="true" transient="true" derived="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="StructureInstance" eSuperTypes="#//InstanceBase">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="instances" upperBound="-1"
+ eType="#//ActorInstance" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ports" upperBound="-1"
+ eType="#//PortInstance" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="saps" upperBound="-1" eType="#//SAPInstance"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="spps" upperBound="-1" eType="#//SPPInstance"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="services" upperBound="-1"
+ eType="#//ServiceImplInstance" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="bindings" upperBound="-1"
+ eType="#//BindingInstance" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="connections" upperBound="-1"
+ eType="#//ConnectionInstance" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="allContainedInstances"
+ upperBound="-1" eType="#//ActorInstance" volatile="true" transient="true"
+ derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="orderedIfItemInstances"
+ upperBound="-1" eType="#//InterfaceItemInstance" changeable="false" transient="true"
+ derived="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SubSystemInstance" eSuperTypes="#//StructureInstance">
+ <eOperations name="getThreadId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+ <eParameters name="instance" eType="#//InstanceBase"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="subSystemClass" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//SubSystemClass"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxObjId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+ changeable="false" volatile="true" transient="true" derived="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ActorInstance" eSuperTypes="#//StructureInstance">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="actorClass" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ActorClass"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="replIdx" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+ defaultValueLiteral="-1"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="unindexedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ changeable="false" volatile="true" transient="true" derived="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="InterfaceItemInstance" eSuperTypes="#//InstanceBase">
+ <eOperations name="isReplicated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eOperations name="isSimple" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eOperations name="isRelay" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eOperations name="getInterfaceItem" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//InterfaceItem"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="peers" upperBound="-1"
+ eType="#//InterfaceItemInstance"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PortInstance" eSuperTypes="#//InterfaceItemInstance">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="port" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//Port"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//PortKind"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="bindings" upperBound="-1"
+ eType="#//BindingInstance" eOpposite="#//BindingInstance/ports"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="PortKind">
+ <eLiterals name="external" literal="external"/>
+ <eLiterals name="internal" value="1" literal="internal"/>
+ <eLiterals name="relay" value="2" literal="relay"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="BindingInstance">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ports" upperBound="2" eType="#//PortInstance"
+ eOpposite="#//PortInstance/bindings"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SAPInstance" eSuperTypes="#//InterfaceItemInstance">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sap" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//SAPRef"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SPPInstance" eSuperTypes="#//InstanceBase">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="spp" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//SPPRef"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" upperBound="-1"
+ eType="#//ConnectionInstance" eOpposite="#//ConnectionInstance/toSPP"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" eType="#//ConnectionInstance"
+ eOpposite="#//ConnectionInstance/fromSPP"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ServiceImplInstance" eSuperTypes="#//InterfaceItemInstance">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="svcImpl" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ServiceImplementation"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ConnectionInstance">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="fromAI" eType="#//ActorInstance"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="fromSPP" eType="#//SPPInstance"
+ eOpposite="#//SPPInstance/outgoing"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="toSPP" eType="#//SPPInstance"
+ eOpposite="#//SPPInstance/incoming"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="connection" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//LayerConnection"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ActiveTrigger">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="msg" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//Message"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ifitem" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//InterfaceItem"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="trigger" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="transitions" upperBound="-1"
+ eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//TriggeredTransition"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TransitionChain">
+ <eOperations name="getStateContext" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//State"/>
+ <eOperations name="isHandler" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eOperations name="genExecuteChain" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eParameters name="tcv" eType="#//ITransitionChainVisitor"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="transition" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//Transition"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="skipEntry" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ITransitionChainVisitor" instanceTypeName="ITransitionChainVisitor"
+ abstract="true" interface="true"/>
+ <eClassifiers xsi:type="ecore:EClass" name="IDiagnostician" instanceTypeName="IDiagnostician"
+ abstract="true" interface="true"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ExpandedActorClass" eSuperTypes="../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ActorClass">
+ <eOperations name="prepare">
+ <eParameters name="validator" eType="#//IDiagnostician"/>
+ </eOperations>
+ <eOperations name="release"/>
+ <eOperations name="addOwnObject">
+ <eParameters name="obj" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//StateGraphItem"/>
+ </eOperations>
+ <eOperations name="isOwnObject" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eParameters name="obj" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//StateGraphItem"/>
+ </eOperations>
+ <eOperations name="getInterfaceItemLocalId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+ <eParameters name="ifitem" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//InterfaceItem"/>
+ </eOperations>
+ <eOperations name="hasStateMachine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eOperations name="getCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eParameters name="code" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//DetailCode"/>
+ </eOperations>
+ <eOperations name="getTriggerCodeName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eParameters name="mif" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//MessageFromIf"/>
+ </eOperations>
+ <eOperations name="getTriggerCodeName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eParameters name="mif" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eOperations>
+ <eOperations name="getOutgoingTransitions" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//Transition">
+ <eParameters name="node" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//StateGraphNode"/>
+ </eOperations>
+ <eOperations name="getIncomingTransitions" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//Transition">
+ <eParameters name="node" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//StateGraphNode"/>
+ </eOperations>
+ <eOperations name="getActiveTriggers" upperBound="-1" eType="#//ActiveTrigger">
+ <eParameters name="state" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//State"/>
+ </eOperations>
+ <eOperations name="getTriggers" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//MessageFromIf"/>
+ <eOperations name="getOwnTriggers" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//MessageFromIf"/>
+ <eOperations name="getMessageID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eParameters name="mif" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//MessageFromIf"/>
+ </eOperations>
+ <eOperations name="getChain" eType="#//TransitionChain">
+ <eParameters name="trans" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//Transition"/>
+ </eOperations>
+ <eOperations name="getTransitionChains" upperBound="-1" eType="#//TransitionChain"/>
+ <eOperations name="getOwnTransitionChains" upperBound="-1" eType="#//TransitionChain"/>
+ <eOperations name="getNode" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//StateGraphNode">
+ <eParameters name="tt" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//TransitionTerminal"/>
+ </eOperations>
+ <eOperations name="isMatching" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eParameters name="trig" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//Trigger"/>
+ <eParameters name="trigstr" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eOperations>
+ <eOperations name="getDefaultBranch" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ContinuationTransition">
+ <eParameters name="out" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//Transition"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="actorClass" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ActorClass"/>
+ </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/org.eclipse.etrice.core.genmodel/model/etricegen.genmodel b/plugins/org.eclipse.etrice.core.genmodel/model/etricegen.genmodel
new file mode 100644
index 000000000..df81509d7
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/model/etricegen.genmodel
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=""
+ modelDirectory="/org.eclipse.etrice.core.genmodel/src" editDirectory="/org.eclipse.etrice.core.genmodel.edit/src"
+ editorDirectory="/org.eclipse.etrice.core.genmodel.editor/src" modelPluginID="org.eclipse.etrice.core.genmodel"
+ modelName="eTriceGen" importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0"
+ copyrightFields="false" editPluginID="org.eclipse.etrice.core.genmodel.edit" editorPluginID="org.eclipse.etrice.core.genmodel.editor"
+ usedGenPackages="../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel#//room">
+ <foreignModel>roomgen.ecore</foreignModel>
+ <genPackages prefix="ETriceGen" basePackage="org.eclipse.etrice.core.genmodel" resource="XMI"
+ disposableProviderFactory="true" ecorePackage="etricegen.ecore#/">
+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="etricegen.ecore#//PortKind">
+ <genEnumLiterals ecoreEnumLiteral="etricegen.ecore#//PortKind/external"/>
+ <genEnumLiterals ecoreEnumLiteral="etricegen.ecore#//PortKind/internal"/>
+ <genEnumLiterals ecoreEnumLiteral="etricegen.ecore#//PortKind/relay"/>
+ </genEnums>
+ <genClasses ecoreClass="etricegen.ecore#//Root">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etricegen.ecore#//Root/library"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/subSystemInstances"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/models"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/xpActorClasses"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/usedDataClasses"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/usedProtocolClasses"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/usedActorClasses"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/usedRoomModels"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/subSystemClasses"/>
+ <genOperations ecoreOperation="etricegen.ecore#//Root/getReferencedModels">
+ <genParameters ecoreParameter="etricegen.ecore#//Root/getReferencedModels/cls"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//Root/getReferencedProtocolClasses">
+ <genParameters ecoreParameter="etricegen.ecore#//Root/getReferencedProtocolClasses/cls"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//Root/getExpandedActorClass">
+ <genParameters ecoreParameter="etricegen.ecore#//Root/getExpandedActorClass/ai"/>
+ </genOperations>
+ </genClasses>
+ <genClasses image="false" ecoreClass="etricegen.ecore#//InstanceBase">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etricegen.ecore#//InstanceBase/name"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etricegen.ecore#//InstanceBase/path"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etricegen.ecore#//InstanceBase/objId"/>
+ <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute etricegen.ecore#//InstanceBase/threadId"/>
+ <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute etricegen.ecore#//InstanceBase/nObjIDs"/>
+ </genClasses>
+ <genClasses ecoreClass="etricegen.ecore#//StructureInstance">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etricegen.ecore#//StructureInstance/instances"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etricegen.ecore#//StructureInstance/ports"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etricegen.ecore#//StructureInstance/saps"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etricegen.ecore#//StructureInstance/spps"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etricegen.ecore#//StructureInstance/services"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etricegen.ecore#//StructureInstance/bindings"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etricegen.ecore#//StructureInstance/connections"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//StructureInstance/allContainedInstances"/>
+ <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference etricegen.ecore#//StructureInstance/orderedIfItemInstances"/>
+ </genClasses>
+ <genClasses ecoreClass="etricegen.ecore#//SubSystemInstance">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//SubSystemInstance/subSystemClass"/>
+ <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute etricegen.ecore#//SubSystemInstance/maxObjId"/>
+ <genOperations ecoreOperation="etricegen.ecore#//SubSystemInstance/getThreadId">
+ <genParameters ecoreParameter="etricegen.ecore#//SubSystemInstance/getThreadId/instance"/>
+ </genOperations>
+ </genClasses>
+ <genClasses ecoreClass="etricegen.ecore#//ActorInstance">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//ActorInstance/actorClass"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etricegen.ecore#//ActorInstance/replIdx"/>
+ <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute etricegen.ecore#//ActorInstance/unindexedName"/>
+ </genClasses>
+ <genClasses ecoreClass="etricegen.ecore#//InterfaceItemInstance">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//InterfaceItemInstance/peers"/>
+ <genOperations ecoreOperation="etricegen.ecore#//InterfaceItemInstance/isReplicated"/>
+ <genOperations ecoreOperation="etricegen.ecore#//InterfaceItemInstance/isSimple"/>
+ <genOperations ecoreOperation="etricegen.ecore#//InterfaceItemInstance/isRelay"/>
+ <genOperations ecoreOperation="etricegen.ecore#//InterfaceItemInstance/getInterfaceItem"/>
+ </genClasses>
+ <genClasses ecoreClass="etricegen.ecore#//PortInstance">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//PortInstance/port"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etricegen.ecore#//PortInstance/kind"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//PortInstance/bindings"/>
+ </genClasses>
+ <genClasses ecoreClass="etricegen.ecore#//BindingInstance">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//BindingInstance/ports"/>
+ </genClasses>
+ <genClasses ecoreClass="etricegen.ecore#//SAPInstance">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//SAPInstance/sap"/>
+ </genClasses>
+ <genClasses ecoreClass="etricegen.ecore#//SPPInstance">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//SPPInstance/spp"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//SPPInstance/incoming"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//SPPInstance/outgoing"/>
+ </genClasses>
+ <genClasses ecoreClass="etricegen.ecore#//ServiceImplInstance">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//ServiceImplInstance/svcImpl"/>
+ </genClasses>
+ <genClasses ecoreClass="etricegen.ecore#//ConnectionInstance">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//ConnectionInstance/fromAI"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//ConnectionInstance/fromSPP"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//ConnectionInstance/toSPP"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//ConnectionInstance/connection"/>
+ </genClasses>
+ <genClasses ecoreClass="etricegen.ecore#//ActiveTrigger">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//ActiveTrigger/msg"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//ActiveTrigger/ifitem"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etricegen.ecore#//ActiveTrigger/trigger"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//ActiveTrigger/transitions"/>
+ </genClasses>
+ <genClasses ecoreClass="etricegen.ecore#//TransitionChain">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//TransitionChain/transition"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etricegen.ecore#//TransitionChain/skipEntry"/>
+ <genOperations ecoreOperation="etricegen.ecore#//TransitionChain/getStateContext"/>
+ <genOperations ecoreOperation="etricegen.ecore#//TransitionChain/isHandler"/>
+ <genOperations ecoreOperation="etricegen.ecore#//TransitionChain/genExecuteChain">
+ <genParameters ecoreParameter="etricegen.ecore#//TransitionChain/genExecuteChain/tcv"/>
+ </genOperations>
+ </genClasses>
+ <genClasses image="false" ecoreClass="etricegen.ecore#//ITransitionChainVisitor"/>
+ <genClasses image="false" ecoreClass="etricegen.ecore#//IDiagnostician"/>
+ <genClasses ecoreClass="etricegen.ecore#//ExpandedActorClass">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//ExpandedActorClass/actorClass"/>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/prepare">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/prepare/validator"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/release"/>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/addOwnObject">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/addOwnObject/obj"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/isOwnObject">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/isOwnObject/obj"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getInterfaceItemLocalId">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/getInterfaceItemLocalId/ifitem"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/hasStateMachine"/>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getCode">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/getCode/code"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getTriggerCodeName">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/getTriggerCodeName/mif"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getTriggerCodeName.1">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/getTriggerCodeName.1/mif"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getOutgoingTransitions">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/getOutgoingTransitions/node"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getIncomingTransitions">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/getIncomingTransitions/node"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getActiveTriggers">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/getActiveTriggers/state"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getTriggers"/>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getOwnTriggers"/>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getMessageID">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/getMessageID/mif"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getChain">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/getChain/trans"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getTransitionChains"/>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getOwnTransitionChains"/>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getNode">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/getNode/tt"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/isMatching">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/isMatching/trig"/>
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/isMatching/trigstr"/>
+ </genOperations>
+ <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getDefaultBranch">
+ <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/getDefaultBranch/out"/>
+ </genOperations>
+ </genClasses>
+ </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/org.eclipse.etrice.core.genmodel/model/howto.txt b/plugins/org.eclipse.etrice.core.genmodel/model/howto.txt
new file mode 100644
index 000000000..bc0443211
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/model/howto.txt
@@ -0,0 +1,3 @@
+The instances.ecore model references the Room.ecore model.
+Therefore the instances.genmodel also has to reference the Room.genmodel
+(this can be done in the lower part of the Create Genmodel Wizzard). \ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.genmodel/plugin.properties b/plugins/org.eclipse.etrice.core.genmodel/plugin.properties
new file mode 100644
index 000000000..c075509b7
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/plugin.properties
@@ -0,0 +1,8 @@
+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = eTriceGen Model
+providerName = www.example.org
diff --git a/plugins/org.eclipse.etrice.core.genmodel/plugin.xml b/plugins/org.eclipse.etrice.core.genmodel/plugin.xml
new file mode 100644
index 000000000..db558f68f
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/plugin.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ <copyright>
+ </copyright>
+
+ $Id$
+-->
+
+<plugin>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <package
+ uri="http://www.eclipse.org/etrice/generator"
+ class="org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage"
+ genModel="model/etricegen.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.extension_parser">
+ <parser
+ type="etricegen"
+ class="org.eclipse.etrice.core.genmodel.etricegen.util.ETriceGenResourceFactoryImpl"/>
+ </extension>
+
+</plugin>
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/Activator.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/Activator.java
new file mode 100644
index 000000000..1e983e558
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/Activator.java
@@ -0,0 +1,30 @@
+package org.eclipse.etrice.core.genmodel;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ private static BundleContext context;
+
+ static BundleContext getContext() {
+ return context;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext bundleContext) throws Exception {
+ Activator.context = bundleContext;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext bundleContext) throws Exception {
+ Activator.context = null;
+ }
+
+}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/SetupGenerator.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/SetupGenmodel.java
index 96d922be0..06024b59c 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/SetupGenerator.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/SetupGenmodel.java
@@ -10,7 +10,7 @@
*
*******************************************************************************/
-package org.eclipse.etrice.generator;
+package org.eclipse.etrice.core.genmodel;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.resource.Resource;
@@ -19,14 +19,14 @@ import org.eclipse.emf.ecore.resource.Resource;
* @author Henrik Rentz-Reichert
*
*/
-public class SetupGenerator {
+public class SetupGenmodel {
public static void doSetup() {
if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/etrice/generator")) {
EPackage.Registry.INSTANCE.put("http://www.eclipse.org/etrice/generator",
- org.eclipse.etrice.generator.etricegen.ETriceGenPackage.eINSTANCE);
+ org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage.eINSTANCE);
}
Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("rim",
- new org.eclipse.etrice.generator.etricegen.util.ETriceGenResourceFactoryImpl());
+ new org.eclipse.etrice.core.genmodel.etricegen.util.ETriceGenResourceFactoryImpl());
}
}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ILogger.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/base/ILogger.java
index 32e4148bf..95c9098e3 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ILogger.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/base/ILogger.java
@@ -10,7 +10,7 @@
*
*******************************************************************************/
-package org.eclipse.etrice.generator.base;
+package org.eclipse.etrice.core.genmodel.base;
import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/builder/GeneratorModelBuilder.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/GeneratorModelBuilder.java
index ea9ce3d1c..aa3f1d0f5 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/builder/GeneratorModelBuilder.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/GeneratorModelBuilder.java
@@ -10,7 +10,7 @@
*
*******************************************************************************/
-package org.eclipse.etrice.generator.builder;
+package org.eclipse.etrice.core.genmodel.builder;
import java.util.ArrayList;
import java.util.Collection;
@@ -47,24 +47,24 @@ import org.eclipse.etrice.core.room.SPPoint;
import org.eclipse.etrice.core.room.ServiceImplementation;
import org.eclipse.etrice.core.room.SubSystemClass;
import org.eclipse.etrice.core.room.SubSystemRef;
-import org.eclipse.etrice.generator.base.ILogger;
-import org.eclipse.etrice.generator.etricegen.ActorInstance;
-import org.eclipse.etrice.generator.etricegen.BindingInstance;
-import org.eclipse.etrice.generator.etricegen.ConnectionInstance;
-import org.eclipse.etrice.generator.etricegen.ETriceGenFactory;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.IDiagnostician;
-import org.eclipse.etrice.generator.etricegen.InstanceBase;
-import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance;
-import org.eclipse.etrice.generator.etricegen.PortInstance;
-import org.eclipse.etrice.generator.etricegen.PortKind;
-import org.eclipse.etrice.generator.etricegen.Root;
-import org.eclipse.etrice.generator.etricegen.SAPInstance;
-import org.eclipse.etrice.generator.etricegen.SPPInstance;
-import org.eclipse.etrice.generator.etricegen.ServiceImplInstance;
-import org.eclipse.etrice.generator.etricegen.StructureInstance;
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance;
-import org.eclipse.etrice.generator.etricegen.impl.StructureInstanceImpl;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.BindingInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenFactory;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician;
+import org.eclipse.etrice.core.genmodel.etricegen.InstanceBase;
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortKind;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.SAPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.SPPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.StructureInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl;
/**
* A class for the creation of an intermediate model combining all information needed by
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/builder/ValidationException.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/ValidationException.java
index 1984adf55..7d608fa96 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/builder/ValidationException.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/ValidationException.java
@@ -10,11 +10,9 @@
*
*******************************************************************************/
-package org.eclipse.etrice.generator.builder;
+package org.eclipse.etrice.core.genmodel.builder;
-import org.eclipse.emf.mwe.core.WorkflowInterruptedException;
-
-public class ValidationException extends WorkflowInterruptedException {
+public class ValidationException extends RuntimeException {
/**
*
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ActiveTrigger.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActiveTrigger.java
index d1e664001..81c26fc1a 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ActiveTrigger.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActiveTrigger.java
@@ -4,16 +4,16 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
-
-import org.eclipse.etrice.core.room.InterfaceItem;
-import org.eclipse.etrice.core.room.Message;
-import org.eclipse.etrice.core.room.TriggeredTransition;
+package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.room.InterfaceItem;
+import org.eclipse.etrice.core.room.Message;
+import org.eclipse.etrice.core.room.TriggeredTransition;
+
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Active Trigger</b></em>'.
@@ -22,14 +22,14 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.ActiveTrigger#getMsg <em>Msg</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.ActiveTrigger#getIfitem <em>Ifitem</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.ActiveTrigger#getTrigger <em>Trigger</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.ActiveTrigger#getTransitions <em>Transitions</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getMsg <em>Msg</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getIfitem <em>Ifitem</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getTrigger <em>Trigger</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getTransitions <em>Transitions</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getActiveTrigger()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getActiveTrigger()
* @model
* @generated
*/
@@ -44,14 +44,14 @@ public interface ActiveTrigger extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Msg</em>' reference.
* @see #setMsg(Message)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getActiveTrigger_Msg()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getActiveTrigger_Msg()
* @model
* @generated
*/
Message getMsg();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.ActiveTrigger#getMsg <em>Msg</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getMsg <em>Msg</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Msg</em>' reference.
@@ -70,14 +70,14 @@ public interface ActiveTrigger extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Ifitem</em>' reference.
* @see #setIfitem(InterfaceItem)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getActiveTrigger_Ifitem()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getActiveTrigger_Ifitem()
* @model
* @generated
*/
InterfaceItem getIfitem();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.ActiveTrigger#getIfitem <em>Ifitem</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getIfitem <em>Ifitem</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Ifitem</em>' reference.
@@ -96,14 +96,14 @@ public interface ActiveTrigger extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Trigger</em>' attribute.
* @see #setTrigger(String)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getActiveTrigger_Trigger()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getActiveTrigger_Trigger()
* @model
* @generated
*/
String getTrigger();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.ActiveTrigger#getTrigger <em>Trigger</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getTrigger <em>Trigger</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Trigger</em>' attribute.
@@ -122,7 +122,7 @@ public interface ActiveTrigger extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Transitions</em>' reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getActiveTrigger_Transitions()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getActiveTrigger_Transitions()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ActorInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInstance.java
index 76ed2db85..dad281916 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ActorInstance.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInstance.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.etrice.core.room.ActorClass;
@@ -16,13 +16,13 @@ import org.eclipse.etrice.core.room.ActorClass;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.ActorInstance#getActorClass <em>Actor Class</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.ActorInstance#getReplIdx <em>Repl Idx</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.ActorInstance#getUnindexedName <em>Unindexed Name</em>}</li>
+ * <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.generator.etricegen.ETriceGenPackage#getActorInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getActorInstance()
* @model
* @generated
*/
@@ -37,14 +37,14 @@ public interface ActorInstance extends StructureInstance {
* <!-- end-user-doc -->
* @return the value of the '<em>Actor Class</em>' reference.
* @see #setActorClass(ActorClass)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getActorInstance_ActorClass()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getActorInstance_ActorClass()
* @model
* @generated
*/
ActorClass getActorClass();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.ActorInstance#getActorClass <em>Actor Class</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.ActorInstance#getActorClass <em>Actor Class</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Actor Class</em>' reference.
@@ -64,14 +64,14 @@ public interface ActorInstance extends StructureInstance {
* <!-- end-user-doc -->
* @return the value of the '<em>Repl Idx</em>' attribute.
* @see #setReplIdx(int)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getActorInstance_ReplIdx()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getActorInstance_ReplIdx()
* @model default="-1"
* @generated
*/
int getReplIdx();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.ActorInstance#getReplIdx <em>Repl Idx</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.ActorInstance#getReplIdx <em>Repl Idx</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Repl Idx</em>' attribute.
@@ -89,7 +89,7 @@ public interface ActorInstance extends StructureInstance {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Unindexed Name</em>' attribute.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getActorInstance_UnindexedName()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getActorInstance_UnindexedName()
* @model transient="true" changeable="false" volatile="true" derived="true"
* @generated
*/
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/BindingInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/BindingInstance.java
index 7690cd2a7..5e8221abe 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/BindingInstance.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/BindingInstance.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.emf.common.util.EList;
@@ -18,19 +18,19 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.BindingInstance#getPorts <em>Ports</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.BindingInstance#getPorts <em>Ports</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getBindingInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getBindingInstance()
* @model
* @generated
*/
public interface BindingInstance extends EObject {
/**
* Returns the value of the '<em><b>Ports</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.etrice.generator.etricegen.PortInstance}.
- * It is bidirectional and its opposite is '{@link org.eclipse.etrice.generator.etricegen.PortInstance#getBindings <em>Bindings</em>}'.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.PortInstance}.
+ * It is bidirectional and its opposite is '{@link org.eclipse.etrice.core.genmodel.etricegen.PortInstance#getBindings <em>Bindings</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Ports</em>' reference list isn't clear,
@@ -38,8 +38,8 @@ public interface BindingInstance extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Ports</em>' reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getBindingInstance_Ports()
- * @see org.eclipse.etrice.generator.etricegen.PortInstance#getBindings
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getBindingInstance_Ports()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.PortInstance#getBindings
* @model opposite="bindings" upper="2"
* @generated
*/
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ConnectionInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ConnectionInstance.java
index 1bc257cd0..584e4fbb9 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ConnectionInstance.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ConnectionInstance.java
@@ -4,11 +4,12 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
-import org.eclipse.etrice.core.room.LayerConnection;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.room.LayerConnection;
+
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Connection Instance</b></em>'.
@@ -17,14 +18,14 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance#getFromAI <em>From AI</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance#getFromSPP <em>From SPP</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance#getToSPP <em>To SPP</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance#getConnection <em>Connection</em>}</li>
+ * <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.generator.etricegen.ETriceGenPackage#getConnectionInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getConnectionInstance()
* @model
* @generated
*/
@@ -39,14 +40,14 @@ public interface ConnectionInstance extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>From AI</em>' reference.
* @see #setFromAI(ActorInstance)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getConnectionInstance_FromAI()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getConnectionInstance_FromAI()
* @model
* @generated
*/
ActorInstance getFromAI();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance#getFromAI <em>From AI</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getFromAI <em>From AI</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>From AI</em>' reference.
@@ -57,7 +58,7 @@ public interface ConnectionInstance extends EObject {
/**
* Returns the value of the '<em><b>From SPP</b></em>' reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.etrice.generator.etricegen.SPPInstance#getOutgoing <em>Outgoing</em>}'.
+ * It is bidirectional and its opposite is '{@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getOutgoing <em>Outgoing</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>From SPP</em>' reference isn't clear,
@@ -66,15 +67,15 @@ public interface ConnectionInstance extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>From SPP</em>' reference.
* @see #setFromSPP(SPPInstance)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getConnectionInstance_FromSPP()
- * @see org.eclipse.etrice.generator.etricegen.SPPInstance#getOutgoing
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getConnectionInstance_FromSPP()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getOutgoing
* @model opposite="outgoing"
* @generated
*/
SPPInstance getFromSPP();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance#getFromSPP <em>From SPP</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getFromSPP <em>From SPP</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>From SPP</em>' reference.
@@ -85,7 +86,7 @@ public interface ConnectionInstance extends EObject {
/**
* Returns the value of the '<em><b>To SPP</b></em>' reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.etrice.generator.etricegen.SPPInstance#getIncoming <em>Incoming</em>}'.
+ * It is bidirectional and its opposite is '{@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getIncoming <em>Incoming</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>To SPP</em>' reference isn't clear,
@@ -94,15 +95,15 @@ public interface ConnectionInstance extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>To SPP</em>' reference.
* @see #setToSPP(SPPInstance)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getConnectionInstance_ToSPP()
- * @see org.eclipse.etrice.generator.etricegen.SPPInstance#getIncoming
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getConnectionInstance_ToSPP()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getIncoming
* @model opposite="incoming"
* @generated
*/
SPPInstance getToSPP();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance#getToSPP <em>To SPP</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getToSPP <em>To SPP</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>To SPP</em>' reference.
@@ -121,14 +122,14 @@ public interface ConnectionInstance extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Connection</em>' reference.
* @see #setConnection(LayerConnection)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getConnectionInstance_Connection()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getConnectionInstance_Connection()
* @model
* @generated
*/
LayerConnection getConnection();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance#getConnection <em>Connection</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getConnection <em>Connection</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Connection</em>' reference.
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ETriceGenFactory.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ETriceGenFactory.java
index cb974771a..b5c49e7b5 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ETriceGenFactory.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ETriceGenFactory.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.emf.ecore.EFactory;
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory;
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage
* @generated
*/
public interface ETriceGenFactory extends EFactory {
@@ -23,7 +23,7 @@ public interface ETriceGenFactory extends EFactory {
* <!-- end-user-doc -->
* @generated
*/
- ETriceGenFactory eINSTANCE = org.eclipse.etrice.generator.etricegen.impl.ETriceGenFactoryImpl.init();
+ ETriceGenFactory eINSTANCE = org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenFactoryImpl.init();
/**
* Returns a new object of class '<em>Root</em>'.
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ETriceGenPackage.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ETriceGenPackage.java
index 966c14161..c52467d67 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ETriceGenPackage.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ETriceGenPackage.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -25,7 +25,7 @@ import org.eclipse.etrice.core.room.RoomPackage;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenFactory
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenFactory
* @model kind="package"
* @generated
*/
@@ -60,14 +60,14 @@ public interface ETriceGenPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- ETriceGenPackage eINSTANCE = org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl.init();
+ ETriceGenPackage eINSTANCE = org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.RootImpl <em>Root</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl <em>Root</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.RootImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getRoot()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getRoot()
* @generated
*/
int ROOT = 0;
@@ -163,11 +163,11 @@ public interface ETriceGenPackage extends EPackage {
int ROOT_FEATURE_COUNT = 9;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.InstanceBaseImpl <em>Instance Base</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl <em>Instance Base</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.InstanceBaseImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getInstanceBase()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getInstanceBase()
* @generated
*/
int INSTANCE_BASE = 1;
@@ -227,11 +227,11 @@ public interface ETriceGenPackage extends EPackage {
int INSTANCE_BASE_FEATURE_COUNT = 5;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.StructureInstanceImpl <em>Structure Instance</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl <em>Structure Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.StructureInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getStructureInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getStructureInstance()
* @generated
*/
int STRUCTURE_INSTANCE = 2;
@@ -372,11 +372,11 @@ public interface ETriceGenPackage extends EPackage {
int STRUCTURE_INSTANCE_FEATURE_COUNT = INSTANCE_BASE_FEATURE_COUNT + 9;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.SubSystemInstanceImpl <em>Sub System Instance</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SubSystemInstanceImpl <em>Sub System Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.SubSystemInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getSubSystemInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.SubSystemInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getSubSystemInstance()
* @generated
*/
int SUB_SYSTEM_INSTANCE = 3;
@@ -535,11 +535,11 @@ public interface ETriceGenPackage extends EPackage {
int SUB_SYSTEM_INSTANCE_FEATURE_COUNT = STRUCTURE_INSTANCE_FEATURE_COUNT + 2;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.ActorInstanceImpl <em>Actor Instance</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInstanceImpl <em>Actor Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.ActorInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getActorInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getActorInstance()
* @generated
*/
int ACTOR_INSTANCE = 4;
@@ -707,11 +707,11 @@ public interface ETriceGenPackage extends EPackage {
int ACTOR_INSTANCE_FEATURE_COUNT = STRUCTURE_INSTANCE_FEATURE_COUNT + 3;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.InterfaceItemInstanceImpl <em>Interface Item Instance</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InterfaceItemInstanceImpl <em>Interface Item Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.InterfaceItemInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getInterfaceItemInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.InterfaceItemInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getInterfaceItemInstance()
* @generated
*/
int INTERFACE_ITEM_INSTANCE = 5;
@@ -780,11 +780,11 @@ public interface ETriceGenPackage extends EPackage {
int INTERFACE_ITEM_INSTANCE_FEATURE_COUNT = INSTANCE_BASE_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.PortInstanceImpl <em>Port Instance</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.PortInstanceImpl <em>Port Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.PortInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getPortInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.PortInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getPortInstance()
* @generated
*/
int PORT_INSTANCE = 6;
@@ -880,11 +880,11 @@ public interface ETriceGenPackage extends EPackage {
int PORT_INSTANCE_FEATURE_COUNT = INTERFACE_ITEM_INSTANCE_FEATURE_COUNT + 3;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.BindingInstanceImpl <em>Binding Instance</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.BindingInstanceImpl <em>Binding Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.BindingInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getBindingInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.BindingInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getBindingInstance()
* @generated
*/
int BINDING_INSTANCE = 7;
@@ -908,11 +908,11 @@ public interface ETriceGenPackage extends EPackage {
int BINDING_INSTANCE_FEATURE_COUNT = 1;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.SAPInstanceImpl <em>SAP Instance</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SAPInstanceImpl <em>SAP Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.SAPInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getSAPInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.SAPInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getSAPInstance()
* @generated
*/
int SAP_INSTANCE = 8;
@@ -990,11 +990,11 @@ public interface ETriceGenPackage extends EPackage {
int SAP_INSTANCE_FEATURE_COUNT = INTERFACE_ITEM_INSTANCE_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.SPPInstanceImpl <em>SPP Instance</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SPPInstanceImpl <em>SPP Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.SPPInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getSPPInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.SPPInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getSPPInstance()
* @generated
*/
int SPP_INSTANCE = 9;
@@ -1081,11 +1081,11 @@ public interface ETriceGenPackage extends EPackage {
int SPP_INSTANCE_FEATURE_COUNT = INSTANCE_BASE_FEATURE_COUNT + 3;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.ServiceImplInstanceImpl <em>Service Impl Instance</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ServiceImplInstanceImpl <em>Service Impl Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.ServiceImplInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getServiceImplInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ServiceImplInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getServiceImplInstance()
* @generated
*/
int SERVICE_IMPL_INSTANCE = 10;
@@ -1163,11 +1163,11 @@ public interface ETriceGenPackage extends EPackage {
int SERVICE_IMPL_INSTANCE_FEATURE_COUNT = INTERFACE_ITEM_INSTANCE_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.ConnectionInstanceImpl <em>Connection Instance</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ConnectionInstanceImpl <em>Connection Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.ConnectionInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getConnectionInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ConnectionInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getConnectionInstance()
* @generated
*/
int CONNECTION_INSTANCE = 11;
@@ -1218,11 +1218,11 @@ public interface ETriceGenPackage extends EPackage {
int CONNECTION_INSTANCE_FEATURE_COUNT = 4;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.ActiveTriggerImpl <em>Active Trigger</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActiveTriggerImpl <em>Active Trigger</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.ActiveTriggerImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getActiveTrigger()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ActiveTriggerImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getActiveTrigger()
* @generated
*/
int ACTIVE_TRIGGER = 12;
@@ -1273,11 +1273,11 @@ public interface ETriceGenPackage extends EPackage {
int ACTIVE_TRIGGER_FEATURE_COUNT = 4;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.TransitionChainImpl <em>Transition Chain</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.TransitionChainImpl <em>Transition Chain</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.TransitionChainImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getTransitionChain()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.TransitionChainImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getTransitionChain()
* @generated
*/
int TRANSITION_CHAIN = 13;
@@ -1314,7 +1314,7 @@ public interface ETriceGenPackage extends EPackage {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see ITransitionChainVisitor
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getITransitionChainVisitor()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getITransitionChainVisitor()
* @generated
*/
int ITRANSITION_CHAIN_VISITOR = 14;
@@ -1333,7 +1333,7 @@ public interface ETriceGenPackage extends EPackage {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see IDiagnostician
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getIDiagnostician()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getIDiagnostician()
* @generated
*/
int IDIAGNOSTICIAN = 15;
@@ -1348,11 +1348,11 @@ public interface ETriceGenPackage extends EPackage {
int IDIAGNOSTICIAN_FEATURE_COUNT = 0;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.impl.ExpandedActorClassImpl <em>Expanded Actor Class</em>}' class.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ExpandedActorClassImpl <em>Expanded Actor Class</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.ExpandedActorClassImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getExpandedActorClass()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ExpandedActorClassImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getExpandedActorClass()
* @generated
*/
int EXPANDED_ACTOR_CLASS = 16;
@@ -1583,679 +1583,679 @@ public interface ETriceGenPackage extends EPackage {
int EXPANDED_ACTOR_CLASS_FEATURE_COUNT = RoomPackage.ACTOR_CLASS_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.etrice.generator.etricegen.PortKind <em>Port Kind</em>}' enum.
+ * The meta object id for the '{@link org.eclipse.etrice.core.genmodel.etricegen.PortKind <em>Port Kind</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.PortKind
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getPortKind()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.PortKind
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getPortKind()
* @generated
*/
int PORT_KIND = 17;
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.Root <em>Root</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.Root <em>Root</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Root</em>'.
- * @see org.eclipse.etrice.generator.etricegen.Root
+ * @see org.eclipse.etrice.core.genmodel.etricegen.Root
* @generated
*/
EClass getRoot();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.etrice.generator.etricegen.Root#getModels <em>Models</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#isLibrary <em>Library</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Models</em>'.
- * @see org.eclipse.etrice.generator.etricegen.Root#getModels()
+ * @return the meta object for the attribute '<em>Library</em>'.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.Root#isLibrary()
* @see #getRoot()
* @generated
*/
- EReference getRoot_Models();
+ EAttribute getRoot_Library();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.generator.etricegen.Root#getXpActorClasses <em>Xp Actor Classes</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getSubSystemInstances <em>Sub System Instances</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Xp Actor Classes</em>'.
- * @see org.eclipse.etrice.generator.etricegen.Root#getXpActorClasses()
+ * @return the meta object for the containment reference list '<em>Sub System Instances</em>'.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getSubSystemInstances()
* @see #getRoot()
* @generated
*/
- EReference getRoot_XpActorClasses();
+ EReference getRoot_SubSystemInstances();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.etrice.generator.etricegen.Root#getUsedDataClasses <em>Used Data Classes</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getModels <em>Models</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Used Data Classes</em>'.
- * @see org.eclipse.etrice.generator.etricegen.Root#getUsedDataClasses()
+ * @return the meta object for the reference list '<em>Models</em>'.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getModels()
* @see #getRoot()
* @generated
*/
- EReference getRoot_UsedDataClasses();
+ EReference getRoot_Models();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.etrice.generator.etricegen.Root#getUsedProtocolClasses <em>Used Protocol Classes</em>}'.
+ * 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 -->
- * @return the meta object for the reference list '<em>Used Protocol Classes</em>'.
- * @see org.eclipse.etrice.generator.etricegen.Root#getUsedProtocolClasses()
+ * @return the meta object for the containment reference list '<em>Xp Actor Classes</em>'.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getXpActorClasses()
* @see #getRoot()
* @generated
*/
- EReference getRoot_UsedProtocolClasses();
+ EReference getRoot_XpActorClasses();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.etrice.generator.etricegen.Root#getUsedActorClasses <em>Used Actor Classes</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedDataClasses <em>Used Data 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.generator.etricegen.Root#getUsedActorClasses()
+ * @return the meta object for the reference list '<em>Used Data Classes</em>'.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedDataClasses()
* @see #getRoot()
* @generated
*/
- EReference getRoot_UsedActorClasses();
+ EReference getRoot_UsedDataClasses();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.etrice.generator.etricegen.Root#getUsedRoomModels <em>Used Room Models</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedProtocolClasses <em>Used Protocol 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.generator.etricegen.Root#getUsedRoomModels()
+ * @return the meta object for the reference list '<em>Used Protocol Classes</em>'.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedProtocolClasses()
* @see #getRoot()
* @generated
*/
- EReference getRoot_UsedRoomModels();
+ EReference getRoot_UsedProtocolClasses();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.etrice.generator.etricegen.Root#getSubSystemClasses <em>Sub System Classes</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedActorClasses <em>Used Actor Classes</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Sub System Classes</em>'.
- * @see org.eclipse.etrice.generator.etricegen.Root#getSubSystemClasses()
+ * @return the meta object for the reference list '<em>Used Actor Classes</em>'.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedActorClasses()
* @see #getRoot()
* @generated
*/
- EReference getRoot_SubSystemClasses();
+ EReference getRoot_UsedActorClasses();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.etrice.generator.etricegen.Root#isLibrary <em>Library</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedRoomModels <em>Used Room Models</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Library</em>'.
- * @see org.eclipse.etrice.generator.etricegen.Root#isLibrary()
+ * @return the meta object for the reference list '<em>Used Room Models</em>'.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getUsedRoomModels()
* @see #getRoot()
* @generated
*/
- EAttribute getRoot_Library();
+ EReference getRoot_UsedRoomModels();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.generator.etricegen.Root#getSubSystemInstances <em>Sub System Instances</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#getSubSystemClasses <em>Sub System Classes</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Sub System Instances</em>'.
- * @see org.eclipse.etrice.generator.etricegen.Root#getSubSystemInstances()
+ * @return the meta object for the reference list '<em>Sub System Classes</em>'.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.Root#getSubSystemClasses()
* @see #getRoot()
* @generated
*/
- EReference getRoot_SubSystemInstances();
+ EReference getRoot_SubSystemClasses();
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.InstanceBase <em>Instance Base</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase <em>Instance Base</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Instance Base</em>'.
- * @see org.eclipse.etrice.generator.etricegen.InstanceBase
+ * @see org.eclipse.etrice.core.genmodel.etricegen.InstanceBase
* @generated
*/
EClass getInstanceBase();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.etrice.generator.etricegen.InstanceBase#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.etrice.generator.etricegen.InstanceBase#getName()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getName()
* @see #getInstanceBase()
* @generated
*/
EAttribute getInstanceBase_Name();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.etrice.generator.etricegen.InstanceBase#getPath <em>Path</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getPath <em>Path</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Path</em>'.
- * @see org.eclipse.etrice.generator.etricegen.InstanceBase#getPath()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getPath()
* @see #getInstanceBase()
* @generated
*/
EAttribute getInstanceBase_Path();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.etrice.generator.etricegen.InstanceBase#getObjId <em>Obj Id</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getObjId <em>Obj Id</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Obj Id</em>'.
- * @see org.eclipse.etrice.generator.etricegen.InstanceBase#getObjId()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getObjId()
* @see #getInstanceBase()
* @generated
*/
EAttribute getInstanceBase_ObjId();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.etrice.generator.etricegen.InstanceBase#getThreadId <em>Thread Id</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getThreadId <em>Thread Id</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Thread Id</em>'.
- * @see org.eclipse.etrice.generator.etricegen.InstanceBase#getThreadId()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getThreadId()
* @see #getInstanceBase()
* @generated
*/
EAttribute getInstanceBase_ThreadId();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.etrice.generator.etricegen.InstanceBase#getNObjIDs <em>NObj IDs</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getNObjIDs <em>NObj IDs</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>NObj IDs</em>'.
- * @see org.eclipse.etrice.generator.etricegen.InstanceBase#getNObjIDs()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getNObjIDs()
* @see #getInstanceBase()
* @generated
*/
EAttribute getInstanceBase_NObjIDs();
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.StructureInstance <em>Structure Instance</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance <em>Structure Instance</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Structure Instance</em>'.
- * @see org.eclipse.etrice.generator.etricegen.StructureInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.StructureInstance
* @generated
*/
EClass getStructureInstance();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getInstances <em>Instances</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getInstances <em>Instances</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Instances</em>'.
- * @see org.eclipse.etrice.generator.etricegen.StructureInstance#getInstances()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getInstances()
* @see #getStructureInstance()
* @generated
*/
EReference getStructureInstance_Instances();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getPorts <em>Ports</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getPorts <em>Ports</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Ports</em>'.
- * @see org.eclipse.etrice.generator.etricegen.StructureInstance#getPorts()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getPorts()
* @see #getStructureInstance()
* @generated
*/
EReference getStructureInstance_Ports();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getSaps <em>Saps</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getSaps <em>Saps</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Saps</em>'.
- * @see org.eclipse.etrice.generator.etricegen.StructureInstance#getSaps()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getSaps()
* @see #getStructureInstance()
* @generated
*/
EReference getStructureInstance_Saps();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getSpps <em>Spps</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getSpps <em>Spps</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Spps</em>'.
- * @see org.eclipse.etrice.generator.etricegen.StructureInstance#getSpps()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getSpps()
* @see #getStructureInstance()
* @generated
*/
EReference getStructureInstance_Spps();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getServices <em>Services</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getServices <em>Services</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Services</em>'.
- * @see org.eclipse.etrice.generator.etricegen.StructureInstance#getServices()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getServices()
* @see #getStructureInstance()
* @generated
*/
EReference getStructureInstance_Services();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getBindings <em>Bindings</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getBindings <em>Bindings</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Bindings</em>'.
- * @see org.eclipse.etrice.generator.etricegen.StructureInstance#getBindings()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getBindings()
* @see #getStructureInstance()
* @generated
*/
EReference getStructureInstance_Bindings();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getConnections <em>Connections</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getConnections <em>Connections</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Connections</em>'.
- * @see org.eclipse.etrice.generator.etricegen.StructureInstance#getConnections()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getConnections()
* @see #getStructureInstance()
* @generated
*/
EReference getStructureInstance_Connections();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getAllContainedInstances <em>All Contained Instances</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getAllContainedInstances <em>All Contained Instances</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference list '<em>All Contained Instances</em>'.
- * @see org.eclipse.etrice.generator.etricegen.StructureInstance#getAllContainedInstances()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getAllContainedInstances()
* @see #getStructureInstance()
* @generated
*/
EReference getStructureInstance_AllContainedInstances();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getOrderedIfItemInstances <em>Ordered If Item Instances</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getOrderedIfItemInstances <em>Ordered If Item Instances</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference list '<em>Ordered If Item Instances</em>'.
- * @see org.eclipse.etrice.generator.etricegen.StructureInstance#getOrderedIfItemInstances()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getOrderedIfItemInstances()
* @see #getStructureInstance()
* @generated
*/
EReference getStructureInstance_OrderedIfItemInstances();
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.SubSystemInstance <em>Sub System Instance</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance <em>Sub System Instance</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Sub System Instance</em>'.
- * @see org.eclipse.etrice.generator.etricegen.SubSystemInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance
* @generated
*/
EClass getSubSystemInstance();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.SubSystemInstance#getSubSystemClass <em>Sub System Class</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance#getSubSystemClass <em>Sub System Class</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Sub System Class</em>'.
- * @see org.eclipse.etrice.generator.etricegen.SubSystemInstance#getSubSystemClass()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance#getSubSystemClass()
* @see #getSubSystemInstance()
* @generated
*/
EReference getSubSystemInstance_SubSystemClass();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.etrice.generator.etricegen.SubSystemInstance#getMaxObjId <em>Max Obj Id</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance#getMaxObjId <em>Max Obj Id</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Max Obj Id</em>'.
- * @see org.eclipse.etrice.generator.etricegen.SubSystemInstance#getMaxObjId()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance#getMaxObjId()
* @see #getSubSystemInstance()
* @generated
*/
EAttribute getSubSystemInstance_MaxObjId();
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.ActorInstance <em>Actor Instance</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.ActorInstance <em>Actor Instance</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Actor Instance</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ActorInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ActorInstance
* @generated
*/
EClass getActorInstance();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.ActorInstance#getActorClass <em>Actor Class</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.ActorInstance#getActorClass <em>Actor Class</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Actor Class</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ActorInstance#getActorClass()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ActorInstance#getActorClass()
* @see #getActorInstance()
* @generated
*/
EReference getActorInstance_ActorClass();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.etrice.generator.etricegen.ActorInstance#getReplIdx <em>Repl Idx</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.genmodel.etricegen.ActorInstance#getReplIdx <em>Repl Idx</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Repl Idx</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ActorInstance#getReplIdx()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ActorInstance#getReplIdx()
* @see #getActorInstance()
* @generated
*/
EAttribute getActorInstance_ReplIdx();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.etrice.generator.etricegen.ActorInstance#getUnindexedName <em>Unindexed Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.genmodel.etricegen.ActorInstance#getUnindexedName <em>Unindexed Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Unindexed Name</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ActorInstance#getUnindexedName()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ActorInstance#getUnindexedName()
* @see #getActorInstance()
* @generated
*/
EAttribute getActorInstance_UnindexedName();
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.InterfaceItemInstance <em>Interface Item Instance</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance <em>Interface Item Instance</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Interface Item Instance</em>'.
- * @see org.eclipse.etrice.generator.etricegen.InterfaceItemInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance
* @generated
*/
EClass getInterfaceItemInstance();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.etrice.generator.etricegen.InterfaceItemInstance#getPeers <em>Peers</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance#getPeers <em>Peers</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference list '<em>Peers</em>'.
- * @see org.eclipse.etrice.generator.etricegen.InterfaceItemInstance#getPeers()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance#getPeers()
* @see #getInterfaceItemInstance()
* @generated
*/
EReference getInterfaceItemInstance_Peers();
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.PortInstance <em>Port Instance</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.PortInstance <em>Port Instance</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Port Instance</em>'.
- * @see org.eclipse.etrice.generator.etricegen.PortInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.PortInstance
* @generated
*/
EClass getPortInstance();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.PortInstance#getPort <em>Port</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.PortInstance#getPort <em>Port</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Port</em>'.
- * @see org.eclipse.etrice.generator.etricegen.PortInstance#getPort()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.PortInstance#getPort()
* @see #getPortInstance()
* @generated
*/
EReference getPortInstance_Port();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.etrice.generator.etricegen.PortInstance#getKind <em>Kind</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.genmodel.etricegen.PortInstance#getKind <em>Kind</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Kind</em>'.
- * @see org.eclipse.etrice.generator.etricegen.PortInstance#getKind()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.PortInstance#getKind()
* @see #getPortInstance()
* @generated
*/
EAttribute getPortInstance_Kind();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.etrice.generator.etricegen.PortInstance#getBindings <em>Bindings</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.PortInstance#getBindings <em>Bindings</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference list '<em>Bindings</em>'.
- * @see org.eclipse.etrice.generator.etricegen.PortInstance#getBindings()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.PortInstance#getBindings()
* @see #getPortInstance()
* @generated
*/
EReference getPortInstance_Bindings();
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.BindingInstance <em>Binding Instance</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.BindingInstance <em>Binding Instance</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Binding Instance</em>'.
- * @see org.eclipse.etrice.generator.etricegen.BindingInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.BindingInstance
* @generated
*/
EClass getBindingInstance();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.etrice.generator.etricegen.BindingInstance#getPorts <em>Ports</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.BindingInstance#getPorts <em>Ports</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference list '<em>Ports</em>'.
- * @see org.eclipse.etrice.generator.etricegen.BindingInstance#getPorts()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.BindingInstance#getPorts()
* @see #getBindingInstance()
* @generated
*/
EReference getBindingInstance_Ports();
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.SAPInstance <em>SAP Instance</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.SAPInstance <em>SAP Instance</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>SAP Instance</em>'.
- * @see org.eclipse.etrice.generator.etricegen.SAPInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.SAPInstance
* @generated
*/
EClass getSAPInstance();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.SAPInstance#getSap <em>Sap</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.SAPInstance#getSap <em>Sap</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Sap</em>'.
- * @see org.eclipse.etrice.generator.etricegen.SAPInstance#getSap()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.SAPInstance#getSap()
* @see #getSAPInstance()
* @generated
*/
EReference getSAPInstance_Sap();
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.SPPInstance <em>SPP Instance</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance <em>SPP Instance</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>SPP Instance</em>'.
- * @see org.eclipse.etrice.generator.etricegen.SPPInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.SPPInstance
* @generated
*/
EClass getSPPInstance();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.SPPInstance#getSpp <em>Spp</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getSpp <em>Spp</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Spp</em>'.
- * @see org.eclipse.etrice.generator.etricegen.SPPInstance#getSpp()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getSpp()
* @see #getSPPInstance()
* @generated
*/
EReference getSPPInstance_Spp();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.etrice.generator.etricegen.SPPInstance#getIncoming <em>Incoming</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getIncoming <em>Incoming</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference list '<em>Incoming</em>'.
- * @see org.eclipse.etrice.generator.etricegen.SPPInstance#getIncoming()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getIncoming()
* @see #getSPPInstance()
* @generated
*/
EReference getSPPInstance_Incoming();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.SPPInstance#getOutgoing <em>Outgoing</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getOutgoing <em>Outgoing</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Outgoing</em>'.
- * @see org.eclipse.etrice.generator.etricegen.SPPInstance#getOutgoing()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getOutgoing()
* @see #getSPPInstance()
* @generated
*/
EReference getSPPInstance_Outgoing();
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.ServiceImplInstance <em>Service Impl Instance</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance <em>Service Impl Instance</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Service Impl Instance</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ServiceImplInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance
* @generated
*/
EClass getServiceImplInstance();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.ServiceImplInstance#getSvcImpl <em>Svc Impl</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance#getSvcImpl <em>Svc Impl</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Svc Impl</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ServiceImplInstance#getSvcImpl()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance#getSvcImpl()
* @see #getServiceImplInstance()
* @generated
*/
EReference getServiceImplInstance_SvcImpl();
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance <em>Connection Instance</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance <em>Connection Instance</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Connection Instance</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ConnectionInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance
* @generated
*/
EClass getConnectionInstance();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance#getFromAI <em>From AI</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getFromAI <em>From AI</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>From AI</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ConnectionInstance#getFromAI()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getFromAI()
* @see #getConnectionInstance()
* @generated
*/
EReference getConnectionInstance_FromAI();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance#getFromSPP <em>From SPP</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getFromSPP <em>From SPP</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>From SPP</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ConnectionInstance#getFromSPP()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getFromSPP()
* @see #getConnectionInstance()
* @generated
*/
EReference getConnectionInstance_FromSPP();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance#getToSPP <em>To SPP</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getToSPP <em>To SPP</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>To SPP</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ConnectionInstance#getToSPP()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getToSPP()
* @see #getConnectionInstance()
* @generated
*/
EReference getConnectionInstance_ToSPP();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance#getConnection <em>Connection</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getConnection <em>Connection</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Connection</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ConnectionInstance#getConnection()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getConnection()
* @see #getConnectionInstance()
* @generated
*/
EReference getConnectionInstance_Connection();
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.ActiveTrigger <em>Active Trigger</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger <em>Active Trigger</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Active Trigger</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ActiveTrigger
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger
* @generated
*/
EClass getActiveTrigger();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.ActiveTrigger#getMsg <em>Msg</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getMsg <em>Msg</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Msg</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ActiveTrigger#getMsg()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getMsg()
* @see #getActiveTrigger()
* @generated
*/
EReference getActiveTrigger_Msg();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.ActiveTrigger#getIfitem <em>Ifitem</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getIfitem <em>Ifitem</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Ifitem</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ActiveTrigger#getIfitem()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getIfitem()
* @see #getActiveTrigger()
* @generated
*/
EReference getActiveTrigger_Ifitem();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.etrice.generator.etricegen.ActiveTrigger#getTrigger <em>Trigger</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getTrigger <em>Trigger</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Trigger</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ActiveTrigger#getTrigger()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getTrigger()
* @see #getActiveTrigger()
* @generated
*/
EAttribute getActiveTrigger_Trigger();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.etrice.generator.etricegen.ActiveTrigger#getTransitions <em>Transitions</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getTransitions <em>Transitions</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference list '<em>Transitions</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ActiveTrigger#getTransitions()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger#getTransitions()
* @see #getActiveTrigger()
* @generated
*/
EReference getActiveTrigger_Transitions();
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.TransitionChain <em>Transition Chain</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.TransitionChain <em>Transition Chain</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Transition Chain</em>'.
- * @see org.eclipse.etrice.generator.etricegen.TransitionChain
+ * @see org.eclipse.etrice.core.genmodel.etricegen.TransitionChain
* @generated
*/
EClass getTransitionChain();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.TransitionChain#getTransition <em>Transition</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.TransitionChain#getTransition <em>Transition</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Transition</em>'.
- * @see org.eclipse.etrice.generator.etricegen.TransitionChain#getTransition()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.TransitionChain#getTransition()
* @see #getTransitionChain()
* @generated
*/
EReference getTransitionChain_Transition();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.etrice.generator.etricegen.TransitionChain#isSkipEntry <em>Skip Entry</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.genmodel.etricegen.TransitionChain#isSkipEntry <em>Skip Entry</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Skip Entry</em>'.
- * @see org.eclipse.etrice.generator.etricegen.TransitionChain#isSkipEntry()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.TransitionChain#isSkipEntry()
* @see #getTransitionChain()
* @generated
*/
@@ -2284,32 +2284,32 @@ public interface ETriceGenPackage extends EPackage {
EClass getIDiagnostician();
/**
- * Returns the meta object for class '{@link org.eclipse.etrice.generator.etricegen.ExpandedActorClass <em>Expanded Actor Class</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass <em>Expanded Actor Class</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Expanded Actor Class</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ExpandedActorClass
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass
* @generated
*/
EClass getExpandedActorClass();
/**
- * Returns the meta object for the reference '{@link org.eclipse.etrice.generator.etricegen.ExpandedActorClass#getActorClass <em>Actor Class</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass#getActorClass <em>Actor Class</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Actor Class</em>'.
- * @see org.eclipse.etrice.generator.etricegen.ExpandedActorClass#getActorClass()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass#getActorClass()
* @see #getExpandedActorClass()
* @generated
*/
EReference getExpandedActorClass_ActorClass();
/**
- * Returns the meta object for enum '{@link org.eclipse.etrice.generator.etricegen.PortKind <em>Port Kind</em>}'.
+ * Returns the meta object for enum '{@link org.eclipse.etrice.core.genmodel.etricegen.PortKind <em>Port Kind</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for enum '<em>Port Kind</em>'.
- * @see org.eclipse.etrice.generator.etricegen.PortKind
+ * @see org.eclipse.etrice.core.genmodel.etricegen.PortKind
* @generated
*/
EEnum getPortKind();
@@ -2337,16 +2337,32 @@ public interface ETriceGenPackage extends EPackage {
*/
interface Literals {
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.RootImpl <em>Root</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl <em>Root</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.RootImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getRoot()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.RootImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getRoot()
* @generated
*/
EClass ROOT = eINSTANCE.getRoot();
/**
+ * The meta object literal for the '<em><b>Library</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute ROOT__LIBRARY = eINSTANCE.getRoot_Library();
+
+ /**
+ * The meta object literal for the '<em><b>Sub System Instances</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference ROOT__SUB_SYSTEM_INSTANCES = eINSTANCE.getRoot_SubSystemInstances();
+
+ /**
* The meta object literal for the '<em><b>Models</b></em>' reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2403,27 +2419,11 @@ public interface ETriceGenPackage extends EPackage {
EReference ROOT__SUB_SYSTEM_CLASSES = eINSTANCE.getRoot_SubSystemClasses();
/**
- * The meta object literal for the '<em><b>Library</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ROOT__LIBRARY = eINSTANCE.getRoot_Library();
-
- /**
- * The meta object literal for the '<em><b>Sub System Instances</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference ROOT__SUB_SYSTEM_INSTANCES = eINSTANCE.getRoot_SubSystemInstances();
-
- /**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.InstanceBaseImpl <em>Instance Base</em>}' class.
+ * 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 -->
- * @see org.eclipse.etrice.generator.etricegen.impl.InstanceBaseImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getInstanceBase()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getInstanceBase()
* @generated
*/
EClass INSTANCE_BASE = eINSTANCE.getInstanceBase();
@@ -2469,11 +2469,11 @@ public interface ETriceGenPackage extends EPackage {
EAttribute INSTANCE_BASE__NOBJ_IDS = eINSTANCE.getInstanceBase_NObjIDs();
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.StructureInstanceImpl <em>Structure Instance</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl <em>Structure Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.StructureInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getStructureInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getStructureInstance()
* @generated
*/
EClass STRUCTURE_INSTANCE = eINSTANCE.getStructureInstance();
@@ -2551,11 +2551,11 @@ public interface ETriceGenPackage extends EPackage {
EReference STRUCTURE_INSTANCE__ORDERED_IF_ITEM_INSTANCES = eINSTANCE.getStructureInstance_OrderedIfItemInstances();
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.SubSystemInstanceImpl <em>Sub System Instance</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SubSystemInstanceImpl <em>Sub System Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.SubSystemInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getSubSystemInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.SubSystemInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getSubSystemInstance()
* @generated
*/
EClass SUB_SYSTEM_INSTANCE = eINSTANCE.getSubSystemInstance();
@@ -2577,11 +2577,11 @@ public interface ETriceGenPackage extends EPackage {
EAttribute SUB_SYSTEM_INSTANCE__MAX_OBJ_ID = eINSTANCE.getSubSystemInstance_MaxObjId();
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.ActorInstanceImpl <em>Actor Instance</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInstanceImpl <em>Actor Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.ActorInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getActorInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ActorInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getActorInstance()
* @generated
*/
EClass ACTOR_INSTANCE = eINSTANCE.getActorInstance();
@@ -2611,11 +2611,11 @@ public interface ETriceGenPackage extends EPackage {
EAttribute ACTOR_INSTANCE__UNINDEXED_NAME = eINSTANCE.getActorInstance_UnindexedName();
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.InterfaceItemInstanceImpl <em>Interface Item Instance</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InterfaceItemInstanceImpl <em>Interface Item Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.InterfaceItemInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getInterfaceItemInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.InterfaceItemInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getInterfaceItemInstance()
* @generated
*/
EClass INTERFACE_ITEM_INSTANCE = eINSTANCE.getInterfaceItemInstance();
@@ -2629,11 +2629,11 @@ public interface ETriceGenPackage extends EPackage {
EReference INTERFACE_ITEM_INSTANCE__PEERS = eINSTANCE.getInterfaceItemInstance_Peers();
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.PortInstanceImpl <em>Port Instance</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.PortInstanceImpl <em>Port Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.PortInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getPortInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.PortInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getPortInstance()
* @generated
*/
EClass PORT_INSTANCE = eINSTANCE.getPortInstance();
@@ -2663,11 +2663,11 @@ public interface ETriceGenPackage extends EPackage {
EReference PORT_INSTANCE__BINDINGS = eINSTANCE.getPortInstance_Bindings();
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.BindingInstanceImpl <em>Binding Instance</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.BindingInstanceImpl <em>Binding Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.BindingInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getBindingInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.BindingInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getBindingInstance()
* @generated
*/
EClass BINDING_INSTANCE = eINSTANCE.getBindingInstance();
@@ -2681,11 +2681,11 @@ public interface ETriceGenPackage extends EPackage {
EReference BINDING_INSTANCE__PORTS = eINSTANCE.getBindingInstance_Ports();
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.SAPInstanceImpl <em>SAP Instance</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SAPInstanceImpl <em>SAP Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.SAPInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getSAPInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.SAPInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getSAPInstance()
* @generated
*/
EClass SAP_INSTANCE = eINSTANCE.getSAPInstance();
@@ -2699,11 +2699,11 @@ public interface ETriceGenPackage extends EPackage {
EReference SAP_INSTANCE__SAP = eINSTANCE.getSAPInstance_Sap();
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.SPPInstanceImpl <em>SPP Instance</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SPPInstanceImpl <em>SPP Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.SPPInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getSPPInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.SPPInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getSPPInstance()
* @generated
*/
EClass SPP_INSTANCE = eINSTANCE.getSPPInstance();
@@ -2733,11 +2733,11 @@ public interface ETriceGenPackage extends EPackage {
EReference SPP_INSTANCE__OUTGOING = eINSTANCE.getSPPInstance_Outgoing();
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.ServiceImplInstanceImpl <em>Service Impl Instance</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ServiceImplInstanceImpl <em>Service Impl Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.ServiceImplInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getServiceImplInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ServiceImplInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getServiceImplInstance()
* @generated
*/
EClass SERVICE_IMPL_INSTANCE = eINSTANCE.getServiceImplInstance();
@@ -2751,11 +2751,11 @@ public interface ETriceGenPackage extends EPackage {
EReference SERVICE_IMPL_INSTANCE__SVC_IMPL = eINSTANCE.getServiceImplInstance_SvcImpl();
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.ConnectionInstanceImpl <em>Connection Instance</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ConnectionInstanceImpl <em>Connection Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.ConnectionInstanceImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getConnectionInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ConnectionInstanceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getConnectionInstance()
* @generated
*/
EClass CONNECTION_INSTANCE = eINSTANCE.getConnectionInstance();
@@ -2793,11 +2793,11 @@ public interface ETriceGenPackage extends EPackage {
EReference CONNECTION_INSTANCE__CONNECTION = eINSTANCE.getConnectionInstance_Connection();
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.ActiveTriggerImpl <em>Active Trigger</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActiveTriggerImpl <em>Active Trigger</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.ActiveTriggerImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getActiveTrigger()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ActiveTriggerImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getActiveTrigger()
* @generated
*/
EClass ACTIVE_TRIGGER = eINSTANCE.getActiveTrigger();
@@ -2835,11 +2835,11 @@ public interface ETriceGenPackage extends EPackage {
EReference ACTIVE_TRIGGER__TRANSITIONS = eINSTANCE.getActiveTrigger_Transitions();
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.TransitionChainImpl <em>Transition Chain</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.TransitionChainImpl <em>Transition Chain</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.TransitionChainImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getTransitionChain()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.TransitionChainImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getTransitionChain()
* @generated
*/
EClass TRANSITION_CHAIN = eINSTANCE.getTransitionChain();
@@ -2865,7 +2865,7 @@ public interface ETriceGenPackage extends EPackage {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see ITransitionChainVisitor
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getITransitionChainVisitor()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getITransitionChainVisitor()
* @generated
*/
EClass ITRANSITION_CHAIN_VISITOR = eINSTANCE.getITransitionChainVisitor();
@@ -2875,17 +2875,17 @@ public interface ETriceGenPackage extends EPackage {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see IDiagnostician
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getIDiagnostician()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getIDiagnostician()
* @generated
*/
EClass IDIAGNOSTICIAN = eINSTANCE.getIDiagnostician();
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.impl.ExpandedActorClassImpl <em>Expanded Actor Class</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ExpandedActorClassImpl <em>Expanded Actor Class</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.impl.ExpandedActorClassImpl
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getExpandedActorClass()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ExpandedActorClassImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getExpandedActorClass()
* @generated
*/
EClass EXPANDED_ACTOR_CLASS = eINSTANCE.getExpandedActorClass();
@@ -2899,11 +2899,11 @@ public interface ETriceGenPackage extends EPackage {
EReference EXPANDED_ACTOR_CLASS__ACTOR_CLASS = eINSTANCE.getExpandedActorClass_ActorClass();
/**
- * The meta object literal for the '{@link org.eclipse.etrice.generator.etricegen.PortKind <em>Port Kind</em>}' enum.
+ * The meta object literal for the '{@link org.eclipse.etrice.core.genmodel.etricegen.PortKind <em>Port Kind</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.PortKind
- * @see org.eclipse.etrice.generator.etricegen.impl.ETriceGenPackageImpl#getPortKind()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.PortKind
+ * @see org.eclipse.etrice.core.genmodel.etricegen.impl.ETriceGenPackageImpl#getPortKind()
* @generated
*/
EEnum PORT_KIND = eINSTANCE.getPortKind();
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ExpandedActorClass.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ExpandedActorClass.java
index 2b3b8e163..c3e5da704 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ExpandedActorClass.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ExpandedActorClass.java
@@ -4,7 +4,9 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
+
+import org.eclipse.emf.common.util.EList;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.ContinuationTransition;
@@ -17,21 +19,20 @@ import org.eclipse.etrice.core.room.StateGraphNode;
import org.eclipse.etrice.core.room.Transition;
import org.eclipse.etrice.core.room.TransitionTerminal;
import org.eclipse.etrice.core.room.Trigger;
-import org.eclipse.emf.common.util.EList;
/**
* <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Explicit Actor Class</b></em>'.
+ * A representation of the model object '<em><b>Expanded Actor Class</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.ExpandedActorClass#getActorClass <em>Actor Class</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass#getActorClass <em>Actor Class</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getExpandedActorClass()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getExpandedActorClass()
* @model
* @generated
*/
@@ -46,14 +47,14 @@ public interface ExpandedActorClass extends ActorClass {
* <!-- end-user-doc -->
* @return the value of the '<em>Actor Class</em>' reference.
* @see #setActorClass(ActorClass)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getExpandedActorClass_ActorClass()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getExpandedActorClass_ActorClass()
* @model
* @generated
*/
ActorClass getActorClass();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.ExpandedActorClass#getActorClass <em>Actor Class</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass#getActorClass <em>Actor Class</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Actor Class</em>' reference.
@@ -65,7 +66,7 @@ public interface ExpandedActorClass extends ActorClass {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @model validatorType="org.eclipse.etrice.generator.etricegen.IDiagnostician"
+ * @model validatorType="org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician"
* @generated
*/
void prepare(IDiagnostician validator);
@@ -230,4 +231,4 @@ public interface ExpandedActorClass extends ActorClass {
*/
ContinuationTransition getDefaultBranch(EList<Transition> out);
-} // ExplicitActorClass
+} // ExpandedActorClass
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/IDiagnostician.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/IDiagnostician.java
index b3d5fb90b..bbe4de7ac 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/IDiagnostician.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/IDiagnostician.java
@@ -1,4 +1,4 @@
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ITransitionChainVisitor.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ITransitionChainVisitor.java
index d8b6d7396..7bbfb2825 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ITransitionChainVisitor.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ITransitionChainVisitor.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.etrice.core.room.CPBranchTransition;
import org.eclipse.etrice.core.room.ContinuationTransition;
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/InstanceBase.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InstanceBase.java
index 41f4dfcfa..393eb1202 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/InstanceBase.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InstanceBase.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.emf.ecore.EObject;
@@ -16,15 +16,15 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.InstanceBase#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.InstanceBase#getPath <em>Path</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.InstanceBase#getObjId <em>Obj Id</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.InstanceBase#getThreadId <em>Thread Id</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.InstanceBase#getNObjIDs <em>NObj IDs</em>}</li>
+ * <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>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getObjId <em>Obj Id</em>}</li>
+ * <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.generator.etricegen.ETriceGenPackage#getInstanceBase()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInstanceBase()
* @model abstract="true"
* @generated
*/
@@ -45,14 +45,14 @@ public interface InstanceBase extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getInstanceBase_Name()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInstanceBase_Name()
* @model
* @generated
*/
String getName();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.InstanceBase#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
@@ -70,7 +70,7 @@ public interface InstanceBase extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Path</em>' attribute.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getInstanceBase_Path()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInstanceBase_Path()
* @model transient="true" changeable="false" volatile="true" derived="true"
* @generated
*/
@@ -86,14 +86,14 @@ public interface InstanceBase extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Obj Id</em>' attribute.
* @see #setObjId(int)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getInstanceBase_ObjId()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInstanceBase_ObjId()
* @model
* @generated
*/
int getObjId();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.InstanceBase#getObjId <em>Obj Id</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getObjId <em>Obj Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Obj Id</em>' attribute.
@@ -112,7 +112,7 @@ public interface InstanceBase extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Thread Id</em>' attribute.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getInstanceBase_ThreadId()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInstanceBase_ThreadId()
* @model default="-1" changeable="false" derived="true"
* @generated
*/
@@ -127,7 +127,7 @@ public interface InstanceBase extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>NObj IDs</em>' attribute.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getInstanceBase_NObjIDs()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInstanceBase_NObjIDs()
* @model transient="true" changeable="false" volatile="true" derived="true"
* @generated
*/
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InstanceBase.java.bak b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InstanceBase.java.bak
new file mode 100644
index 000000000..037d106f7
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InstanceBase.java.bak
@@ -0,0 +1,130 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Instance Base</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <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>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getObjId <em>Obj Id</em>}</li>
+ * <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"
+ * @generated
+ */
+public interface InstanceBase extends EObject {
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInstanceBase_Name()
+ * @model
+ * @generated
+ */
+ String getName();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ void setName(String value);
+
+ /**
+ * Returns the value of the '<em><b>Path</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Path</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Path</em>' attribute.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInstanceBase_Path()
+ * @model transient="true" changeable="false" volatile="true" derived="true"
+ * @generated
+ */
+ String getPath();
+
+ /**
+ * Returns the value of the '<em><b>Obj Id</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Obj Id</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Obj Id</em>' attribute.
+ * @see #setObjId(int)
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInstanceBase_ObjId()
+ * @model
+ * @generated
+ */
+ int getObjId();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase#getObjId <em>Obj Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Obj Id</em>' attribute.
+ * @see #getObjId()
+ * @generated
+ */
+ void setObjId(int value);
+
+ /**
+ * Returns the value of the '<em><b>Thread Id</b></em>' attribute.
+ * The default value is <code>"-1"</code>.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Thread Id</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Thread Id</em>' attribute.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInstanceBase_ThreadId()
+ * @model default="-1" changeable="false" derived="true"
+ * @generated
+ */
+ int getThreadId();
+
+ /**
+ * Returns the value of the '<em><b>NObj IDs</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>NObj IDs</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>NObj IDs</em>' attribute.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInstanceBase_NObjIDs()
+ * @model transient="true" changeable="false" volatile="true" derived="true"
+ * @generated
+ */
+ int getNObjIDs();
+
+} // InstanceBase
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/InterfaceItemInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InterfaceItemInstance.java
index 702de8249..d3214ab75 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/InterfaceItemInstance.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/InterfaceItemInstance.java
@@ -4,9 +4,10 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.etrice.core.room.InterfaceItem;
/**
@@ -17,18 +18,18 @@ import org.eclipse.etrice.core.room.InterfaceItem;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.InterfaceItemInstance#getPeers <em>Peers</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance#getPeers <em>Peers</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getInterfaceItemInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInterfaceItemInstance()
* @model
* @generated
*/
public interface InterfaceItemInstance extends InstanceBase {
/**
* Returns the value of the '<em><b>Peers</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.etrice.generator.etricegen.InterfaceItemInstance}.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Peers</em>' reference list isn't clear,
@@ -36,7 +37,7 @@ public interface InterfaceItemInstance extends InstanceBase {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Peers</em>' reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getInterfaceItemInstance_Peers()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getInterfaceItemInstance_Peers()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/PortInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortInstance.java
index 833b3f181..78d8cf997 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/PortInstance.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortInstance.java
@@ -4,11 +4,11 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
-import org.eclipse.etrice.core.room.Port;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.room.Port;
/**
* <!-- begin-user-doc -->
@@ -18,18 +18,17 @@ import org.eclipse.emf.common.util.EList;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.PortInstance#getPort <em>Port</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.PortInstance#getKind <em>Kind</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.PortInstance#getBindings <em>Bindings</em>}</li>
+ * <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.generator.etricegen.ETriceGenPackage#getPortInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getPortInstance()
* @model
* @generated
*/
public interface PortInstance extends InterfaceItemInstance {
-
/**
* Returns the value of the '<em><b>Port</b></em>' reference.
* <!-- begin-user-doc -->
@@ -40,14 +39,14 @@ public interface PortInstance extends InterfaceItemInstance {
* <!-- end-user-doc -->
* @return the value of the '<em>Port</em>' reference.
* @see #setPort(Port)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getPortInstance_Port()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getPortInstance_Port()
* @model
* @generated
*/
Port getPort();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.PortInstance#getPort <em>Port</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.PortInstance#getPort <em>Port</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Port</em>' reference.
@@ -58,7 +57,7 @@ public interface PortInstance extends InterfaceItemInstance {
/**
* Returns the value of the '<em><b>Kind</b></em>' attribute.
- * The literals are from the enumeration {@link org.eclipse.etrice.generator.etricegen.PortKind}.
+ * The literals are from the enumeration {@link org.eclipse.etrice.core.genmodel.etricegen.PortKind}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Kind</em>' attribute isn't clear,
@@ -66,20 +65,20 @@ public interface PortInstance extends InterfaceItemInstance {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Kind</em>' attribute.
- * @see org.eclipse.etrice.generator.etricegen.PortKind
+ * @see org.eclipse.etrice.core.genmodel.etricegen.PortKind
* @see #setKind(PortKind)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getPortInstance_Kind()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getPortInstance_Kind()
* @model
* @generated
*/
PortKind getKind();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.PortInstance#getKind <em>Kind</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.PortInstance#getKind <em>Kind</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Kind</em>' attribute.
- * @see org.eclipse.etrice.generator.etricegen.PortKind
+ * @see org.eclipse.etrice.core.genmodel.etricegen.PortKind
* @see #getKind()
* @generated
*/
@@ -87,8 +86,8 @@ public interface PortInstance extends InterfaceItemInstance {
/**
* Returns the value of the '<em><b>Bindings</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.etrice.generator.etricegen.BindingInstance}.
- * It is bidirectional and its opposite is '{@link org.eclipse.etrice.generator.etricegen.BindingInstance#getPorts <em>Ports</em>}'.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.BindingInstance}.
+ * It is bidirectional and its opposite is '{@link org.eclipse.etrice.core.genmodel.etricegen.BindingInstance#getPorts <em>Ports</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Bindings</em>' reference list isn't clear,
@@ -96,10 +95,11 @@ public interface PortInstance extends InterfaceItemInstance {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Bindings</em>' reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getPortInstance_Bindings()
- * @see org.eclipse.etrice.generator.etricegen.BindingInstance#getPorts
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getPortInstance_Bindings()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.BindingInstance#getPorts
* @model opposite="ports"
* @generated
*/
EList<BindingInstance> getBindings();
+
} // PortInstance
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/PortKind.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortKind.java
index 756bbb918..b3ace8aac 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/PortKind.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortKind.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
import java.util.Arrays;
import java.util.Collections;
@@ -17,7 +17,7 @@ import org.eclipse.emf.common.util.Enumerator;
* A representation of the literals of the enumeration '<em><b>Port Kind</b></em>',
* and utility methods for working with them.
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getPortKind()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getPortKind()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/Root.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java
index 6396ce724..feacdf754 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/Root.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
import java.util.HashSet;
@@ -13,7 +13,6 @@ import org.eclipse.etrice.core.room.DataClass;
import org.eclipse.etrice.core.room.ProtocolClass;
import org.eclipse.etrice.core.room.RoomClass;
import org.eclipse.etrice.core.room.RoomModel;
-
import org.eclipse.etrice.core.room.SubSystemClass;
import org.eclipse.emf.common.util.EList;
@@ -27,34 +26,60 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.Root#isLibrary <em>Library</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.Root#getSubSystemInstances <em>Sub System Instances</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.Root#getModels <em>Models</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.Root#getXpActorClasses <em>Xp Actor Classes</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.Root#getUsedDataClasses <em>Used Data Classes</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.Root#getUsedProtocolClasses <em>Used Protocol Classes</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.Root#getUsedActorClasses <em>Used Actor Classes</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.Root#getUsedRoomModels <em>Used Room Models</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.Root#getSubSystemClasses <em>Sub System Classes</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#isLibrary <em>Library</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#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#getSubSystemClasses <em>Sub System Classes</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getRoot()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot()
* @model
* @generated
*/
public interface Root extends EObject {
/**
+ * Returns the value of the '<em><b>Library</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Library</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Library</em>' attribute.
+ * @see #setLibrary(boolean)
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_Library()
+ * @model
+ * @generated
+ */
+ boolean isLibrary();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#isLibrary <em>Library</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Library</em>' attribute.
+ * @see #isLibrary()
+ * @generated
+ */
+ void setLibrary(boolean value);
+
+ /**
* Returns the value of the '<em><b>Sub System Instances</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.etrice.generator.etricegen.SubSystemInstance}.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance}.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Sub Systems</em>' containment reference list isn't clear,
+ * If the meaning of the '<em>Sub System Instances</em>' containment reference list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Sub System Instances</em>' containment reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getRoot_SubSystemInstances()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_SubSystemInstances()
* @model containment="true"
* @generated
*/
@@ -70,7 +95,7 @@ public interface Root extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Models</em>' reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getRoot_Models()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_Models()
* @model
* @generated
*/
@@ -78,7 +103,7 @@ public interface Root extends EObject {
/**
* 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.generator.etricegen.ExpandedActorClass}.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Xp Actor Classes</em>' containment reference list isn't clear,
@@ -86,7 +111,7 @@ public interface Root extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Xp Actor Classes</em>' containment reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getRoot_XpActorClasses()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_XpActorClasses()
* @model containment="true"
* @generated
*/
@@ -102,7 +127,7 @@ public interface Root extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Used Data Classes</em>' reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getRoot_UsedDataClasses()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedDataClasses()
* @model transient="true" volatile="true" derived="true"
* @generated
*/
@@ -118,7 +143,7 @@ public interface Root extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Used Protocol Classes</em>' reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getRoot_UsedProtocolClasses()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedProtocolClasses()
* @model transient="true" volatile="true" derived="true"
* @generated
*/
@@ -134,7 +159,7 @@ public interface Root extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Used Actor Classes</em>' reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getRoot_UsedActorClasses()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedActorClasses()
* @model transient="true" volatile="true" derived="true"
* @generated
*/
@@ -150,7 +175,7 @@ public interface Root extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Used Room Models</em>' reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getRoot_UsedRoomModels()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedRoomModels()
* @model transient="true" volatile="true" derived="true"
* @generated
*/
@@ -166,39 +191,13 @@ public interface Root extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Sub System Classes</em>' reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getRoot_SubSystemClasses()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_SubSystemClasses()
* @model transient="true" volatile="true" derived="true"
* @generated
*/
EList<SubSystemClass> getSubSystemClasses();
/**
- * Returns the value of the '<em><b>Library</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Library</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Library</em>' attribute.
- * @see #setLibrary(boolean)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getRoot_Library()
- * @model
- * @generated
- */
- boolean isLibrary();
-
- /**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.Root#isLibrary <em>Library</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Library</em>' attribute.
- * @see #isLibrary()
- * @generated
- */
- void setLibrary(boolean value);
-
- /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java.bak b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java.bak
new file mode 100644
index 000000000..fe57d69e2
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java.bak
@@ -0,0 +1,223 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.etrice.core.room.ActorClass;
+import org.eclipse.etrice.core.room.DataClass;
+import org.eclipse.etrice.core.room.ProtocolClass;
+import org.eclipse.etrice.core.room.RoomClass;
+import org.eclipse.etrice.core.room.RoomModel;
+import org.eclipse.etrice.core.room.SubSystemClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Root</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.Root#isLibrary <em>Library</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#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#getSubSystemClasses <em>Sub System Classes</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot()
+ * @model
+ * @generated
+ */
+public interface Root extends EObject {
+ /**
+ * Returns the value of the '<em><b>Library</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Library</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Library</em>' attribute.
+ * @see #setLibrary(boolean)
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_Library()
+ * @model
+ * @generated
+ */
+ boolean isLibrary();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.Root#isLibrary <em>Library</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Library</em>' attribute.
+ * @see #isLibrary()
+ * @generated
+ */
+ void setLibrary(boolean value);
+
+ /**
+ * Returns the value of the '<em><b>Sub System Instances</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Sub System Instances</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Sub System Instances</em>' containment reference list.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_SubSystemInstances()
+ * @model containment="true"
+ * @generated
+ */
+ EList<SubSystemInstance> getSubSystemInstances();
+
+ /**
+ * Returns the value of the '<em><b>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>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>Models</em>' reference list.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_Models()
+ * @model
+ * @generated
+ */
+ EList<RoomModel> getModels();
+
+ /**
+ * 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 -->
+ * <p>
+ * If the meaning of the '<em>Xp Actor Classes</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Xp Actor Classes</em>' containment reference list.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_XpActorClasses()
+ * @model containment="true"
+ * @generated
+ */
+ EList<ExpandedActorClass> getXpActorClasses();
+
+ /**
+ * Returns the value of the '<em><b>Used Data Classes</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.etrice.core.room.DataClass}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Used 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()
+ * @model transient="true" volatile="true" derived="true"
+ * @generated
+ */
+ EList<DataClass> getUsedDataClasses();
+
+ /**
+ * Returns the value of the '<em><b>Used Protocol Classes</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.etrice.core.room.ProtocolClass}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Used 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()
+ * @model transient="true" volatile="true" derived="true"
+ * @generated
+ */
+ EList<ProtocolClass> getUsedProtocolClasses();
+
+ /**
+ * Returns the value of the '<em><b>Used Actor Classes</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.etrice.core.room.ActorClass}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Used 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()
+ * @model transient="true" volatile="true" derived="true"
+ * @generated
+ */
+ EList<ActorClass> getUsedActorClasses();
+
+ /**
+ * 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}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Used Room 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>Used Room Models</em>' reference list.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_UsedRoomModels()
+ * @model transient="true" volatile="true" derived="true"
+ * @generated
+ */
+ EList<RoomModel> getUsedRoomModels();
+
+ /**
+ * Returns the value of the '<em><b>Sub System Classes</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.etrice.core.room.SubSystemClass}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Sub System 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>Sub System Classes</em>' reference list.
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getRoot_SubSystemClasses()
+ * @model transient="true" volatile="true" derived="true"
+ * @generated
+ */
+ EList<SubSystemClass> getSubSystemClasses();
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ EList<RoomModel> getReferencedModels(RoomClass cls);
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ EList<ProtocolClass> getReferencedProtocolClasses(ActorClass cls);
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ ExpandedActorClass getExpandedActorClass(ActorInstance ai);
+
+} // Root
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/SAPInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SAPInstance.java
index 9879f443e..c1ccdfae1 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/SAPInstance.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SAPInstance.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.etrice.core.room.SAPRef;
@@ -16,11 +16,11 @@ import org.eclipse.etrice.core.room.SAPRef;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.SAPInstance#getSap <em>Sap</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.SAPInstance#getSap <em>Sap</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getSAPInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getSAPInstance()
* @model
* @generated
*/
@@ -35,14 +35,14 @@ public interface SAPInstance extends InterfaceItemInstance {
* <!-- end-user-doc -->
* @return the value of the '<em>Sap</em>' reference.
* @see #setSap(SAPRef)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getSAPInstance_Sap()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getSAPInstance_Sap()
* @model
* @generated
*/
SAPRef getSap();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.SAPInstance#getSap <em>Sap</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.SAPInstance#getSap <em>Sap</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Sap</em>' reference.
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/SPPInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SPPInstance.java
index 52a0f94a8..5656a186f 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/SPPInstance.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SPPInstance.java
@@ -4,11 +4,12 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
-import org.eclipse.etrice.core.room.SPPRef;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.room.SPPRef;
+
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>SPP Instance</b></em>'.
@@ -17,13 +18,13 @@ import org.eclipse.emf.common.util.EList;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.SPPInstance#getSpp <em>Spp</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.SPPInstance#getIncoming <em>Incoming</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.SPPInstance#getOutgoing <em>Outgoing</em>}</li>
+ * <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.generator.etricegen.ETriceGenPackage#getSPPInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getSPPInstance()
* @model
* @generated
*/
@@ -38,14 +39,14 @@ public interface SPPInstance extends InstanceBase {
* <!-- end-user-doc -->
* @return the value of the '<em>Spp</em>' reference.
* @see #setSpp(SPPRef)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getSPPInstance_Spp()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getSPPInstance_Spp()
* @model
* @generated
*/
SPPRef getSpp();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.SPPInstance#getSpp <em>Spp</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getSpp <em>Spp</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Spp</em>' reference.
@@ -56,17 +57,17 @@ public interface SPPInstance extends InstanceBase {
/**
* Returns the value of the '<em><b>Incoming</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.etrice.generator.etricegen.ConnectionInstance}.
- * It is bidirectional and its opposite is '{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance#getToSPP <em>To SPP</em>}'.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance}.
+ * It is bidirectional and its opposite is '{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getToSPP <em>To SPP</em>}'.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Incoming</em>' reference isn't clear,
+ * If the meaning of the '<em>Incoming</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>Incoming</em>' reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getSPPInstance_Incoming()
- * @see org.eclipse.etrice.generator.etricegen.ConnectionInstance#getToSPP
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getSPPInstance_Incoming()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getToSPP
* @model opposite="toSPP"
* @generated
*/
@@ -74,7 +75,7 @@ public interface SPPInstance extends InstanceBase {
/**
* Returns the value of the '<em><b>Outgoing</b></em>' reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance#getFromSPP <em>From SPP</em>}'.
+ * It is bidirectional and its opposite is '{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getFromSPP <em>From SPP</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Outgoing</em>' reference isn't clear,
@@ -83,15 +84,15 @@ public interface SPPInstance extends InstanceBase {
* <!-- end-user-doc -->
* @return the value of the '<em>Outgoing</em>' reference.
* @see #setOutgoing(ConnectionInstance)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getSPPInstance_Outgoing()
- * @see org.eclipse.etrice.generator.etricegen.ConnectionInstance#getFromSPP
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getSPPInstance_Outgoing()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance#getFromSPP
* @model opposite="fromSPP"
* @generated
*/
ConnectionInstance getOutgoing();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.SPPInstance#getOutgoing <em>Outgoing</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getOutgoing <em>Outgoing</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Outgoing</em>' reference.
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ServiceImplInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ServiceImplInstance.java
index c40e60208..4a240061f 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/ServiceImplInstance.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ServiceImplInstance.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.etrice.core.room.ServiceImplementation;
@@ -16,11 +16,11 @@ import org.eclipse.etrice.core.room.ServiceImplementation;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.ServiceImplInstance#getSvcImpl <em>Svc Impl</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance#getSvcImpl <em>Svc Impl</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getServiceImplInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getServiceImplInstance()
* @model
* @generated
*/
@@ -35,14 +35,14 @@ public interface ServiceImplInstance extends InterfaceItemInstance {
* <!-- end-user-doc -->
* @return the value of the '<em>Svc Impl</em>' reference.
* @see #setSvcImpl(ServiceImplementation)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getServiceImplInstance_SvcImpl()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getServiceImplInstance_SvcImpl()
* @model
* @generated
*/
ServiceImplementation getSvcImpl();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.ServiceImplInstance#getSvcImpl <em>Svc Impl</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance#getSvcImpl <em>Svc Impl</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Svc Impl</em>' reference.
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/StructureInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/StructureInstance.java
index f1885427c..0b9f3b3e1 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/StructureInstance.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/StructureInstance.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.emf.common.util.EList;
@@ -16,26 +16,26 @@ import org.eclipse.emf.common.util.EList;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getInstances <em>Instances</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getPorts <em>Ports</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getSaps <em>Saps</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getSpps <em>Spps</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getServices <em>Services</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getBindings <em>Bindings</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getConnections <em>Connections</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getAllContainedInstances <em>All Contained Instances</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.StructureInstance#getOrderedIfItemInstances <em>Ordered If Item Instances</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getInstances <em>Instances</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getPorts <em>Ports</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getSaps <em>Saps</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getSpps <em>Spps</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getServices <em>Services</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getBindings <em>Bindings</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance#getConnections <em>Connections</em>}</li>
+ * <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.generator.etricegen.ETriceGenPackage#getStructureInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getStructureInstance()
* @model
* @generated
*/
public interface StructureInstance extends InstanceBase {
/**
* Returns the value of the '<em><b>Instances</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.etrice.generator.etricegen.ActorInstance}.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.ActorInstance}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Instances</em>' containment reference list isn't clear,
@@ -43,7 +43,7 @@ public interface StructureInstance extends InstanceBase {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Instances</em>' containment reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getStructureInstance_Instances()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getStructureInstance_Instances()
* @model containment="true"
* @generated
*/
@@ -51,7 +51,7 @@ public interface StructureInstance extends InstanceBase {
/**
* Returns the value of the '<em><b>Ports</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.etrice.generator.etricegen.PortInstance}.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.PortInstance}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Ports</em>' containment reference list isn't clear,
@@ -59,7 +59,7 @@ public interface StructureInstance extends InstanceBase {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Ports</em>' containment reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getStructureInstance_Ports()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getStructureInstance_Ports()
* @model containment="true"
* @generated
*/
@@ -67,7 +67,7 @@ public interface StructureInstance extends InstanceBase {
/**
* Returns the value of the '<em><b>Saps</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.etrice.generator.etricegen.SAPInstance}.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.SAPInstance}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Saps</em>' containment reference list isn't clear,
@@ -75,7 +75,7 @@ public interface StructureInstance extends InstanceBase {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Saps</em>' containment reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getStructureInstance_Saps()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getStructureInstance_Saps()
* @model containment="true"
* @generated
*/
@@ -83,15 +83,15 @@ public interface StructureInstance extends InstanceBase {
/**
* Returns the value of the '<em><b>Spps</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.etrice.generator.etricegen.SPPInstance}.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance}.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Spps</em>' reference list isn't clear,
+ * If the meaning of the '<em>Spps</em>' containment reference list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Spps</em>' containment reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getStructureInstance_Spps()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getStructureInstance_Spps()
* @model containment="true"
* @generated
*/
@@ -99,7 +99,7 @@ public interface StructureInstance extends InstanceBase {
/**
* Returns the value of the '<em><b>Services</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.etrice.generator.etricegen.ServiceImplInstance}.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Services</em>' containment reference list isn't clear,
@@ -107,7 +107,7 @@ public interface StructureInstance extends InstanceBase {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Services</em>' containment reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getStructureInstance_Services()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getStructureInstance_Services()
* @model containment="true"
* @generated
*/
@@ -115,7 +115,7 @@ public interface StructureInstance extends InstanceBase {
/**
* Returns the value of the '<em><b>Bindings</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.etrice.generator.etricegen.BindingInstance}.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.BindingInstance}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Bindings</em>' containment reference list isn't clear,
@@ -123,7 +123,7 @@ public interface StructureInstance extends InstanceBase {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Bindings</em>' containment reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getStructureInstance_Bindings()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getStructureInstance_Bindings()
* @model containment="true"
* @generated
*/
@@ -131,7 +131,7 @@ public interface StructureInstance extends InstanceBase {
/**
* Returns the value of the '<em><b>Connections</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.etrice.generator.etricegen.ConnectionInstance}.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Connections</em>' containment reference list isn't clear,
@@ -139,7 +139,7 @@ public interface StructureInstance extends InstanceBase {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Connections</em>' containment reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getStructureInstance_Connections()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getStructureInstance_Connections()
* @model containment="true"
* @generated
*/
@@ -147,7 +147,7 @@ public interface StructureInstance extends InstanceBase {
/**
* Returns the value of the '<em><b>All Contained Instances</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.etrice.generator.etricegen.ActorInstance}.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.ActorInstance}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>All Contained Instances</em>' reference list isn't clear,
@@ -155,7 +155,7 @@ public interface StructureInstance extends InstanceBase {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>All Contained Instances</em>' reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getStructureInstance_AllContainedInstances()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getStructureInstance_AllContainedInstances()
* @model transient="true" volatile="true" derived="true"
* @generated
*/
@@ -163,7 +163,7 @@ public interface StructureInstance extends InstanceBase {
/**
* Returns the value of the '<em><b>Ordered If Item Instances</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.etrice.generator.etricegen.InterfaceItemInstance}.
+ * The list contents are of type {@link org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Ordered If Item Instances</em>' reference list isn't clear,
@@ -171,7 +171,7 @@ public interface StructureInstance extends InstanceBase {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Ordered If Item Instances</em>' reference list.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getStructureInstance_OrderedIfItemInstances()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getStructureInstance_OrderedIfItemInstances()
* @model transient="true" changeable="false" derived="true"
* @generated
*/
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/SubSystemInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SubSystemInstance.java
index 39ade5350..c0c3197cc 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/SubSystemInstance.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/SubSystemInstance.java
@@ -4,24 +4,24 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.etrice.core.room.SubSystemClass;
/**
* <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Component Instance</b></em>'.
+ * A representation of the model object '<em><b>Sub System Instance</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.SubSystemInstance#getSubSystemClass <em>Sub System Class</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.SubSystemInstance#getMaxObjId <em>Max Obj Id</em>}</li>
+ * <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.generator.etricegen.ETriceGenPackage#getSubSystemInstance()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getSubSystemInstance()
* @model
* @generated
*/
@@ -30,20 +30,20 @@ public interface SubSystemInstance extends StructureInstance {
* Returns the value of the '<em><b>Sub System Class</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Component Class</em>' reference isn't clear,
+ * If the meaning of the '<em>Sub System Class</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Sub System Class</em>' reference.
* @see #setSubSystemClass(SubSystemClass)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getSubSystemInstance_SubSystemClass()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getSubSystemInstance_SubSystemClass()
* @model
* @generated
*/
SubSystemClass getSubSystemClass();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.SubSystemInstance#getSubSystemClass <em>Sub System Class</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance#getSubSystemClass <em>Sub System Class</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Sub System Class</em>' reference.
@@ -61,7 +61,7 @@ public interface SubSystemInstance extends StructureInstance {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Max Obj Id</em>' attribute.
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getSubSystemInstance_MaxObjId()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getSubSystemInstance_MaxObjId()
* @model transient="true" changeable="false" volatile="true" derived="true"
* @generated
*/
@@ -75,4 +75,4 @@ public interface SubSystemInstance extends StructureInstance {
*/
int getThreadId(InstanceBase instance);
-} // ComponentInstance
+} // SubSystemInstance
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/TransitionChain.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/TransitionChain.java
index c0e6cd670..b58096349 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/TransitionChain.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/TransitionChain.java
@@ -4,13 +4,13 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen;
+package org.eclipse.etrice.core.genmodel.etricegen;
+
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.etrice.core.room.State;
import org.eclipse.etrice.core.room.Transition;
-import org.eclipse.emf.ecore.EObject;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Transition Chain</b></em>'.
@@ -19,12 +19,12 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.TransitionChain#getTransition <em>Transition</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.TransitionChain#isSkipEntry <em>Skip Entry</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.TransitionChain#getTransition <em>Transition</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.TransitionChain#isSkipEntry <em>Skip Entry</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getTransitionChain()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getTransitionChain()
* @model
* @generated
*/
@@ -39,14 +39,14 @@ public interface TransitionChain extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Transition</em>' reference.
* @see #setTransition(Transition)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getTransitionChain_Transition()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getTransitionChain_Transition()
* @model
* @generated
*/
Transition getTransition();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.TransitionChain#getTransition <em>Transition</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.TransitionChain#getTransition <em>Transition</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Transition</em>' reference.
@@ -66,14 +66,14 @@ public interface TransitionChain extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Skip Entry</em>' attribute.
* @see #setSkipEntry(boolean)
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#getTransitionChain_SkipEntry()
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#getTransitionChain_SkipEntry()
* @model default="false"
* @generated
*/
boolean isSkipEntry();
/**
- * Sets the value of the '{@link org.eclipse.etrice.generator.etricegen.TransitionChain#isSkipEntry <em>Skip Entry</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.etrice.core.genmodel.etricegen.TransitionChain#isSkipEntry <em>Skip Entry</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Skip Entry</em>' attribute.
@@ -101,7 +101,7 @@ public interface TransitionChain extends EObject {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @model tcvType="org.eclipse.etrice.generator.etricegen.ITransitionChainVisitor"
+ * @model tcvType="org.eclipse.etrice.core.genmodel.etricegen.ITransitionChainVisitor"
* @generated
*/
String genExecuteChain(ITransitionChainVisitor tcv);
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ActiveTriggerImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActiveTriggerImpl.java
index 554ff64f4..d83e38944 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ActiveTriggerImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActiveTriggerImpl.java
@@ -4,14 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
-
-
-import org.eclipse.etrice.core.room.InterfaceItem;
-import org.eclipse.etrice.core.room.Message;
-import org.eclipse.etrice.core.room.TriggeredTransition;
-import org.eclipse.etrice.generator.etricegen.ActiveTrigger;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
import java.util.Collection;
@@ -20,13 +13,20 @@ import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+
+import org.eclipse.etrice.core.room.InterfaceItem;
+import org.eclipse.etrice.core.room.Message;
+import org.eclipse.etrice.core.room.TriggeredTransition;
+
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Active Trigger</b></em>'.
@@ -34,10 +34,10 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.ActiveTriggerImpl#getMsg <em>Msg</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.ActiveTriggerImpl#getIfitem <em>Ifitem</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.ActiveTriggerImpl#getTrigger <em>Trigger</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.ActiveTriggerImpl#getTransitions <em>Transitions</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActiveTriggerImpl#getMsg <em>Msg</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActiveTriggerImpl#getIfitem <em>Ifitem</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActiveTriggerImpl#getTrigger <em>Trigger</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ActiveTriggerImpl#getTransitions <em>Transitions</em>}</li>
* </ul>
* </p>
*
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ActorInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java
index 26a60123d..83b2620ca 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ActorInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java
@@ -4,15 +4,19 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+
import org.eclipse.etrice.core.room.ActorClass;
-import org.eclipse.etrice.generator.etricegen.ActorInstance;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
/**
* <!-- begin-user-doc -->
@@ -21,9 +25,9 @@ import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.ActorInstanceImpl#getActorClass <em>Actor Class</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.ActorInstanceImpl#getReplIdx <em>Repl Idx</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.ActorInstanceImpl#getUnindexedName <em>Unindexed Name</em>}</li>
+ * <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>
*
@@ -49,6 +53,7 @@ public class ActorInstanceImpl extends StructureInstanceImpl implements ActorIns
* @ordered
*/
protected static final int REPL_IDX_EDEFAULT = -1;
+
/**
* The cached value of the '{@link #getReplIdx() <em>Repl Idx</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java.bak b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java.bak
new file mode 100644
index 000000000..2f7dfaf41
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java.bak
@@ -0,0 +1,255 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+
+import org.eclipse.etrice.core.room.ActorClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Actor Instance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <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
+ */
+public class ActorInstanceImpl extends StructureInstanceImpl implements ActorInstance {
+ /**
+ * The cached value of the '{@link #getActorClass() <em>Actor Class</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getActorClass()
+ * @generated
+ * @ordered
+ */
+ protected ActorClass actorClass;
+
+ /**
+ * The default value of the '{@link #getReplIdx() <em>Repl Idx</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getReplIdx()
+ * @generated
+ * @ordered
+ */
+ protected static final int REPL_IDX_EDEFAULT = -1;
+
+ /**
+ * The cached value of the '{@link #getReplIdx() <em>Repl Idx</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getReplIdx()
+ * @generated
+ * @ordered
+ */
+ protected int replIdx = REPL_IDX_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getUnindexedName() <em>Unindexed Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getUnindexedName()
+ * @generated
+ * @ordered
+ */
+ protected static final String UNINDEXED_NAME_EDEFAULT = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ActorInstanceImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ETriceGenPackage.Literals.ACTOR_INSTANCE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ActorClass getActorClass() {
+ if (actorClass != null && actorClass.eIsProxy()) {
+ InternalEObject oldActorClass = (InternalEObject)actorClass;
+ actorClass = (ActorClass)eResolveProxy(oldActorClass);
+ if (actorClass != oldActorClass) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, ETriceGenPackage.ACTOR_INSTANCE__ACTOR_CLASS, oldActorClass, actorClass));
+ }
+ }
+ return actorClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ActorClass basicGetActorClass() {
+ return actorClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setActorClass(ActorClass newActorClass) {
+ ActorClass oldActorClass = actorClass;
+ actorClass = newActorClass;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.ACTOR_INSTANCE__ACTOR_CLASS, oldActorClass, actorClass));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public int getReplIdx() {
+ return replIdx;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setReplIdx(int newReplIdx) {
+ int oldReplIdx = replIdx;
+ replIdx = newReplIdx;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.ACTOR_INSTANCE__REPL_IDX, oldReplIdx, replIdx));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getUnindexedName() {
+ // TODO: implement this method to return the 'Unindexed Name' attribute
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ETriceGenPackage.ACTOR_INSTANCE__ACTOR_CLASS:
+ if (resolve) return getActorClass();
+ return basicGetActorClass();
+ case ETriceGenPackage.ACTOR_INSTANCE__REPL_IDX:
+ return getReplIdx();
+ case ETriceGenPackage.ACTOR_INSTANCE__UNINDEXED_NAME:
+ return getUnindexedName();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ETriceGenPackage.ACTOR_INSTANCE__ACTOR_CLASS:
+ setActorClass((ActorClass)newValue);
+ return;
+ case ETriceGenPackage.ACTOR_INSTANCE__REPL_IDX:
+ setReplIdx((Integer)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.ACTOR_INSTANCE__ACTOR_CLASS:
+ setActorClass((ActorClass)null);
+ return;
+ case ETriceGenPackage.ACTOR_INSTANCE__REPL_IDX:
+ setReplIdx(REPL_IDX_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.ACTOR_INSTANCE__ACTOR_CLASS:
+ return actorClass != null;
+ case ETriceGenPackage.ACTOR_INSTANCE__REPL_IDX:
+ return replIdx != REPL_IDX_EDEFAULT;
+ case ETriceGenPackage.ACTOR_INSTANCE__UNINDEXED_NAME:
+ return UNINDEXED_NAME_EDEFAULT == null ? getUnindexedName() != null : !UNINDEXED_NAME_EDEFAULT.equals(getUnindexedName());
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (replIdx: ");
+ result.append(replIdx);
+ result.append(')');
+ return result.toString();
+ }
+
+} //ActorInstanceImpl
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/BindingInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/BindingInstanceImpl.java
index dcafafc88..ef6463b4c 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/BindingInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/BindingInstanceImpl.java
@@ -4,8 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
-
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
import java.util.Collection;
@@ -20,9 +19,10 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.etrice.generator.etricegen.BindingInstance;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.PortInstance;
+
+import org.eclipse.etrice.core.genmodel.etricegen.BindingInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
/**
* <!-- begin-user-doc -->
@@ -31,7 +31,7 @@ import org.eclipse.etrice.generator.etricegen.PortInstance;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.BindingInstanceImpl#getPorts <em>Ports</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.BindingInstanceImpl#getPorts <em>Ports</em>}</li>
* </ul>
* </p>
*
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ConnectionInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ConnectionInstanceImpl.java
index f67d05153..dd75a7685 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ConnectionInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ConnectionInstanceImpl.java
@@ -4,14 +4,8 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
-
-import org.eclipse.etrice.core.room.LayerConnection;
-import org.eclipse.etrice.generator.etricegen.ActorInstance;
-import org.eclipse.etrice.generator.etricegen.ConnectionInstance;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.SPPInstance;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -21,6 +15,13 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.SPPInstance;
+
+import org.eclipse.etrice.core.room.LayerConnection;
+
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Connection Instance</b></em>'.
@@ -28,10 +29,10 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.ConnectionInstanceImpl#getFromAI <em>From AI</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.ConnectionInstanceImpl#getFromSPP <em>From SPP</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.ConnectionInstanceImpl#getToSPP <em>To SPP</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.ConnectionInstanceImpl#getConnection <em>Connection</em>}</li>
+ * <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>
*
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ETriceGenFactoryImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenFactoryImpl.java
index 498d0a10d..59192983e 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ETriceGenFactoryImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenFactoryImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
@@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.etrice.generator.etricegen.*;
+import org.eclipse.etrice.core.genmodel.etricegen.*;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ETriceGenPackageImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenPackageImpl.java
index 2bed82ccc..f52474070 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ETriceGenPackageImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenPackageImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -15,26 +15,26 @@ import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.etrice.core.room.RoomPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger;
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.BindingInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenFactory;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.InstanceBase;
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortKind;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.SAPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.SPPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.StructureInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
-import org.eclipse.etrice.generator.etricegen.ActiveTrigger;
-import org.eclipse.etrice.generator.etricegen.ActorInstance;
-import org.eclipse.etrice.generator.etricegen.BindingInstance;
-import org.eclipse.etrice.generator.etricegen.ConnectionInstance;
-import org.eclipse.etrice.generator.etricegen.ETriceGenFactory;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.InstanceBase;
-import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance;
-import org.eclipse.etrice.generator.etricegen.PortInstance;
-import org.eclipse.etrice.generator.etricegen.PortKind;
-import org.eclipse.etrice.generator.etricegen.Root;
-import org.eclipse.etrice.generator.etricegen.SAPInstance;
-import org.eclipse.etrice.generator.etricegen.SPPInstance;
-import org.eclipse.etrice.generator.etricegen.ServiceImplInstance;
-import org.eclipse.etrice.generator.etricegen.StructureInstance;
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance;
-import org.eclipse.etrice.generator.etricegen.TransitionChain;
+import org.eclipse.etrice.core.room.RoomPackage;
/**
* <!-- begin-user-doc -->
@@ -180,7 +180,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage#eNS_URI
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage#eNS_URI
* @see #init()
* @generated
*/
@@ -247,8 +247,8 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
* <!-- end-user-doc -->
* @generated
*/
- public EReference getRoot_Models() {
- return (EReference)rootEClass.getEStructuralFeatures().get(2);
+ public EAttribute getRoot_Library() {
+ return (EAttribute)rootEClass.getEStructuralFeatures().get(0);
}
/**
@@ -256,8 +256,8 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
* <!-- end-user-doc -->
* @generated
*/
- public EReference getRoot_XpActorClasses() {
- return (EReference)rootEClass.getEStructuralFeatures().get(3);
+ public EReference getRoot_SubSystemInstances() {
+ return (EReference)rootEClass.getEStructuralFeatures().get(1);
}
/**
@@ -265,8 +265,8 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
* <!-- end-user-doc -->
* @generated
*/
- public EReference getRoot_UsedDataClasses() {
- return (EReference)rootEClass.getEStructuralFeatures().get(4);
+ public EReference getRoot_Models() {
+ return (EReference)rootEClass.getEStructuralFeatures().get(2);
}
/**
@@ -274,8 +274,8 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
* <!-- end-user-doc -->
* @generated
*/
- public EReference getRoot_UsedProtocolClasses() {
- return (EReference)rootEClass.getEStructuralFeatures().get(5);
+ public EReference getRoot_XpActorClasses() {
+ return (EReference)rootEClass.getEStructuralFeatures().get(3);
}
/**
@@ -283,8 +283,8 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
* <!-- end-user-doc -->
* @generated
*/
- public EReference getRoot_UsedActorClasses() {
- return (EReference)rootEClass.getEStructuralFeatures().get(6);
+ public EReference getRoot_UsedDataClasses() {
+ return (EReference)rootEClass.getEStructuralFeatures().get(4);
}
/**
@@ -292,8 +292,8 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
* <!-- end-user-doc -->
* @generated
*/
- public EReference getRoot_UsedRoomModels() {
- return (EReference)rootEClass.getEStructuralFeatures().get(7);
+ public EReference getRoot_UsedProtocolClasses() {
+ return (EReference)rootEClass.getEStructuralFeatures().get(5);
}
/**
@@ -301,8 +301,8 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
* <!-- end-user-doc -->
* @generated
*/
- public EReference getRoot_SubSystemClasses() {
- return (EReference)rootEClass.getEStructuralFeatures().get(8);
+ public EReference getRoot_UsedActorClasses() {
+ return (EReference)rootEClass.getEStructuralFeatures().get(6);
}
/**
@@ -310,8 +310,8 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getRoot_Library() {
- return (EAttribute)rootEClass.getEStructuralFeatures().get(0);
+ public EReference getRoot_UsedRoomModels() {
+ return (EReference)rootEClass.getEStructuralFeatures().get(7);
}
/**
@@ -319,8 +319,8 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
* <!-- end-user-doc -->
* @generated
*/
- public EReference getRoot_SubSystemInstances() {
- return (EReference)rootEClass.getEStructuralFeatures().get(1);
+ public EReference getRoot_SubSystemClasses() {
+ return (EReference)rootEClass.getEStructuralFeatures().get(8);
}
/**
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ExpandedActorClassImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java
index d3293d097..ea0bfed84 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ExpandedActorClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
import java.util.Collection;
import java.util.Collections;
@@ -24,31 +24,28 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.etrice.core.room.ActorClass;
-import org.eclipse.etrice.core.room.ContinuationTransition;
-import org.eclipse.etrice.core.room.DetailCode;
-import org.eclipse.etrice.core.room.InterfaceItem;
-import org.eclipse.etrice.core.room.MessageFromIf;
-import org.eclipse.etrice.core.room.State;
-import org.eclipse.etrice.core.room.StateGraphItem;
-import org.eclipse.etrice.core.room.StateGraphNode;
-import org.eclipse.etrice.core.room.Transition;
-import org.eclipse.etrice.core.room.TransitionTerminal;
-import org.eclipse.etrice.core.room.Trigger;
-import org.eclipse.etrice.core.room.impl.ActorClassImpl;
-import org.eclipse.etrice.core.room.util.RoomHelpers;
import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
+import org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenFactory;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician;
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
import org.eclipse.etrice.core.naming.RoomNameProvider;
-
+import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.ActorCommunicationType;
import org.eclipse.etrice.core.room.ChoicePoint;
import org.eclipse.etrice.core.room.ChoicepointTerminal;
+import org.eclipse.etrice.core.room.ContinuationTransition;
+import org.eclipse.etrice.core.room.DetailCode;
import org.eclipse.etrice.core.room.EntryPoint;
import org.eclipse.etrice.core.room.ExitPoint;
import org.eclipse.etrice.core.room.ExternalPort;
import org.eclipse.etrice.core.room.GuardedTransition;
import org.eclipse.etrice.core.room.InitialTransition;
+import org.eclipse.etrice.core.room.InterfaceItem;
import org.eclipse.etrice.core.room.Message;
+import org.eclipse.etrice.core.room.MessageFromIf;
import org.eclipse.etrice.core.room.NonInitialTransition;
import org.eclipse.etrice.core.room.Port;
import org.eclipse.etrice.core.room.RefinedState;
@@ -57,20 +54,22 @@ import org.eclipse.etrice.core.room.RoomPackage;
import org.eclipse.etrice.core.room.SAPRef;
import org.eclipse.etrice.core.room.SPPRef;
import org.eclipse.etrice.core.room.ServiceImplementation;
+import org.eclipse.etrice.core.room.State;
import org.eclipse.etrice.core.room.StateGraph;
+import org.eclipse.etrice.core.room.StateGraphItem;
+import org.eclipse.etrice.core.room.StateGraphNode;
import org.eclipse.etrice.core.room.StateTerminal;
import org.eclipse.etrice.core.room.SubStateTrPointTerminal;
import org.eclipse.etrice.core.room.TrPoint;
import org.eclipse.etrice.core.room.TrPointTerminal;
+import org.eclipse.etrice.core.room.Transition;
import org.eclipse.etrice.core.room.TransitionPoint;
+import org.eclipse.etrice.core.room.TransitionTerminal;
+import org.eclipse.etrice.core.room.Trigger;
import org.eclipse.etrice.core.room.TriggeredTransition;
import org.eclipse.etrice.core.room.VarDecl;
-import org.eclipse.etrice.generator.etricegen.ActiveTrigger;
-import org.eclipse.etrice.generator.etricegen.ETriceGenFactory;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.IDiagnostician;
-import org.eclipse.etrice.generator.etricegen.TransitionChain;
+import org.eclipse.etrice.core.room.impl.ActorClassImpl;
+import org.eclipse.etrice.core.room.util.RoomHelpers;
/**
* <!-- begin-user-doc -->
@@ -79,7 +78,7 @@ import org.eclipse.etrice.generator.etricegen.TransitionChain;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.ExpandedActorClassImpl#getActorClass <em>Actor Class</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ExpandedActorClassImpl#getActorClass <em>Actor Class</em>}</li>
* </ul>
* </p>
*
@@ -893,7 +892,7 @@ public class ExpandedActorClassImpl extends ActorClassImpl implements ExpandedAc
}
return offset;
}
-
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java.bak b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java.bak
new file mode 100644
index 000000000..9277af8d4
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java.bak
@@ -0,0 +1,409 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician;
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
+
+import org.eclipse.etrice.core.room.ActorClass;
+import org.eclipse.etrice.core.room.ContinuationTransition;
+import org.eclipse.etrice.core.room.DetailCode;
+import org.eclipse.etrice.core.room.InterfaceItem;
+import org.eclipse.etrice.core.room.MessageFromIf;
+import org.eclipse.etrice.core.room.State;
+import org.eclipse.etrice.core.room.StateGraphItem;
+import org.eclipse.etrice.core.room.StateGraphNode;
+import org.eclipse.etrice.core.room.Transition;
+import org.eclipse.etrice.core.room.TransitionTerminal;
+import org.eclipse.etrice.core.room.Trigger;
+
+import org.eclipse.etrice.core.room.impl.ActorClassImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Expanded Actor Class</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ExpandedActorClassImpl#getActorClass <em>Actor Class</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ExpandedActorClassImpl extends ActorClassImpl implements ExpandedActorClass {
+ /**
+ * The cached value of the '{@link #getActorClass() <em>Actor Class</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getActorClass()
+ * @generated
+ * @ordered
+ */
+ protected ActorClass actorClass;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ExpandedActorClassImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ETriceGenPackage.Literals.EXPANDED_ACTOR_CLASS;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ActorClass getActorClass() {
+ if (actorClass != null && actorClass.eIsProxy()) {
+ InternalEObject oldActorClass = (InternalEObject)actorClass;
+ actorClass = (ActorClass)eResolveProxy(oldActorClass);
+ if (actorClass != oldActorClass) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, ETriceGenPackage.EXPANDED_ACTOR_CLASS__ACTOR_CLASS, oldActorClass, actorClass));
+ }
+ }
+ return actorClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ActorClass basicGetActorClass() {
+ return actorClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setActorClass(ActorClass newActorClass) {
+ ActorClass oldActorClass = actorClass;
+ actorClass = newActorClass;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.EXPANDED_ACTOR_CLASS__ACTOR_CLASS, oldActorClass, actorClass));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void prepare(IDiagnostician validator) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void release() {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void addOwnObject(StateGraphItem obj) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public boolean isOwnObject(StateGraphItem obj) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public int getInterfaceItemLocalId(InterfaceItem ifitem) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public boolean hasStateMachine() {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getCode(DetailCode code) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getTriggerCodeName(MessageFromIf mif) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getTriggerCodeName(String mif) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<Transition> getOutgoingTransitions(StateGraphNode node) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<Transition> getIncomingTransitions(StateGraphNode node) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<ActiveTrigger> getActiveTriggers(State state) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<MessageFromIf> getTriggers() {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<MessageFromIf> getOwnTriggers() {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getMessageID(MessageFromIf mif) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public TransitionChain getChain(Transition trans) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<TransitionChain> getTransitionChains() {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<TransitionChain> getOwnTransitionChains() {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public StateGraphNode getNode(TransitionTerminal tt) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public boolean isMatching(Trigger trig, String trigstr) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ContinuationTransition getDefaultBranch(EList<Transition> out) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ETriceGenPackage.EXPANDED_ACTOR_CLASS__ACTOR_CLASS:
+ if (resolve) return getActorClass();
+ return basicGetActorClass();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ETriceGenPackage.EXPANDED_ACTOR_CLASS__ACTOR_CLASS:
+ setActorClass((ActorClass)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.EXPANDED_ACTOR_CLASS__ACTOR_CLASS:
+ setActorClass((ActorClass)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.EXPANDED_ACTOR_CLASS__ACTOR_CLASS:
+ return actorClass != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+} //ExpandedActorClassImpl
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/InstanceBaseImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java
index 60c6e4319..d77aa496e 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/InstanceBaseImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java
@@ -4,8 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
-
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
import org.eclipse.emf.common.notify.Notification;
@@ -14,9 +13,10 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.InstanceBase;
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.InstanceBase;
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
/**
* <!-- begin-user-doc -->
@@ -25,11 +25,11 @@ import org.eclipse.etrice.generator.etricegen.SubSystemInstance;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.InstanceBaseImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.InstanceBaseImpl#getPath <em>Path</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.InstanceBaseImpl#getObjId <em>Obj Id</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.InstanceBaseImpl#getThreadId <em>Thread Id</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.InstanceBaseImpl#getNObjIDs <em>NObj IDs</em>}</li>
+ * <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>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl#getObjId <em>Obj Id</em>}</li>
+ * <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>
*
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java.bak b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java.bak
new file mode 100644
index 000000000..d11fc095b
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java.bak
@@ -0,0 +1,309 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.InstanceBase;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Instance Base</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <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>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InstanceBaseImpl#getObjId <em>Obj Id</em>}</li>
+ * <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
+ */
+public abstract class InstanceBaseImpl extends EObjectImpl implements InstanceBase {
+ /**
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getPath() <em>Path</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getPath()
+ * @generated
+ * @ordered
+ */
+ protected static final String PATH_EDEFAULT = null;
+
+ /**
+ * The default value of the '{@link #getObjId() <em>Obj Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getObjId()
+ * @generated
+ * @ordered
+ */
+ protected static final int OBJ_ID_EDEFAULT = 0;
+
+ /**
+ * The cached value of the '{@link #getObjId() <em>Obj Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getObjId()
+ * @generated
+ * @ordered
+ */
+ protected int objId = OBJ_ID_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getThreadId() <em>Thread Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getThreadId()
+ * @generated
+ * @ordered
+ */
+ protected static final int THREAD_ID_EDEFAULT = -1;
+
+ /**
+ * The cached value of the '{@link #getThreadId() <em>Thread Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getThreadId()
+ * @generated
+ * @ordered
+ */
+ protected int threadId = THREAD_ID_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getNObjIDs() <em>NObj IDs</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getNObjIDs()
+ * @generated
+ * @ordered
+ */
+ protected static final int NOBJ_IDS_EDEFAULT = 0;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected InstanceBaseImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ETriceGenPackage.Literals.INSTANCE_BASE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setName(String newName) {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.INSTANCE_BASE__NAME, oldName, name));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getPath() {
+ // TODO: implement this method to return the 'Path' attribute
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public int getObjId() {
+ return objId;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setObjId(int newObjId) {
+ int oldObjId = objId;
+ objId = newObjId;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.INSTANCE_BASE__OBJ_ID, oldObjId, objId));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public int getThreadId() {
+ return threadId;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public int getNObjIDs() {
+ // TODO: implement this method to return the 'NObj IDs' attribute
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ETriceGenPackage.INSTANCE_BASE__NAME:
+ return getName();
+ case ETriceGenPackage.INSTANCE_BASE__PATH:
+ return getPath();
+ case ETriceGenPackage.INSTANCE_BASE__OBJ_ID:
+ return getObjId();
+ case ETriceGenPackage.INSTANCE_BASE__THREAD_ID:
+ return getThreadId();
+ case ETriceGenPackage.INSTANCE_BASE__NOBJ_IDS:
+ return getNObjIDs();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ETriceGenPackage.INSTANCE_BASE__NAME:
+ setName((String)newValue);
+ return;
+ case ETriceGenPackage.INSTANCE_BASE__OBJ_ID:
+ setObjId((Integer)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.INSTANCE_BASE__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case ETriceGenPackage.INSTANCE_BASE__OBJ_ID:
+ setObjId(OBJ_ID_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.INSTANCE_BASE__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case ETriceGenPackage.INSTANCE_BASE__PATH:
+ return PATH_EDEFAULT == null ? getPath() != null : !PATH_EDEFAULT.equals(getPath());
+ case ETriceGenPackage.INSTANCE_BASE__OBJ_ID:
+ return objId != OBJ_ID_EDEFAULT;
+ case ETriceGenPackage.INSTANCE_BASE__THREAD_ID:
+ return threadId != THREAD_ID_EDEFAULT;
+ case ETriceGenPackage.INSTANCE_BASE__NOBJ_IDS:
+ return getNObjIDs() != NOBJ_IDS_EDEFAULT;
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (name: ");
+ result.append(name);
+ result.append(", objId: ");
+ result.append(objId);
+ result.append(", threadId: ");
+ result.append(threadId);
+ result.append(')');
+ return result.toString();
+ }
+
+} //InstanceBaseImpl
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/InterfaceItemInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java
index 31164099a..9daa1521e 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/InterfaceItemInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java
@@ -4,8 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
-
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
import java.util.Collection;
@@ -14,13 +13,14 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortKind;
+import org.eclipse.etrice.core.genmodel.etricegen.SAPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance;
import org.eclipse.etrice.core.room.InterfaceItem;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance;
-import org.eclipse.etrice.generator.etricegen.PortInstance;
-import org.eclipse.etrice.generator.etricegen.PortKind;
-import org.eclipse.etrice.generator.etricegen.SAPInstance;
-import org.eclipse.etrice.generator.etricegen.ServiceImplInstance;
/**
* <!-- begin-user-doc -->
@@ -29,7 +29,7 @@ import org.eclipse.etrice.generator.etricegen.ServiceImplInstance;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.InterfaceItemInstanceImpl#getPeers <em>Peers</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InterfaceItemInstanceImpl#getPeers <em>Peers</em>}</li>
* </ul>
* </p>
*
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java.bak b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java.bak
new file mode 100644
index 000000000..9a1fb6621
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java.bak
@@ -0,0 +1,181 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
+
+import org.eclipse.etrice.core.room.InterfaceItem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Interface Item Instance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.InterfaceItemInstanceImpl#getPeers <em>Peers</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class InterfaceItemInstanceImpl extends InstanceBaseImpl implements InterfaceItemInstance {
+ /**
+ * The cached value of the '{@link #getPeers() <em>Peers</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getPeers()
+ * @generated
+ * @ordered
+ */
+ protected EList<InterfaceItemInstance> peers;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected InterfaceItemInstanceImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ETriceGenPackage.Literals.INTERFACE_ITEM_INSTANCE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<InterfaceItemInstance> getPeers() {
+ if (peers == null) {
+ peers = new EObjectResolvingEList<InterfaceItemInstance>(InterfaceItemInstance.class, this, ETriceGenPackage.INTERFACE_ITEM_INSTANCE__PEERS);
+ }
+ return peers;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public boolean isReplicated() {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public boolean isSimple() {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public boolean isRelay() {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public InterfaceItem getInterfaceItem() {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ETriceGenPackage.INTERFACE_ITEM_INSTANCE__PEERS:
+ return getPeers();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ETriceGenPackage.INTERFACE_ITEM_INSTANCE__PEERS:
+ getPeers().clear();
+ getPeers().addAll((Collection<? extends InterfaceItemInstance>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.INTERFACE_ITEM_INSTANCE__PEERS:
+ getPeers().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.INTERFACE_ITEM_INSTANCE__PEERS:
+ return peers != null && !peers.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+} //InterfaceItemInstanceImpl
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/PortInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java
index bd0fa5596..44406fb89 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/PortInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java
@@ -4,14 +4,14 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+import org.eclipse.etrice.core.genmodel.etricegen.BindingInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortKind;
import org.eclipse.etrice.core.room.Port;
-import org.eclipse.etrice.generator.etricegen.BindingInstance;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.PortInstance;
-import org.eclipse.etrice.generator.etricegen.PortKind;
import java.util.Collection;
import org.eclipse.emf.common.util.EList;
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
/**
@@ -30,9 +31,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.PortInstanceImpl#getPort <em>Port</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.PortInstanceImpl#getKind <em>Kind</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.PortInstanceImpl#getBindings <em>Bindings</em>}</li>
+ * <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>
*
@@ -48,6 +49,7 @@ public class PortInstanceImpl extends InterfaceItemInstanceImpl implements PortI
* @ordered
*/
protected Port port;
+
/**
* The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
* <!-- begin-user-doc -->
@@ -57,6 +59,7 @@ public class PortInstanceImpl extends InterfaceItemInstanceImpl implements PortI
* @ordered
*/
protected static final PortKind KIND_EDEFAULT = PortKind.EXTERNAL;
+
/**
* The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
* <!-- begin-user-doc -->
@@ -66,6 +69,7 @@ public class PortInstanceImpl extends InterfaceItemInstanceImpl implements PortI
* @ordered
*/
protected PortKind kind = KIND_EDEFAULT;
+
/**
* The cached value of the '{@link #getBindings() <em>Bindings</em>}' reference list.
* <!-- begin-user-doc -->
@@ -75,6 +79,7 @@ public class PortInstanceImpl extends InterfaceItemInstanceImpl implements PortI
* @ordered
*/
protected EList<BindingInstance> bindings;
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java.bak b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java.bak
new file mode 100644
index 000000000..bd8e35cca
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java.bak
@@ -0,0 +1,303 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.etrice.core.genmodel.etricegen.BindingInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortKind;
+
+import org.eclipse.etrice.core.room.Port;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Port Instance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <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
+ */
+public class PortInstanceImpl extends InterfaceItemInstanceImpl implements PortInstance {
+ /**
+ * The cached value of the '{@link #getPort() <em>Port</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getPort()
+ * @generated
+ * @ordered
+ */
+ protected Port port;
+
+ /**
+ * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getKind()
+ * @generated
+ * @ordered
+ */
+ protected static final PortKind KIND_EDEFAULT = PortKind.EXTERNAL;
+
+ /**
+ * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getKind()
+ * @generated
+ * @ordered
+ */
+ protected PortKind kind = KIND_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getBindings() <em>Bindings</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getBindings()
+ * @generated
+ * @ordered
+ */
+ protected EList<BindingInstance> bindings;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected PortInstanceImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ETriceGenPackage.Literals.PORT_INSTANCE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Port getPort() {
+ if (port != null && port.eIsProxy()) {
+ InternalEObject oldPort = (InternalEObject)port;
+ port = (Port)eResolveProxy(oldPort);
+ if (port != oldPort) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, ETriceGenPackage.PORT_INSTANCE__PORT, oldPort, port));
+ }
+ }
+ return port;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Port basicGetPort() {
+ return port;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setPort(Port newPort) {
+ Port oldPort = port;
+ port = newPort;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.PORT_INSTANCE__PORT, oldPort, port));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public PortKind getKind() {
+ return kind;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setKind(PortKind newKind) {
+ PortKind oldKind = kind;
+ kind = newKind == null ? KIND_EDEFAULT : newKind;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.PORT_INSTANCE__KIND, oldKind, kind));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<BindingInstance> getBindings() {
+ if (bindings == null) {
+ bindings = new EObjectWithInverseResolvingEList.ManyInverse<BindingInstance>(BindingInstance.class, this, ETriceGenPackage.PORT_INSTANCE__BINDINGS, ETriceGenPackage.BINDING_INSTANCE__PORTS);
+ }
+ return bindings;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case ETriceGenPackage.PORT_INSTANCE__BINDINGS:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getBindings()).basicAdd(otherEnd, msgs);
+ }
+ return super.eInverseAdd(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case ETriceGenPackage.PORT_INSTANCE__BINDINGS:
+ return ((InternalEList<?>)getBindings()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ETriceGenPackage.PORT_INSTANCE__PORT:
+ if (resolve) return getPort();
+ return basicGetPort();
+ case ETriceGenPackage.PORT_INSTANCE__KIND:
+ return getKind();
+ case ETriceGenPackage.PORT_INSTANCE__BINDINGS:
+ return getBindings();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ETriceGenPackage.PORT_INSTANCE__PORT:
+ setPort((Port)newValue);
+ return;
+ case ETriceGenPackage.PORT_INSTANCE__KIND:
+ setKind((PortKind)newValue);
+ return;
+ case ETriceGenPackage.PORT_INSTANCE__BINDINGS:
+ getBindings().clear();
+ getBindings().addAll((Collection<? extends BindingInstance>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.PORT_INSTANCE__PORT:
+ setPort((Port)null);
+ return;
+ case ETriceGenPackage.PORT_INSTANCE__KIND:
+ setKind(KIND_EDEFAULT);
+ return;
+ case ETriceGenPackage.PORT_INSTANCE__BINDINGS:
+ getBindings().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.PORT_INSTANCE__PORT:
+ return port != null;
+ case ETriceGenPackage.PORT_INSTANCE__KIND:
+ return kind != KIND_EDEFAULT;
+ case ETriceGenPackage.PORT_INSTANCE__BINDINGS:
+ return bindings != null && !bindings.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (kind: ");
+ result.append(kind);
+ result.append(')');
+ return result.toString();
+ }
+
+} //PortInstanceImpl
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/RootImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java
index 2ac38a546..751cbc067 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/RootImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
import java.util.Collection;
import java.util.Collections;
@@ -21,11 +21,20 @@ 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;
+
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
+
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.ActorRef;
import org.eclipse.etrice.core.room.Attribute;
@@ -39,11 +48,6 @@ import org.eclipse.etrice.core.room.RoomModel;
import org.eclipse.etrice.core.room.ServiceImplementation;
import org.eclipse.etrice.core.room.SubSystemClass;
import org.eclipse.etrice.core.room.VarDecl;
-import org.eclipse.etrice.generator.etricegen.ActorInstance;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.Root;
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance;
/**
* <!-- begin-user-doc -->
@@ -52,15 +56,15 @@ import org.eclipse.etrice.generator.etricegen.SubSystemInstance;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.RootImpl#isLibrary <em>Library</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.RootImpl#getSubSystemInstances <em>Sub System Instances</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.RootImpl#getModels <em>Models</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.RootImpl#getXpActorClasses <em>Xp Actor Classes</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.RootImpl#getUsedDataClasses <em>Used Data Classes</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.RootImpl#getUsedProtocolClasses <em>Used Protocol Classes</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.RootImpl#getUsedActorClasses <em>Used Actor Classes</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.RootImpl#getUsedRoomModels <em>Used Room Models</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.RootImpl#getSubSystemClasses <em>Sub System Classes</em>}</li>
+ * <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#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#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#getSubSystemClasses <em>Sub System Classes</em>}</li>
* </ul>
* </p>
*
@@ -262,7 +266,7 @@ public class RootImpl extends EObjectImpl implements Root {
}
}
}
-
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -334,7 +338,7 @@ public class RootImpl extends EObjectImpl implements Root {
recursivelyAddReferencedClasses(ar.getType(), actorClasses);
}
}
-
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java.bak b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java.bak
new file mode 100644
index 000000000..9070dc904
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java.bak
@@ -0,0 +1,464 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
+
+import org.eclipse.etrice.core.room.ActorClass;
+import org.eclipse.etrice.core.room.DataClass;
+import org.eclipse.etrice.core.room.ProtocolClass;
+import org.eclipse.etrice.core.room.RoomClass;
+import org.eclipse.etrice.core.room.RoomModel;
+import org.eclipse.etrice.core.room.SubSystemClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Root</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <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#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#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#getSubSystemClasses <em>Sub System Classes</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class RootImpl extends EObjectImpl implements Root {
+ /**
+ * The default value of the '{@link #isLibrary() <em>Library</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #isLibrary()
+ * @generated
+ * @ordered
+ */
+ protected static final boolean LIBRARY_EDEFAULT = false;
+
+ /**
+ * The cached value of the '{@link #isLibrary() <em>Library</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #isLibrary()
+ * @generated
+ * @ordered
+ */
+ protected boolean library = LIBRARY_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getSubSystemInstances() <em>Sub System Instances</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSubSystemInstances()
+ * @generated
+ * @ordered
+ */
+ protected EList<SubSystemInstance> subSystemInstances;
+
+ /**
+ * The cached value of the '{@link #getModels() <em>Models</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getModels()
+ * @generated
+ * @ordered
+ */
+ protected EList<RoomModel> models;
+
+ /**
+ * The cached value of the '{@link #getXpActorClasses() <em>Xp Actor Classes</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getXpActorClasses()
+ * @generated
+ * @ordered
+ */
+ protected EList<ExpandedActorClass> xpActorClasses;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected RootImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ETriceGenPackage.Literals.ROOT;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public boolean isLibrary() {
+ return library;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setLibrary(boolean newLibrary) {
+ boolean oldLibrary = library;
+ library = newLibrary;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.ROOT__LIBRARY, oldLibrary, library));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<SubSystemInstance> getSubSystemInstances() {
+ if (subSystemInstances == null) {
+ subSystemInstances = new EObjectContainmentEList<SubSystemInstance>(SubSystemInstance.class, this, ETriceGenPackage.ROOT__SUB_SYSTEM_INSTANCES);
+ }
+ return subSystemInstances;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<RoomModel> getModels() {
+ if (models == null) {
+ models = new EObjectResolvingEList<RoomModel>(RoomModel.class, this, ETriceGenPackage.ROOT__MODELS);
+ }
+ return models;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<ExpandedActorClass> getXpActorClasses() {
+ if (xpActorClasses == null) {
+ xpActorClasses = new EObjectContainmentEList<ExpandedActorClass>(ExpandedActorClass.class, this, ETriceGenPackage.ROOT__XP_ACTOR_CLASSES);
+ }
+ return xpActorClasses;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<DataClass> getUsedDataClasses() {
+ // TODO: implement this method to return the 'Used Data Classes' reference list
+ // Ensure that you remove @generated or mark it @generated NOT
+ // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting
+ // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used.
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<ProtocolClass> getUsedProtocolClasses() {
+ // TODO: implement this method to return the 'Used Protocol Classes' reference list
+ // Ensure that you remove @generated or mark it @generated NOT
+ // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting
+ // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used.
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<ActorClass> getUsedActorClasses() {
+ // TODO: implement this method to return the 'Used Actor Classes' reference list
+ // Ensure that you remove @generated or mark it @generated NOT
+ // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting
+ // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used.
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<RoomModel> getUsedRoomModels() {
+ // TODO: implement this method to return the 'Used Room Models' reference list
+ // Ensure that you remove @generated or mark it @generated NOT
+ // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting
+ // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used.
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<SubSystemClass> getSubSystemClasses() {
+ // TODO: implement this method to return the 'Sub System Classes' reference list
+ // Ensure that you remove @generated or mark it @generated NOT
+ // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting
+ // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used.
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<RoomModel> getReferencedModels(RoomClass cls) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<ProtocolClass> getReferencedProtocolClasses(ActorClass cls) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ExpandedActorClass getExpandedActorClass(ActorInstance ai) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case ETriceGenPackage.ROOT__SUB_SYSTEM_INSTANCES:
+ return ((InternalEList<?>)getSubSystemInstances()).basicRemove(otherEnd, msgs);
+ case ETriceGenPackage.ROOT__XP_ACTOR_CLASSES:
+ return ((InternalEList<?>)getXpActorClasses()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ETriceGenPackage.ROOT__LIBRARY:
+ return isLibrary();
+ case ETriceGenPackage.ROOT__SUB_SYSTEM_INSTANCES:
+ return getSubSystemInstances();
+ case ETriceGenPackage.ROOT__MODELS:
+ return getModels();
+ 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__SUB_SYSTEM_CLASSES:
+ return getSubSystemClasses();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ETriceGenPackage.ROOT__LIBRARY:
+ setLibrary((Boolean)newValue);
+ return;
+ case ETriceGenPackage.ROOT__SUB_SYSTEM_INSTANCES:
+ getSubSystemInstances().clear();
+ getSubSystemInstances().addAll((Collection<? extends SubSystemInstance>)newValue);
+ return;
+ case ETriceGenPackage.ROOT__MODELS:
+ getModels().clear();
+ getModels().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);
+ return;
+ case ETriceGenPackage.ROOT__USED_PROTOCOL_CLASSES:
+ getUsedProtocolClasses().clear();
+ getUsedProtocolClasses().addAll((Collection<? extends ProtocolClass>)newValue);
+ return;
+ case ETriceGenPackage.ROOT__USED_ACTOR_CLASSES:
+ getUsedActorClasses().clear();
+ getUsedActorClasses().addAll((Collection<? extends ActorClass>)newValue);
+ return;
+ case ETriceGenPackage.ROOT__USED_ROOM_MODELS:
+ getUsedRoomModels().clear();
+ getUsedRoomModels().addAll((Collection<? extends RoomModel>)newValue);
+ return;
+ case ETriceGenPackage.ROOT__SUB_SYSTEM_CLASSES:
+ getSubSystemClasses().clear();
+ getSubSystemClasses().addAll((Collection<? extends SubSystemClass>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.ROOT__LIBRARY:
+ setLibrary(LIBRARY_EDEFAULT);
+ return;
+ case ETriceGenPackage.ROOT__SUB_SYSTEM_INSTANCES:
+ getSubSystemInstances().clear();
+ return;
+ case ETriceGenPackage.ROOT__MODELS:
+ getModels().clear();
+ return;
+ case ETriceGenPackage.ROOT__XP_ACTOR_CLASSES:
+ getXpActorClasses().clear();
+ return;
+ case ETriceGenPackage.ROOT__USED_DATA_CLASSES:
+ getUsedDataClasses().clear();
+ return;
+ case ETriceGenPackage.ROOT__USED_PROTOCOL_CLASSES:
+ getUsedProtocolClasses().clear();
+ return;
+ case ETriceGenPackage.ROOT__USED_ACTOR_CLASSES:
+ getUsedActorClasses().clear();
+ return;
+ case ETriceGenPackage.ROOT__USED_ROOM_MODELS:
+ getUsedRoomModels().clear();
+ return;
+ case ETriceGenPackage.ROOT__SUB_SYSTEM_CLASSES:
+ getSubSystemClasses().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.ROOT__LIBRARY:
+ return library != LIBRARY_EDEFAULT;
+ case ETriceGenPackage.ROOT__SUB_SYSTEM_INSTANCES:
+ return subSystemInstances != null && !subSystemInstances.isEmpty();
+ case ETriceGenPackage.ROOT__MODELS:
+ return models != null && !models.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__SUB_SYSTEM_CLASSES:
+ return !getSubSystemClasses().isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (library: ");
+ result.append(library);
+ result.append(')');
+ return result.toString();
+ }
+
+} //RootImpl
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/SAPInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java
index d50dc4065..25349eb50 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/SAPInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java
@@ -4,13 +4,14 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.SAPInstance;
import org.eclipse.etrice.core.room.SAPRef;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.SAPInstance;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
@@ -23,7 +24,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.SAPInstanceImpl#getSap <em>Sap</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SAPInstanceImpl#getSap <em>Sap</em>}</li>
* </ul>
* </p>
*
@@ -39,6 +40,7 @@ public class SAPInstanceImpl extends InterfaceItemInstanceImpl implements SAPIns
* @ordered
*/
protected SAPRef sap;
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java.bak b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java.bak
new file mode 100644
index 000000000..be7e43920
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java.bak
@@ -0,0 +1,161 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.SAPInstance;
+
+import org.eclipse.etrice.core.room.SAPRef;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>SAP Instance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.SAPInstanceImpl#getSap <em>Sap</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class SAPInstanceImpl extends InterfaceItemInstanceImpl implements SAPInstance {
+ /**
+ * The cached value of the '{@link #getSap() <em>Sap</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSap()
+ * @generated
+ * @ordered
+ */
+ protected SAPRef sap;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected SAPInstanceImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ETriceGenPackage.Literals.SAP_INSTANCE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public SAPRef getSap() {
+ if (sap != null && sap.eIsProxy()) {
+ InternalEObject oldSap = (InternalEObject)sap;
+ sap = (SAPRef)eResolveProxy(oldSap);
+ if (sap != oldSap) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, ETriceGenPackage.SAP_INSTANCE__SAP, oldSap, sap));
+ }
+ }
+ return sap;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public SAPRef basicGetSap() {
+ return sap;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setSap(SAPRef newSap) {
+ SAPRef oldSap = sap;
+ sap = newSap;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.SAP_INSTANCE__SAP, oldSap, sap));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ETriceGenPackage.SAP_INSTANCE__SAP:
+ if (resolve) return getSap();
+ return basicGetSap();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ETriceGenPackage.SAP_INSTANCE__SAP:
+ setSap((SAPRef)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.SAP_INSTANCE__SAP:
+ setSap((SAPRef)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.SAP_INSTANCE__SAP:
+ return sap != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+} //SAPInstanceImpl
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/SPPInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java
index 12a555393..e01eff2f5 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/SPPInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java
@@ -4,23 +4,26 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+import org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.SPPInstance;
import org.eclipse.etrice.core.room.SPPRef;
-import org.eclipse.etrice.generator.etricegen.ConnectionInstance;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.SPPInstance;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
@@ -31,9 +34,9 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.SPPInstanceImpl#getSpp <em>Spp</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.SPPInstanceImpl#getIncoming <em>Incoming</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.SPPInstanceImpl#getOutgoing <em>Outgoing</em>}</li>
+ * <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>
*
@@ -59,6 +62,7 @@ public class SPPInstanceImpl extends InstanceBaseImpl implements SPPInstance {
* @ordered
*/
protected EList<ConnectionInstance> incoming;
+
/**
* The cached value of the '{@link #getOutgoing() <em>Outgoing</em>}' reference.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java.bak b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java.bak
new file mode 100644
index 000000000..2a9b5b82c
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java.bak
@@ -0,0 +1,322 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.SPPInstance;
+
+import org.eclipse.etrice.core.room.SPPRef;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>SPP Instance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <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
+ */
+public class SPPInstanceImpl extends InstanceBaseImpl implements SPPInstance {
+ /**
+ * The cached value of the '{@link #getSpp() <em>Spp</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSpp()
+ * @generated
+ * @ordered
+ */
+ protected SPPRef spp;
+
+ /**
+ * The cached value of the '{@link #getIncoming() <em>Incoming</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getIncoming()
+ * @generated
+ * @ordered
+ */
+ protected EList<ConnectionInstance> incoming;
+
+ /**
+ * The cached value of the '{@link #getOutgoing() <em>Outgoing</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getOutgoing()
+ * @generated
+ * @ordered
+ */
+ protected ConnectionInstance outgoing;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected SPPInstanceImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ETriceGenPackage.Literals.SPP_INSTANCE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public SPPRef getSpp() {
+ if (spp != null && spp.eIsProxy()) {
+ InternalEObject oldSpp = (InternalEObject)spp;
+ spp = (SPPRef)eResolveProxy(oldSpp);
+ if (spp != oldSpp) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, ETriceGenPackage.SPP_INSTANCE__SPP, oldSpp, spp));
+ }
+ }
+ return spp;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public SPPRef basicGetSpp() {
+ return spp;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setSpp(SPPRef newSpp) {
+ SPPRef oldSpp = spp;
+ spp = newSpp;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.SPP_INSTANCE__SPP, oldSpp, spp));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<ConnectionInstance> getIncoming() {
+ if (incoming == null) {
+ incoming = new EObjectWithInverseResolvingEList<ConnectionInstance>(ConnectionInstance.class, this, ETriceGenPackage.SPP_INSTANCE__INCOMING, ETriceGenPackage.CONNECTION_INSTANCE__TO_SPP);
+ }
+ return incoming;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ConnectionInstance getOutgoing() {
+ if (outgoing != null && outgoing.eIsProxy()) {
+ InternalEObject oldOutgoing = (InternalEObject)outgoing;
+ outgoing = (ConnectionInstance)eResolveProxy(oldOutgoing);
+ if (outgoing != oldOutgoing) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, ETriceGenPackage.SPP_INSTANCE__OUTGOING, oldOutgoing, outgoing));
+ }
+ }
+ return outgoing;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ConnectionInstance basicGetOutgoing() {
+ return outgoing;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetOutgoing(ConnectionInstance newOutgoing, NotificationChain msgs) {
+ ConnectionInstance oldOutgoing = outgoing;
+ outgoing = newOutgoing;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ETriceGenPackage.SPP_INSTANCE__OUTGOING, oldOutgoing, newOutgoing);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setOutgoing(ConnectionInstance newOutgoing) {
+ if (newOutgoing != outgoing) {
+ NotificationChain msgs = null;
+ if (outgoing != null)
+ msgs = ((InternalEObject)outgoing).eInverseRemove(this, ETriceGenPackage.CONNECTION_INSTANCE__FROM_SPP, ConnectionInstance.class, msgs);
+ if (newOutgoing != null)
+ msgs = ((InternalEObject)newOutgoing).eInverseAdd(this, ETriceGenPackage.CONNECTION_INSTANCE__FROM_SPP, ConnectionInstance.class, msgs);
+ msgs = basicSetOutgoing(newOutgoing, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.SPP_INSTANCE__OUTGOING, newOutgoing, newOutgoing));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case ETriceGenPackage.SPP_INSTANCE__INCOMING:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getIncoming()).basicAdd(otherEnd, msgs);
+ case ETriceGenPackage.SPP_INSTANCE__OUTGOING:
+ if (outgoing != null)
+ msgs = ((InternalEObject)outgoing).eInverseRemove(this, ETriceGenPackage.CONNECTION_INSTANCE__FROM_SPP, ConnectionInstance.class, msgs);
+ return basicSetOutgoing((ConnectionInstance)otherEnd, msgs);
+ }
+ return super.eInverseAdd(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case ETriceGenPackage.SPP_INSTANCE__INCOMING:
+ return ((InternalEList<?>)getIncoming()).basicRemove(otherEnd, msgs);
+ case ETriceGenPackage.SPP_INSTANCE__OUTGOING:
+ return basicSetOutgoing(null, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ETriceGenPackage.SPP_INSTANCE__SPP:
+ if (resolve) return getSpp();
+ return basicGetSpp();
+ case ETriceGenPackage.SPP_INSTANCE__INCOMING:
+ return getIncoming();
+ case ETriceGenPackage.SPP_INSTANCE__OUTGOING:
+ if (resolve) return getOutgoing();
+ return basicGetOutgoing();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ETriceGenPackage.SPP_INSTANCE__SPP:
+ setSpp((SPPRef)newValue);
+ return;
+ case ETriceGenPackage.SPP_INSTANCE__INCOMING:
+ getIncoming().clear();
+ getIncoming().addAll((Collection<? extends ConnectionInstance>)newValue);
+ return;
+ case ETriceGenPackage.SPP_INSTANCE__OUTGOING:
+ setOutgoing((ConnectionInstance)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.SPP_INSTANCE__SPP:
+ setSpp((SPPRef)null);
+ return;
+ case ETriceGenPackage.SPP_INSTANCE__INCOMING:
+ getIncoming().clear();
+ return;
+ case ETriceGenPackage.SPP_INSTANCE__OUTGOING:
+ setOutgoing((ConnectionInstance)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.SPP_INSTANCE__SPP:
+ return spp != null;
+ case ETriceGenPackage.SPP_INSTANCE__INCOMING:
+ return incoming != null && !incoming.isEmpty();
+ case ETriceGenPackage.SPP_INSTANCE__OUTGOING:
+ return outgoing != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+} //SPPInstanceImpl
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ServiceImplInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java
index 4f28acd43..79106a9c1 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ServiceImplInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java
@@ -4,14 +4,15 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance;
import org.eclipse.etrice.core.room.ServiceImplementation;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.ServiceImplInstance;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
@@ -24,7 +25,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.ServiceImplInstanceImpl#getSvcImpl <em>Svc Impl</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ServiceImplInstanceImpl#getSvcImpl <em>Svc Impl</em>}</li>
* </ul>
* </p>
*
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java.bak b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java.bak
new file mode 100644
index 000000000..efd4702df
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java.bak
@@ -0,0 +1,161 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance;
+
+import org.eclipse.etrice.core.room.ServiceImplementation;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Service Impl Instance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.ServiceImplInstanceImpl#getSvcImpl <em>Svc Impl</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ServiceImplInstanceImpl extends InterfaceItemInstanceImpl implements ServiceImplInstance {
+ /**
+ * The cached value of the '{@link #getSvcImpl() <em>Svc Impl</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSvcImpl()
+ * @generated
+ * @ordered
+ */
+ protected ServiceImplementation svcImpl;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ServiceImplInstanceImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ETriceGenPackage.Literals.SERVICE_IMPL_INSTANCE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ServiceImplementation getSvcImpl() {
+ if (svcImpl != null && svcImpl.eIsProxy()) {
+ InternalEObject oldSvcImpl = (InternalEObject)svcImpl;
+ svcImpl = (ServiceImplementation)eResolveProxy(oldSvcImpl);
+ if (svcImpl != oldSvcImpl) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, ETriceGenPackage.SERVICE_IMPL_INSTANCE__SVC_IMPL, oldSvcImpl, svcImpl));
+ }
+ }
+ return svcImpl;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ServiceImplementation basicGetSvcImpl() {
+ return svcImpl;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setSvcImpl(ServiceImplementation newSvcImpl) {
+ ServiceImplementation oldSvcImpl = svcImpl;
+ svcImpl = newSvcImpl;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.SERVICE_IMPL_INSTANCE__SVC_IMPL, oldSvcImpl, svcImpl));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ETriceGenPackage.SERVICE_IMPL_INSTANCE__SVC_IMPL:
+ if (resolve) return getSvcImpl();
+ return basicGetSvcImpl();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ETriceGenPackage.SERVICE_IMPL_INSTANCE__SVC_IMPL:
+ setSvcImpl((ServiceImplementation)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.SERVICE_IMPL_INSTANCE__SVC_IMPL:
+ setSvcImpl((ServiceImplementation)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.SERVICE_IMPL_INSTANCE__SVC_IMPL:
+ return svcImpl != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+} //ServiceImplInstanceImpl
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/StructureInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java
index 156c63386..b7f35da43 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/StructureInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
import java.util.Collection;
import java.util.HashMap;
@@ -17,23 +17,24 @@ 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.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.BindingInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortKind;
+import org.eclipse.etrice.core.genmodel.etricegen.SAPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.SPPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.StructureInstance;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.ProtocolClass;
-import org.eclipse.etrice.generator.etricegen.ActorInstance;
-import org.eclipse.etrice.generator.etricegen.BindingInstance;
-import org.eclipse.etrice.generator.etricegen.ConnectionInstance;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance;
-import org.eclipse.etrice.generator.etricegen.PortInstance;
-import org.eclipse.etrice.generator.etricegen.PortKind;
-import org.eclipse.etrice.generator.etricegen.SAPInstance;
-import org.eclipse.etrice.generator.etricegen.SPPInstance;
-import org.eclipse.etrice.generator.etricegen.ServiceImplInstance;
-import org.eclipse.etrice.generator.etricegen.StructureInstance;
/**
* <!-- begin-user-doc -->
@@ -42,15 +43,15 @@ import org.eclipse.etrice.generator.etricegen.StructureInstance;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.StructureInstanceImpl#getInstances <em>Instances</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.StructureInstanceImpl#getPorts <em>Ports</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.StructureInstanceImpl#getSaps <em>Saps</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.StructureInstanceImpl#getSpps <em>Spps</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.StructureInstanceImpl#getServices <em>Services</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.StructureInstanceImpl#getBindings <em>Bindings</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.StructureInstanceImpl#getConnections <em>Connections</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.StructureInstanceImpl#getAllContainedInstances <em>All Contained Instances</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.StructureInstanceImpl#getOrderedIfItemInstances <em>Ordered If Item Instances</em>}</li>
+ * <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#getPorts <em>Ports</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getSaps <em>Saps</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getSpps <em>Spps</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getServices <em>Services</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getBindings <em>Bindings</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getConnections <em>Connections</em>}</li>
+ * <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>
*
@@ -66,6 +67,7 @@ public class StructureInstanceImpl extends InstanceBaseImpl implements Structure
* @ordered
*/
protected EList<ActorInstance> instances;
+
/**
* The cached value of the '{@link #getPorts() <em>Ports</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -75,6 +77,7 @@ public class StructureInstanceImpl extends InstanceBaseImpl implements Structure
* @ordered
*/
protected EList<PortInstance> ports;
+
/**
* The cached value of the '{@link #getSaps() <em>Saps</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -84,6 +87,7 @@ public class StructureInstanceImpl extends InstanceBaseImpl implements Structure
* @ordered
*/
protected EList<SAPInstance> saps;
+
/**
* The cached value of the '{@link #getSpps() <em>Spps</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -93,6 +97,7 @@ public class StructureInstanceImpl extends InstanceBaseImpl implements Structure
* @ordered
*/
protected EList<SPPInstance> spps;
+
/**
* The cached value of the '{@link #getServices() <em>Services</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -102,6 +107,7 @@ public class StructureInstanceImpl extends InstanceBaseImpl implements Structure
* @ordered
*/
protected EList<ServiceImplInstance> services;
+
/**
* The cached value of the '{@link #getBindings() <em>Bindings</em>}' containment reference list.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java.bak b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java.bak
new file mode 100644
index 000000000..fc114e6e3
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java.bak
@@ -0,0 +1,430 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.BindingInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.SAPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.SPPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.StructureInstance;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Structure Instance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <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#getPorts <em>Ports</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getSaps <em>Saps</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getSpps <em>Spps</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getServices <em>Services</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getBindings <em>Bindings</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.StructureInstanceImpl#getConnections <em>Connections</em>}</li>
+ * <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
+ */
+public class StructureInstanceImpl extends InstanceBaseImpl implements StructureInstance {
+ /**
+ * The cached value of the '{@link #getInstances() <em>Instances</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getInstances()
+ * @generated
+ * @ordered
+ */
+ protected EList<ActorInstance> instances;
+
+ /**
+ * The cached value of the '{@link #getPorts() <em>Ports</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getPorts()
+ * @generated
+ * @ordered
+ */
+ protected EList<PortInstance> ports;
+
+ /**
+ * The cached value of the '{@link #getSaps() <em>Saps</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSaps()
+ * @generated
+ * @ordered
+ */
+ protected EList<SAPInstance> saps;
+
+ /**
+ * The cached value of the '{@link #getSpps() <em>Spps</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSpps()
+ * @generated
+ * @ordered
+ */
+ protected EList<SPPInstance> spps;
+
+ /**
+ * The cached value of the '{@link #getServices() <em>Services</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getServices()
+ * @generated
+ * @ordered
+ */
+ protected EList<ServiceImplInstance> services;
+
+ /**
+ * The cached value of the '{@link #getBindings() <em>Bindings</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getBindings()
+ * @generated
+ * @ordered
+ */
+ protected EList<BindingInstance> bindings;
+
+ /**
+ * The cached value of the '{@link #getConnections() <em>Connections</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getConnections()
+ * @generated
+ * @ordered
+ */
+ protected EList<ConnectionInstance> connections;
+
+ /**
+ * The cached value of the '{@link #getOrderedIfItemInstances() <em>Ordered If Item Instances</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getOrderedIfItemInstances()
+ * @generated
+ * @ordered
+ */
+ protected EList<InterfaceItemInstance> orderedIfItemInstances;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected StructureInstanceImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ETriceGenPackage.Literals.STRUCTURE_INSTANCE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<ActorInstance> getInstances() {
+ if (instances == null) {
+ instances = new EObjectContainmentEList<ActorInstance>(ActorInstance.class, this, ETriceGenPackage.STRUCTURE_INSTANCE__INSTANCES);
+ }
+ return instances;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<PortInstance> getPorts() {
+ if (ports == null) {
+ ports = new EObjectContainmentEList<PortInstance>(PortInstance.class, this, ETriceGenPackage.STRUCTURE_INSTANCE__PORTS);
+ }
+ return ports;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<SAPInstance> getSaps() {
+ if (saps == null) {
+ saps = new EObjectContainmentEList<SAPInstance>(SAPInstance.class, this, ETriceGenPackage.STRUCTURE_INSTANCE__SAPS);
+ }
+ return saps;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<SPPInstance> getSpps() {
+ if (spps == null) {
+ spps = new EObjectContainmentEList<SPPInstance>(SPPInstance.class, this, ETriceGenPackage.STRUCTURE_INSTANCE__SPPS);
+ }
+ return spps;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<ServiceImplInstance> getServices() {
+ if (services == null) {
+ services = new EObjectContainmentEList<ServiceImplInstance>(ServiceImplInstance.class, this, ETriceGenPackage.STRUCTURE_INSTANCE__SERVICES);
+ }
+ return services;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<BindingInstance> getBindings() {
+ if (bindings == null) {
+ bindings = new EObjectContainmentEList<BindingInstance>(BindingInstance.class, this, ETriceGenPackage.STRUCTURE_INSTANCE__BINDINGS);
+ }
+ return bindings;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<ConnectionInstance> getConnections() {
+ if (connections == null) {
+ connections = new EObjectContainmentEList<ConnectionInstance>(ConnectionInstance.class, this, ETriceGenPackage.STRUCTURE_INSTANCE__CONNECTIONS);
+ }
+ return connections;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<ActorInstance> getAllContainedInstances() {
+ // TODO: implement this method to return the 'All Contained Instances' reference list
+ // Ensure that you remove @generated or mark it @generated NOT
+ // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting
+ // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used.
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<InterfaceItemInstance> getOrderedIfItemInstances() {
+ if (orderedIfItemInstances == null) {
+ orderedIfItemInstances = new EObjectResolvingEList<InterfaceItemInstance>(InterfaceItemInstance.class, this, ETriceGenPackage.STRUCTURE_INSTANCE__ORDERED_IF_ITEM_INSTANCES);
+ }
+ return orderedIfItemInstances;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case ETriceGenPackage.STRUCTURE_INSTANCE__INSTANCES:
+ return ((InternalEList<?>)getInstances()).basicRemove(otherEnd, msgs);
+ case ETriceGenPackage.STRUCTURE_INSTANCE__PORTS:
+ return ((InternalEList<?>)getPorts()).basicRemove(otherEnd, msgs);
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SAPS:
+ return ((InternalEList<?>)getSaps()).basicRemove(otherEnd, msgs);
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SPPS:
+ return ((InternalEList<?>)getSpps()).basicRemove(otherEnd, msgs);
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SERVICES:
+ return ((InternalEList<?>)getServices()).basicRemove(otherEnd, msgs);
+ case ETriceGenPackage.STRUCTURE_INSTANCE__BINDINGS:
+ return ((InternalEList<?>)getBindings()).basicRemove(otherEnd, msgs);
+ case ETriceGenPackage.STRUCTURE_INSTANCE__CONNECTIONS:
+ return ((InternalEList<?>)getConnections()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ETriceGenPackage.STRUCTURE_INSTANCE__INSTANCES:
+ return getInstances();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__PORTS:
+ return getPorts();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SAPS:
+ return getSaps();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SPPS:
+ return getSpps();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SERVICES:
+ return getServices();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__BINDINGS:
+ return getBindings();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__CONNECTIONS:
+ return getConnections();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__ALL_CONTAINED_INSTANCES:
+ return getAllContainedInstances();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__ORDERED_IF_ITEM_INSTANCES:
+ return getOrderedIfItemInstances();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ETriceGenPackage.STRUCTURE_INSTANCE__INSTANCES:
+ getInstances().clear();
+ getInstances().addAll((Collection<? extends ActorInstance>)newValue);
+ return;
+ case ETriceGenPackage.STRUCTURE_INSTANCE__PORTS:
+ getPorts().clear();
+ getPorts().addAll((Collection<? extends PortInstance>)newValue);
+ return;
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SAPS:
+ getSaps().clear();
+ getSaps().addAll((Collection<? extends SAPInstance>)newValue);
+ return;
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SPPS:
+ getSpps().clear();
+ getSpps().addAll((Collection<? extends SPPInstance>)newValue);
+ return;
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SERVICES:
+ getServices().clear();
+ getServices().addAll((Collection<? extends ServiceImplInstance>)newValue);
+ return;
+ case ETriceGenPackage.STRUCTURE_INSTANCE__BINDINGS:
+ getBindings().clear();
+ getBindings().addAll((Collection<? extends BindingInstance>)newValue);
+ return;
+ case ETriceGenPackage.STRUCTURE_INSTANCE__CONNECTIONS:
+ getConnections().clear();
+ getConnections().addAll((Collection<? extends ConnectionInstance>)newValue);
+ return;
+ case ETriceGenPackage.STRUCTURE_INSTANCE__ALL_CONTAINED_INSTANCES:
+ getAllContainedInstances().clear();
+ getAllContainedInstances().addAll((Collection<? extends ActorInstance>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.STRUCTURE_INSTANCE__INSTANCES:
+ getInstances().clear();
+ return;
+ case ETriceGenPackage.STRUCTURE_INSTANCE__PORTS:
+ getPorts().clear();
+ return;
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SAPS:
+ getSaps().clear();
+ return;
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SPPS:
+ getSpps().clear();
+ return;
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SERVICES:
+ getServices().clear();
+ return;
+ case ETriceGenPackage.STRUCTURE_INSTANCE__BINDINGS:
+ getBindings().clear();
+ return;
+ case ETriceGenPackage.STRUCTURE_INSTANCE__CONNECTIONS:
+ getConnections().clear();
+ return;
+ case ETriceGenPackage.STRUCTURE_INSTANCE__ALL_CONTAINED_INSTANCES:
+ getAllContainedInstances().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.STRUCTURE_INSTANCE__INSTANCES:
+ return instances != null && !instances.isEmpty();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__PORTS:
+ return ports != null && !ports.isEmpty();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SAPS:
+ return saps != null && !saps.isEmpty();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SPPS:
+ return spps != null && !spps.isEmpty();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__SERVICES:
+ return services != null && !services.isEmpty();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__BINDINGS:
+ return bindings != null && !bindings.isEmpty();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__CONNECTIONS:
+ return connections != null && !connections.isEmpty();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__ALL_CONTAINED_INSTANCES:
+ return !getAllContainedInstances().isEmpty();
+ case ETriceGenPackage.STRUCTURE_INSTANCE__ORDERED_IF_ITEM_INSTANCES:
+ return orderedIfItemInstances != null && !orderedIfItemInstances.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+} //StructureInstanceImpl
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/SubSystemInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java
index 679b5c131..633e25ac6 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/SubSystemInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java
@@ -4,17 +4,17 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
import java.util.HashMap;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.InstanceBase;
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
import org.eclipse.etrice.core.room.ActorInstancePath;
import org.eclipse.etrice.core.room.LogicalThread;
import org.eclipse.etrice.core.room.SubSystemClass;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.InstanceBase;
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.TreeIterator;
@@ -27,13 +27,13 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
/**
* <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Sub LogicalSystem Instance</b></em>'.
+ * An implementation of the model object '<em><b>Sub System Instance</b></em>'.
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.SubSystemInstanceImpl#getSubSystemClass <em>Sub System Class</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.SubSystemInstanceImpl#getMaxObjId <em>Max Obj Id</em>}</li>
+ * <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>
*
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java.bak b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java.bak
new file mode 100644
index 000000000..06aed044a
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java.bak
@@ -0,0 +1,199 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.InstanceBase;
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
+
+import org.eclipse.etrice.core.room.SubSystemClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Sub System Instance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <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
+ */
+public class SubSystemInstanceImpl extends StructureInstanceImpl implements SubSystemInstance {
+ /**
+ * The cached value of the '{@link #getSubSystemClass() <em>Sub System Class</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSubSystemClass()
+ * @generated
+ * @ordered
+ */
+ protected SubSystemClass subSystemClass;
+
+ /**
+ * The default value of the '{@link #getMaxObjId() <em>Max Obj Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMaxObjId()
+ * @generated
+ * @ordered
+ */
+ protected static final int MAX_OBJ_ID_EDEFAULT = 0;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected SubSystemInstanceImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ETriceGenPackage.Literals.SUB_SYSTEM_INSTANCE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public SubSystemClass getSubSystemClass() {
+ if (subSystemClass != null && subSystemClass.eIsProxy()) {
+ InternalEObject oldSubSystemClass = (InternalEObject)subSystemClass;
+ subSystemClass = (SubSystemClass)eResolveProxy(oldSubSystemClass);
+ if (subSystemClass != oldSubSystemClass) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, ETriceGenPackage.SUB_SYSTEM_INSTANCE__SUB_SYSTEM_CLASS, oldSubSystemClass, subSystemClass));
+ }
+ }
+ return subSystemClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public SubSystemClass basicGetSubSystemClass() {
+ return subSystemClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setSubSystemClass(SubSystemClass newSubSystemClass) {
+ SubSystemClass oldSubSystemClass = subSystemClass;
+ subSystemClass = newSubSystemClass;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.SUB_SYSTEM_INSTANCE__SUB_SYSTEM_CLASS, oldSubSystemClass, subSystemClass));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public int getMaxObjId() {
+ // TODO: implement this method to return the 'Max Obj Id' attribute
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public int getThreadId(InstanceBase instance) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ETriceGenPackage.SUB_SYSTEM_INSTANCE__SUB_SYSTEM_CLASS:
+ if (resolve) return getSubSystemClass();
+ return basicGetSubSystemClass();
+ case ETriceGenPackage.SUB_SYSTEM_INSTANCE__MAX_OBJ_ID:
+ return getMaxObjId();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ETriceGenPackage.SUB_SYSTEM_INSTANCE__SUB_SYSTEM_CLASS:
+ setSubSystemClass((SubSystemClass)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.SUB_SYSTEM_INSTANCE__SUB_SYSTEM_CLASS:
+ setSubSystemClass((SubSystemClass)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.SUB_SYSTEM_INSTANCE__SUB_SYSTEM_CLASS:
+ return subSystemClass != null;
+ case ETriceGenPackage.SUB_SYSTEM_INSTANCE__MAX_OBJ_ID:
+ return getMaxObjId() != MAX_OBJ_ID_EDEFAULT;
+ }
+ return super.eIsSet(featureID);
+ }
+
+} //SubSystemInstanceImpl
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/TransitionChainImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/TransitionChainImpl.java
index 700506fe6..826b0dec7 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/TransitionChainImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/TransitionChainImpl.java
@@ -4,15 +4,21 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.impl;
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.EList;
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;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.ITransitionChainVisitor;
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
import org.eclipse.etrice.core.naming.RoomNameProvider;
import org.eclipse.etrice.core.room.CPBranchTransition;
import org.eclipse.etrice.core.room.ChoicePoint;
@@ -28,10 +34,6 @@ import org.eclipse.etrice.core.room.TrPointTerminal;
import org.eclipse.etrice.core.room.Transition;
import org.eclipse.etrice.core.room.TransitionChainStartTransition;
import org.eclipse.etrice.core.room.TransitionPoint;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.ITransitionChainVisitor;
-import org.eclipse.etrice.generator.etricegen.TransitionChain;
/**
* <!-- begin-user-doc -->
@@ -40,8 +42,8 @@ import org.eclipse.etrice.generator.etricegen.TransitionChain;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.TransitionChainImpl#getTransition <em>Transition</em>}</li>
- * <li>{@link org.eclipse.etrice.generator.etricegen.impl.TransitionChainImpl#isSkipEntry <em>Skip Entry</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.TransitionChainImpl#getTransition <em>Transition</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.TransitionChainImpl#isSkipEntry <em>Skip Entry</em>}</li>
* </ul>
* </p>
*
@@ -67,6 +69,7 @@ public class TransitionChainImpl extends EObjectImpl implements TransitionChain
* @ordered
*/
protected static final boolean SKIP_ENTRY_EDEFAULT = false;
+
/**
* The cached value of the '{@link #isSkipEntry() <em>Skip Entry</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/TransitionChainImpl.java.bak b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/TransitionChainImpl.java.bak
new file mode 100644
index 000000000..ebb2a117d
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/TransitionChainImpl.java.bak
@@ -0,0 +1,265 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.ITransitionChainVisitor;
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
+
+import org.eclipse.etrice.core.room.State;
+import org.eclipse.etrice.core.room.Transition;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Transition Chain</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.TransitionChainImpl#getTransition <em>Transition</em>}</li>
+ * <li>{@link org.eclipse.etrice.core.genmodel.etricegen.impl.TransitionChainImpl#isSkipEntry <em>Skip Entry</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TransitionChainImpl extends EObjectImpl implements TransitionChain {
+ /**
+ * The cached value of the '{@link #getTransition() <em>Transition</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getTransition()
+ * @generated
+ * @ordered
+ */
+ protected Transition transition;
+
+ /**
+ * The default value of the '{@link #isSkipEntry() <em>Skip Entry</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #isSkipEntry()
+ * @generated
+ * @ordered
+ */
+ protected static final boolean SKIP_ENTRY_EDEFAULT = false;
+
+ /**
+ * The cached value of the '{@link #isSkipEntry() <em>Skip Entry</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #isSkipEntry()
+ * @generated
+ * @ordered
+ */
+ protected boolean skipEntry = SKIP_ENTRY_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TransitionChainImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ETriceGenPackage.Literals.TRANSITION_CHAIN;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Transition getTransition() {
+ if (transition != null && transition.eIsProxy()) {
+ InternalEObject oldTransition = (InternalEObject)transition;
+ transition = (Transition)eResolveProxy(oldTransition);
+ if (transition != oldTransition) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, ETriceGenPackage.TRANSITION_CHAIN__TRANSITION, oldTransition, transition));
+ }
+ }
+ return transition;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Transition basicGetTransition() {
+ return transition;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setTransition(Transition newTransition) {
+ Transition oldTransition = transition;
+ transition = newTransition;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.TRANSITION_CHAIN__TRANSITION, oldTransition, transition));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public boolean isSkipEntry() {
+ return skipEntry;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setSkipEntry(boolean newSkipEntry) {
+ boolean oldSkipEntry = skipEntry;
+ skipEntry = newSkipEntry;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ETriceGenPackage.TRANSITION_CHAIN__SKIP_ENTRY, oldSkipEntry, skipEntry));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public State getStateContext() {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public boolean isHandler() {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String genExecuteChain(ITransitionChainVisitor tcv) {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ETriceGenPackage.TRANSITION_CHAIN__TRANSITION:
+ if (resolve) return getTransition();
+ return basicGetTransition();
+ case ETriceGenPackage.TRANSITION_CHAIN__SKIP_ENTRY:
+ return isSkipEntry();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ETriceGenPackage.TRANSITION_CHAIN__TRANSITION:
+ setTransition((Transition)newValue);
+ return;
+ case ETriceGenPackage.TRANSITION_CHAIN__SKIP_ENTRY:
+ setSkipEntry((Boolean)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.TRANSITION_CHAIN__TRANSITION:
+ setTransition((Transition)null);
+ return;
+ case ETriceGenPackage.TRANSITION_CHAIN__SKIP_ENTRY:
+ setSkipEntry(SKIP_ENTRY_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ETriceGenPackage.TRANSITION_CHAIN__TRANSITION:
+ return transition != null;
+ case ETriceGenPackage.TRANSITION_CHAIN__SKIP_ENTRY:
+ return skipEntry != SKIP_ENTRY_EDEFAULT;
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (skipEntry: ");
+ result.append(skipEntry);
+ result.append(')');
+ return result.toString();
+ }
+
+} //TransitionChainImpl
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenAdapterFactory.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenAdapterFactory.java
index cbe31d5d8..4c1589205 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenAdapterFactory.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenAdapterFactory.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.util;
+package org.eclipse.etrice.core.genmodel.etricegen.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
@@ -13,19 +13,19 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.genmodel.etricegen.*;
+
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.ActorContainerClass;
import org.eclipse.etrice.core.room.RoomClass;
import org.eclipse.etrice.core.room.StructureClass;
-import org.eclipse.etrice.generator.etricegen.*;
-
/**
* <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage
* @generated
*/
public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
@@ -181,13 +181,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.Root <em>Root</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.Root <em>Root</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.Root
+ * @see org.eclipse.etrice.core.genmodel.etricegen.Root
* @generated
*/
public Adapter createRootAdapter() {
@@ -195,13 +195,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.InstanceBase <em>Instance Base</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.InstanceBase <em>Instance Base</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.InstanceBase
+ * @see org.eclipse.etrice.core.genmodel.etricegen.InstanceBase
* @generated
*/
public Adapter createInstanceBaseAdapter() {
@@ -209,13 +209,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.StructureInstance <em>Structure Instance</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.StructureInstance <em>Structure Instance</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.StructureInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.StructureInstance
* @generated
*/
public Adapter createStructureInstanceAdapter() {
@@ -223,13 +223,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.SubSystemInstance <em>Sub System Instance</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance <em>Sub System Instance</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.SubSystemInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance
* @generated
*/
public Adapter createSubSystemInstanceAdapter() {
@@ -237,13 +237,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.ActorInstance <em>Actor Instance</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.ActorInstance <em>Actor Instance</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.ActorInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ActorInstance
* @generated
*/
public Adapter createActorInstanceAdapter() {
@@ -251,13 +251,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.InterfaceItemInstance <em>Interface Item Instance</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance <em>Interface Item Instance</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.InterfaceItemInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance
* @generated
*/
public Adapter createInterfaceItemInstanceAdapter() {
@@ -265,13 +265,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.PortInstance <em>Port Instance</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.PortInstance <em>Port Instance</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.PortInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.PortInstance
* @generated
*/
public Adapter createPortInstanceAdapter() {
@@ -279,13 +279,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.BindingInstance <em>Binding Instance</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.BindingInstance <em>Binding Instance</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.BindingInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.BindingInstance
* @generated
*/
public Adapter createBindingInstanceAdapter() {
@@ -293,13 +293,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.SAPInstance <em>SAP Instance</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.SAPInstance <em>SAP Instance</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.SAPInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.SAPInstance
* @generated
*/
public Adapter createSAPInstanceAdapter() {
@@ -307,13 +307,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.SPPInstance <em>SPP Instance</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance <em>SPP Instance</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.SPPInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.SPPInstance
* @generated
*/
public Adapter createSPPInstanceAdapter() {
@@ -321,13 +321,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.ServiceImplInstance <em>Service Impl Instance</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance <em>Service Impl Instance</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.ServiceImplInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance
* @generated
*/
public Adapter createServiceImplInstanceAdapter() {
@@ -335,13 +335,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.ConnectionInstance <em>Connection Instance</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance <em>Connection Instance</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.ConnectionInstance
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance
* @generated
*/
public Adapter createConnectionInstanceAdapter() {
@@ -349,13 +349,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.ActiveTrigger <em>Active Trigger</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger <em>Active Trigger</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.ActiveTrigger
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger
* @generated
*/
public Adapter createActiveTriggerAdapter() {
@@ -363,13 +363,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.TransitionChain <em>Transition Chain</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.TransitionChain <em>Transition Chain</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.TransitionChain
+ * @see org.eclipse.etrice.core.genmodel.etricegen.TransitionChain
* @generated
*/
public Adapter createTransitionChainAdapter() {
@@ -405,13 +405,13 @@ public class ETriceGenAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.etrice.generator.etricegen.ExpandedActorClass <em>Expanded Actor Class</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass <em>Expanded Actor Class</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.etrice.generator.etricegen.ExpandedActorClass
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass
* @generated
*/
public Adapter createExpandedActorClassAdapter() {
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenResourceFactoryImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenResourceFactoryImpl.java
index b3e36f4e6..de412af3f 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenResourceFactoryImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenResourceFactoryImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.util;
+package org.eclipse.etrice.core.genmodel.etricegen.util;
import org.eclipse.emf.common.util.URI;
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
* <!-- begin-user-doc -->
* The <b>Resource Factory</b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.util.ETriceGenResourceImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.util.ETriceGenResourceImpl
* @generated
*/
public class ETriceGenResourceFactoryImpl extends ResourceFactoryImpl {
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenResourceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenResourceImpl.java
index e0cc86087..cede86d4c 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenResourceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenResourceImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.util;
+package org.eclipse.etrice.core.genmodel.etricegen.util;
import org.eclipse.emf.common.util.URI;
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
* <!-- begin-user-doc -->
* The <b>Resource </b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.util.ETriceGenResourceFactoryImpl
+ * @see org.eclipse.etrice.core.genmodel.etricegen.util.ETriceGenResourceFactoryImpl
* @generated
*/
public class ETriceGenResourceImpl extends XMIResourceImpl {
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
new file mode 100644
index 000000000..dd0a56711
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java
@@ -0,0 +1,535 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.etrice.core.genmodel.etricegen.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger;
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.BindingInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ConnectionInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician;
+import org.eclipse.etrice.core.genmodel.etricegen.ITransitionChainVisitor;
+import org.eclipse.etrice.core.genmodel.etricegen.InstanceBase;
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.SAPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.SPPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.StructureInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
+import org.eclipse.etrice.core.room.ActorClass;
+import org.eclipse.etrice.core.room.ActorContainerClass;
+import org.eclipse.etrice.core.room.RoomClass;
+import org.eclipse.etrice.core.room.StructureClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage
+ * @generated
+ */
+public class ETriceGenSwitch<T> extends Switch<T> {
+ /**
+ * The cached model package
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected static ETriceGenPackage modelPackage;
+
+ /**
+ * Creates an instance of the switch.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ETriceGenSwitch() {
+ if (modelPackage == null) {
+ modelPackage = ETriceGenPackage.eINSTANCE;
+ }
+ }
+
+ /**
+ * Checks whether this is a switch for the given package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @parameter ePackage the package in question.
+ * @return whether this is a switch for the given package.
+ * @generated
+ */
+ @Override
+ protected boolean isSwitchFor(EPackage ePackage) {
+ return ePackage == modelPackage;
+ }
+
+ /**
+ * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the first non-null result returned by a <code>caseXXX</code> call.
+ * @generated
+ */
+ @Override
+ protected T doSwitch(int classifierID, EObject theEObject) {
+ switch (classifierID) {
+ case ETriceGenPackage.ROOT: {
+ Root root = (Root)theEObject;
+ T result = caseRoot(root);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case ETriceGenPackage.INSTANCE_BASE: {
+ InstanceBase instanceBase = (InstanceBase)theEObject;
+ T result = caseInstanceBase(instanceBase);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case ETriceGenPackage.STRUCTURE_INSTANCE: {
+ StructureInstance structureInstance = (StructureInstance)theEObject;
+ T result = caseStructureInstance(structureInstance);
+ if (result == null) result = caseInstanceBase(structureInstance);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case ETriceGenPackage.SUB_SYSTEM_INSTANCE: {
+ SubSystemInstance subSystemInstance = (SubSystemInstance)theEObject;
+ T result = caseSubSystemInstance(subSystemInstance);
+ if (result == null) result = caseStructureInstance(subSystemInstance);
+ if (result == null) result = caseInstanceBase(subSystemInstance);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case ETriceGenPackage.ACTOR_INSTANCE: {
+ ActorInstance actorInstance = (ActorInstance)theEObject;
+ T result = caseActorInstance(actorInstance);
+ if (result == null) result = caseStructureInstance(actorInstance);
+ if (result == null) result = caseInstanceBase(actorInstance);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case ETriceGenPackage.INTERFACE_ITEM_INSTANCE: {
+ InterfaceItemInstance interfaceItemInstance = (InterfaceItemInstance)theEObject;
+ T result = caseInterfaceItemInstance(interfaceItemInstance);
+ if (result == null) result = caseInstanceBase(interfaceItemInstance);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case ETriceGenPackage.PORT_INSTANCE: {
+ PortInstance portInstance = (PortInstance)theEObject;
+ T result = casePortInstance(portInstance);
+ if (result == null) result = caseInterfaceItemInstance(portInstance);
+ if (result == null) result = caseInstanceBase(portInstance);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case ETriceGenPackage.BINDING_INSTANCE: {
+ BindingInstance bindingInstance = (BindingInstance)theEObject;
+ T result = caseBindingInstance(bindingInstance);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case ETriceGenPackage.SAP_INSTANCE: {
+ SAPInstance sapInstance = (SAPInstance)theEObject;
+ T result = caseSAPInstance(sapInstance);
+ if (result == null) result = caseInterfaceItemInstance(sapInstance);
+ if (result == null) result = caseInstanceBase(sapInstance);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case ETriceGenPackage.SPP_INSTANCE: {
+ SPPInstance sppInstance = (SPPInstance)theEObject;
+ T result = caseSPPInstance(sppInstance);
+ if (result == null) result = caseInstanceBase(sppInstance);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case ETriceGenPackage.SERVICE_IMPL_INSTANCE: {
+ ServiceImplInstance serviceImplInstance = (ServiceImplInstance)theEObject;
+ T result = caseServiceImplInstance(serviceImplInstance);
+ if (result == null) result = caseInterfaceItemInstance(serviceImplInstance);
+ if (result == null) result = caseInstanceBase(serviceImplInstance);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case ETriceGenPackage.CONNECTION_INSTANCE: {
+ ConnectionInstance connectionInstance = (ConnectionInstance)theEObject;
+ T result = caseConnectionInstance(connectionInstance);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case ETriceGenPackage.ACTIVE_TRIGGER: {
+ ActiveTrigger activeTrigger = (ActiveTrigger)theEObject;
+ T result = caseActiveTrigger(activeTrigger);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case ETriceGenPackage.TRANSITION_CHAIN: {
+ TransitionChain transitionChain = (TransitionChain)theEObject;
+ T result = caseTransitionChain(transitionChain);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case ETriceGenPackage.EXPANDED_ACTOR_CLASS: {
+ ExpandedActorClass expandedActorClass = (ExpandedActorClass)theEObject;
+ T result = caseExpandedActorClass(expandedActorClass);
+ if (result == null) result = caseActorClass(expandedActorClass);
+ if (result == null) result = caseActorContainerClass(expandedActorClass);
+ if (result == null) result = caseStructureClass(expandedActorClass);
+ if (result == null) result = caseRoomClass(expandedActorClass);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ default: return defaultCase(theEObject);
+ }
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Root</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Root</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseRoot(Root object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Instance Base</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Instance Base</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseInstanceBase(InstanceBase object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Structure Instance</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Structure Instance</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseStructureInstance(StructureInstance object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Sub System Instance</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Sub System Instance</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseSubSystemInstance(SubSystemInstance object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Actor Instance</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Actor Instance</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseActorInstance(ActorInstance object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Interface Item Instance</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Interface Item Instance</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseInterfaceItemInstance(InterfaceItemInstance object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Port Instance</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Port Instance</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T casePortInstance(PortInstance object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Binding Instance</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Binding Instance</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseBindingInstance(BindingInstance object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>SAP Instance</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>SAP Instance</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseSAPInstance(SAPInstance object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>SPP Instance</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>SPP Instance</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseSPPInstance(SPPInstance object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Service Impl Instance</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Service Impl Instance</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseServiceImplInstance(ServiceImplInstance object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Connection Instance</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Connection Instance</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseConnectionInstance(ConnectionInstance object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Active Trigger</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Active Trigger</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseActiveTrigger(ActiveTrigger object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Transition Chain</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Transition Chain</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseTransitionChain(TransitionChain object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>ITransition Chain Visitor</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>ITransition Chain Visitor</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseITransitionChainVisitor(ITransitionChainVisitor object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>IDiagnostician</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>IDiagnostician</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseIDiagnostician(IDiagnostician object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Expanded Actor Class</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Expanded Actor Class</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseExpandedActorClass(ExpandedActorClass object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Class</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Class</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseRoomClass(RoomClass object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Structure Class</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Structure Class</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseStructureClass(StructureClass object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Actor Container Class</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Actor Container Class</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseActorContainerClass(ActorContainerClass object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Actor Class</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Actor Class</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseActorClass(ActorClass object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch, but this is the last case anyway.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+ * @generated
+ */
+ @Override
+ public T defaultCase(EObject object) {
+ return null;
+ }
+
+} //ETriceGenSwitch
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenSwitch.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java.bak
index 0efec7f16..9e2404145 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenSwitch.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java.bak
@@ -4,33 +4,19 @@
*
* $Id$
*/
-package org.eclipse.etrice.generator.etricegen.util;
+package org.eclipse.etrice.core.genmodel.etricegen.util;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
+
import org.eclipse.emf.ecore.util.Switch;
+
+import org.eclipse.etrice.core.genmodel.etricegen.*;
+
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.ActorContainerClass;
import org.eclipse.etrice.core.room.RoomClass;
import org.eclipse.etrice.core.room.StructureClass;
-import org.eclipse.etrice.generator.etricegen.ActiveTrigger;
-import org.eclipse.etrice.generator.etricegen.ActorInstance;
-import org.eclipse.etrice.generator.etricegen.BindingInstance;
-import org.eclipse.etrice.generator.etricegen.ConnectionInstance;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.IDiagnostician;
-import org.eclipse.etrice.generator.etricegen.ITransitionChainVisitor;
-import org.eclipse.etrice.generator.etricegen.InstanceBase;
-import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance;
-import org.eclipse.etrice.generator.etricegen.PortInstance;
-import org.eclipse.etrice.generator.etricegen.Root;
-import org.eclipse.etrice.generator.etricegen.SAPInstance;
-import org.eclipse.etrice.generator.etricegen.SPPInstance;
-import org.eclipse.etrice.generator.etricegen.ServiceImplInstance;
-import org.eclipse.etrice.generator.etricegen.StructureInstance;
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance;
-import org.eclipse.etrice.generator.etricegen.TransitionChain;
/**
* <!-- begin-user-doc -->
@@ -42,7 +28,7 @@ import org.eclipse.etrice.generator.etricegen.TransitionChain;
* until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see org.eclipse.etrice.generator.etricegen.ETriceGenPackage
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage
* @generated
*/
public class ETriceGenSwitch<T> extends Switch<T> {
diff --git a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
index 49e849cbc..20a47ce35 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.2.0.qualifier
Bundle-SymbolicName: org.eclipse.etrice.core.room.ui;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.1.0";visibility:=reexport,
- org.eclipse.etrice.generator;bundle-version="0.1.0",
+ org.eclipse.etrice.core.genmodel;bundle-version="0.2.0",
org.eclipse.ui;bundle-version="3.6.0",
org.eclipse.ui.editors;bundle-version="3.5.0",
org.eclipse.ui.ide;bundle-version="3.5.0",
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/RoomModelValidator.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/RoomModelValidator.java
index 15569a67b..a71964e61 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/RoomModelValidator.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/RoomModelValidator.java
@@ -23,10 +23,10 @@ import org.eclipse.etrice.core.validation.RoomJavaValidator;
import org.eclipse.xtext.validation.Check;
import org.eclipse.xtext.validation.CheckMode;
+import org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician;
import org.eclipse.etrice.core.room.RoomModel;
-import org.eclipse.etrice.generator.base.ILogger;
-import org.eclipse.etrice.generator.builder.GeneratorModelBuilder;
-import org.eclipse.etrice.generator.etricegen.IDiagnostician;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.builder.GeneratorModelBuilder;
public class RoomModelValidator extends RoomJavaValidator implements ILogger {
diff --git a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
index aebeed132..4fc3bfe41 100644
--- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
@@ -5,15 +5,17 @@ Bundle-Vendor: eTrice (Incubation)
Bundle-Version: 0.2.0.qualifier
Bundle-SymbolicName: org.eclipse.etrice.generator.c;singleton:=true
Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.1.0",
- org.eclipse.etrice.generator;bundle-version="0.1.0",
- org.eclipse.emf.mwe2.launch;bundle-version="1.0.1";resolution:=optional,
+Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.2.0",
+ org.eclipse.etrice.core.genmodel;bundle-version="0.2.0",
+ org.eclipse.etrice.generator;bundle-version="0.2.0",
+ org.eclipse.etrice.generator.doc;bundle-version="0.2.0",
org.eclipse.core.resources;bundle-version="3.6.0",
org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.ui.ide;bundle-version="3.7.0",
org.eclipse.xtext.xtend2.lib;bundle-version="2.1.1",
- org.eclipse.etrice.generator.doc;bundle-version="0.1.0"
+ org.eclipse.xtext.generator;bundle-version="2.1.1",
+ org.eclipse.xtext.util;bundle-version="2.1.1"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.etrice.generator.c
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/Main.java b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/Main.java
index f9f8a34ec..2ecb11b77 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/Main.java
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/Main.java
@@ -16,8 +16,8 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.generator.base.AbstractGenerator;
-import org.eclipse.etrice.generator.etricegen.Root;
import org.eclipse.etrice.generator.c.gen.Validator;
import org.eclipse.etrice.generator.c.setup.GeneratorModule;
import org.eclipse.xtext.generator.IGenerator;
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
index 302e740a6..ace6671fc 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
@@ -18,9 +18,9 @@ import com.google.inject.Singleton
import org.eclipse.etrice.core.room.ActorClass
import org.eclipse.etrice.core.room.ActorCommunicationType
import org.eclipse.etrice.core.room.CommunicationType
-import org.eclipse.etrice.generator.base.ILogger
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass
-import org.eclipse.etrice.generator.etricegen.Root
+import org.eclipse.etrice.core.genmodel.base.ILogger
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass
+import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.etrice.generator.generic.RoomExtensions
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java
index d01621945..3340b0822 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java
@@ -26,7 +26,7 @@ import org.eclipse.etrice.core.room.Port;
import org.eclipse.etrice.core.room.RoomClass;
import org.eclipse.etrice.core.room.SAPRef;
import org.eclipse.etrice.core.room.SPPRef;
-import org.eclipse.etrice.generator.base.ILogger;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
import org.eclipse.etrice.generator.base.ITranslationProvider;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend
index 5387da603..ade26b6fc 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend
@@ -16,8 +16,8 @@ package org.eclipse.etrice.generator.c.gen
import com.google.inject.Inject
import com.google.inject.Singleton
import org.eclipse.etrice.core.room.DataClass
-import org.eclipse.etrice.generator.base.ILogger
-import org.eclipse.etrice.generator.etricegen.Root
+import org.eclipse.etrice.core.genmodel.base.ILogger
+import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.generator.generic.ProcedureHelpers
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend
index b0638be0a..7a0f41f70 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend
@@ -16,7 +16,7 @@ package org.eclipse.etrice.generator.c.gen
import com.google.inject.Inject
import com.google.inject.Singleton
import org.eclipse.emf.ecore.resource.Resource
-import org.eclipse.etrice.generator.etricegen.Root
+import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.xtext.generator.IFileSystemAccess
import org.eclipse.xtext.generator.IGenerator
import org.eclipse.etrice.generator.generic.PrepareFileSystem
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
index 8aee50036..4313fa40e 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
@@ -19,8 +19,8 @@ import org.eclipse.etrice.core.room.Message
import org.eclipse.etrice.core.room.ProtocolClass
import org.eclipse.etrice.core.room.CommunicationType
import org.eclipse.etrice.core.room.PrimitiveType
-import org.eclipse.etrice.generator.base.ILogger
-import org.eclipse.etrice.generator.etricegen.Root
+import org.eclipse.etrice.core.genmodel.base.ILogger
+import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.etrice.generator.generic.RoomExtensions
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/StateMachineGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/StateMachineGen.xtend
index 266fdd056..ac0140332 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/StateMachineGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/StateMachineGen.xtend
@@ -15,7 +15,7 @@ package org.eclipse.etrice.generator.c.gen
import com.google.inject.Inject
import com.google.inject.Singleton
import org.eclipse.etrice.core.room.ActorClass
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.generator.generic.GenericStateMachineGenerator
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
index c2321fe57..8004a000d 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
@@ -21,12 +21,12 @@ import org.eclipse.etrice.core.room.SubSystemClass
import org.eclipse.etrice.core.room.CommunicationType
import static extension org.eclipse.etrice.core.room.util.RoomHelpers.*
-import org.eclipse.etrice.generator.base.ILogger
-import org.eclipse.etrice.generator.etricegen.Root
-import org.eclipse.etrice.generator.etricegen.ActorInstance
-import org.eclipse.etrice.generator.etricegen.PortInstance
-import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance
+import org.eclipse.etrice.core.genmodel.base.ILogger
+import org.eclipse.etrice.core.genmodel.etricegen.Root
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.generator.generic.ProcedureHelpers
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.xtend
index 38a8e0448..2d9d666fb 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.xtend
@@ -16,8 +16,8 @@ package org.eclipse.etrice.generator.c.gen
import com.google.inject.Inject
import com.google.inject.Singleton
import org.eclipse.etrice.core.room.SubSystemClass
-import org.eclipse.etrice.generator.etricegen.Root
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance
+import org.eclipse.etrice.core.genmodel.etricegen.Root
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.etrice.generator.generic.RoomExtensions
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/Validator.java b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/Validator.java
index e46f7c165..a478373fc 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/Validator.java
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/Validator.java
@@ -12,7 +12,7 @@
package org.eclipse.etrice.generator.c.gen;
-import org.eclipse.etrice.generator.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
/**
* @author Henrik Rentz-Reichert
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
index 729a8f9bd..d95c034e0 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
@@ -5,6 +5,9 @@ import com.google.inject.Singleton;
import java.util.HashSet;
import java.util.List;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.ActorCommunicationType;
import org.eclipse.etrice.core.room.Annotation;
@@ -18,11 +21,8 @@ import org.eclipse.etrice.core.room.SAPRef;
import org.eclipse.etrice.core.room.SPPRef;
import org.eclipse.etrice.core.room.ServiceImplementation;
import org.eclipse.etrice.core.room.StandardOperation;
-import org.eclipse.etrice.generator.base.ILogger;
import org.eclipse.etrice.generator.c.gen.CExtensions;
import org.eclipse.etrice.generator.c.gen.StateMachineGen;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.Root;
import org.eclipse.etrice.generator.generic.GenericActorClassGenerator;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java
index 37e83eb93..d1a850a2c 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java
@@ -5,13 +5,13 @@ import com.google.inject.Singleton;
import java.util.HashSet;
import java.util.List;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.core.room.Attribute;
import org.eclipse.etrice.core.room.DataClass;
import org.eclipse.etrice.core.room.DetailCode;
import org.eclipse.etrice.core.room.StandardOperation;
-import org.eclipse.etrice.generator.base.ILogger;
import org.eclipse.etrice.generator.c.gen.CExtensions;
-import org.eclipse.etrice.generator.etricegen.Root;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java
index 83d65c261..b1947492b 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java
@@ -5,12 +5,12 @@ import com.google.inject.Singleton;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.generator.c.gen.ActorClassGen;
import org.eclipse.etrice.generator.c.gen.DataClassGen;
import org.eclipse.etrice.generator.c.gen.ProtocolClassGen;
import org.eclipse.etrice.generator.c.gen.SubSystemClassGen;
import org.eclipse.etrice.generator.c.gen.SubSystemRunnerGen;
-import org.eclipse.etrice.generator.etricegen.Root;
import org.eclipse.etrice.generator.generic.PrepareFileSystem;
import org.eclipse.xtext.generator.IFileSystemAccess;
import org.eclipse.xtext.generator.IGenerator;
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
index fabb3af52..d77449e7e 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
@@ -5,6 +5,8 @@ import com.google.inject.Singleton;
import java.util.HashSet;
import java.util.List;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.core.room.Attribute;
import org.eclipse.etrice.core.room.CommunicationType;
import org.eclipse.etrice.core.room.DataClass;
@@ -18,9 +20,7 @@ import org.eclipse.etrice.core.room.PrimitiveType;
import org.eclipse.etrice.core.room.ProtocolClass;
import org.eclipse.etrice.core.room.RefableType;
import org.eclipse.etrice.core.room.VarDecl;
-import org.eclipse.etrice.generator.base.ILogger;
import org.eclipse.etrice.generator.c.gen.CExtensions;
-import org.eclipse.etrice.generator.etricegen.Root;
import org.eclipse.etrice.generator.generic.GenericProtocolClassGenerator;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java
index e54d9a35c..901216081 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java
@@ -3,9 +3,9 @@ package org.eclipse.etrice.generator.c.gen;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.List;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.State;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
import org.eclipse.etrice.generator.generic.GenericStateMachineGenerator;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtext.xbase.lib.IntegerExtensions;
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
index 368617a4e..5c0466c27 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
@@ -7,6 +7,13 @@ import java.util.HashMap;
import java.util.List;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.ActorCommunicationType;
import org.eclipse.etrice.core.room.Attribute;
@@ -23,14 +30,7 @@ import org.eclipse.etrice.core.room.RefableType;
import org.eclipse.etrice.core.room.StandardOperation;
import org.eclipse.etrice.core.room.SubSystemClass;
import org.eclipse.etrice.core.room.util.RoomHelpers;
-import org.eclipse.etrice.generator.base.ILogger;
import org.eclipse.etrice.generator.c.gen.CExtensions;
-import org.eclipse.etrice.generator.etricegen.ActorInstance;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance;
-import org.eclipse.etrice.generator.etricegen.PortInstance;
-import org.eclipse.etrice.generator.etricegen.Root;
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.generic.TypeHelpers;
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java
index 1e5f170d7..c2116359d 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java
@@ -3,9 +3,9 @@ package org.eclipse.etrice.generator.c.gen;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
import org.eclipse.etrice.core.room.SubSystemClass;
-import org.eclipse.etrice.generator.etricegen.Root;
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
import org.eclipse.xtext.xbase.lib.StringExtensions;
diff --git a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
index 4bbb0467f..b24f40370 100644
--- a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
@@ -6,13 +6,14 @@ Bundle-Version: 0.2.0.qualifier
Bundle-SymbolicName: org.eclipse.etrice.generator.doc;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.1.0",
+ org.eclipse.etrice.core.genmodel;bundle-version="0.2.0",
org.eclipse.etrice.generator;bundle-version="0.1.0",
- org.eclipse.emf.mwe2.launch;bundle-version="1.0.1";resolution:=optional,
org.eclipse.core.resources;bundle-version="3.6.0",
org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.ui.ide;bundle-version="3.7.0",
- org.eclipse.xtext.xtend2.lib;bundle-version="2.1.1"
+ org.eclipse.xtext.xtend2.lib;bundle-version="2.1.1",
+ org.eclipse.xtext.generator;bundle-version="2.1.1"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.etrice.generator.doc;uses:="org.eclipse.etrice.generator.base",
diff --git a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/Main.java b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/Main.java
index ab1d6e1a5..c49cd5ffa 100644
--- a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/Main.java
+++ b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/Main.java
@@ -16,9 +16,9 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.generator.base.AbstractGenerator;
import org.eclipse.etrice.generator.doc.setup.GeneratorModule;
-import org.eclipse.etrice.generator.etricegen.Root;
import org.eclipse.etrice.generator.doc.gen.InstanceDiagramGen;
import org.eclipse.xtext.generator.IGenerator;
diff --git a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/DocGen.xtend b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/DocGen.xtend
index 8f92d1444..955df6523 100644
--- a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/DocGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/DocGen.xtend
@@ -25,9 +25,9 @@ import org.eclipse.etrice.core.room.DataClass
import org.eclipse.etrice.core.room.State
import org.eclipse.etrice.core.room.Attribute
import org.eclipse.etrice.core.room.StandardOperation
-import org.eclipse.etrice.generator.base.ILogger
+import org.eclipse.etrice.core.genmodel.base.ILogger
import org.eclipse.etrice.generator.base.IRoomGenerator
-import org.eclipse.etrice.generator.etricegen.Root
+import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.etrice.generator.generic.RoomExtensions
diff --git a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.xtend b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.xtend
index 187035850..a59171a03 100644
--- a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.xtend
@@ -15,12 +15,12 @@ package org.eclipse.etrice.generator.doc.gen
import com.google.inject.Inject
import com.google.inject.Singleton
import org.eclipse.etrice.core.room.SubSystemClass
-import org.eclipse.etrice.generator.base.ILogger
+import org.eclipse.etrice.core.genmodel.base.ILogger
import org.eclipse.etrice.generator.base.IRoomGenerator
-import org.eclipse.etrice.generator.etricegen.ActorInstance
-import org.eclipse.etrice.generator.etricegen.Root
-import org.eclipse.etrice.generator.etricegen.StructureInstance
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance
+import org.eclipse.etrice.core.genmodel.etricegen.Root
+import org.eclipse.etrice.core.genmodel.etricegen.StructureInstance
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import static java.lang.Runtime.*
import org.eclipse.etrice.generator.generic.RoomExtensions
diff --git a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/MainGen.xtend b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/MainGen.xtend
index 326dc0976..5111c6f41 100644
--- a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/MainGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/MainGen.xtend
@@ -15,7 +15,7 @@ package org.eclipse.etrice.generator.doc.gen
import com.google.inject.Inject
import com.google.inject.Singleton
import org.eclipse.emf.ecore.resource.Resource
-import org.eclipse.etrice.generator.etricegen.Root
+import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.xtext.generator.IFileSystemAccess
import org.eclipse.xtext.generator.IGenerator
import org.eclipse.etrice.generator.generic.PrepareFileSystem
diff --git a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java
index 59829145e..6be0516a7 100644
--- a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java
+++ b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java
@@ -5,6 +5,8 @@ import com.google.inject.Singleton;
import java.io.File;
import java.util.List;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.Attribute;
import org.eclipse.etrice.core.room.ChoicePoint;
@@ -20,9 +22,7 @@ import org.eclipse.etrice.core.room.State;
import org.eclipse.etrice.core.room.StateGraph;
import org.eclipse.etrice.core.room.SubSystemClass;
import org.eclipse.etrice.core.room.VarDecl;
-import org.eclipse.etrice.generator.base.ILogger;
import org.eclipse.etrice.generator.base.IRoomGenerator;
-import org.eclipse.etrice.generator.etricegen.Root;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
import org.eclipse.xtext.xbase.lib.BooleanExtensions;
diff --git a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java
index 127d7dd01..deb19cedc 100644
--- a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java
+++ b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java
@@ -4,15 +4,15 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.StructureInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.RoomModel;
import org.eclipse.etrice.core.room.SubSystemClass;
-import org.eclipse.etrice.generator.base.ILogger;
import org.eclipse.etrice.generator.base.IRoomGenerator;
-import org.eclipse.etrice.generator.etricegen.ActorInstance;
-import org.eclipse.etrice.generator.etricegen.Root;
-import org.eclipse.etrice.generator.etricegen.StructureInstance;
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
import org.eclipse.xtext.xbase.lib.StringExtensions;
diff --git a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java
index 881a7122a..9ea2869c4 100644
--- a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java
+++ b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java
@@ -5,9 +5,9 @@ import com.google.inject.Singleton;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.generator.doc.gen.DocGen;
import org.eclipse.etrice.generator.doc.gen.InstanceDiagramGen;
-import org.eclipse.etrice.generator.etricegen.Root;
import org.eclipse.etrice.generator.generic.PrepareFileSystem;
import org.eclipse.xtext.generator.IFileSystemAccess;
import org.eclipse.xtext.generator.IGenerator;
diff --git a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
index 51f0b15d7..9ecd45b4f 100644
--- a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
@@ -6,14 +6,16 @@ Bundle-Version: 0.2.0.qualifier
Bundle-SymbolicName: org.eclipse.etrice.generator.java;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.1.0",
+ org.eclipse.etrice.core.genmodel;bundle-version="0.2.0",
org.eclipse.etrice.generator;bundle-version="0.1.0",
- org.eclipse.emf.mwe2.launch;bundle-version="1.0.1";resolution:=optional,
org.eclipse.core.resources;bundle-version="3.6.0",
org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.ui.ide;bundle-version="3.7.0",
org.eclipse.xtext.xtend2.lib;bundle-version="2.1.1",
- org.eclipse.etrice.generator.doc;bundle-version="0.1.0"
+ org.eclipse.etrice.generator.doc;bundle-version="0.1.0",
+ org.eclipse.xtext.generator;bundle-version="2.1.1",
+ org.eclipse.xtext.util;bundle-version="2.1.1"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.etrice.generator.java
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/Main.java b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/Main.java
index c08e4af47..c7af9e45e 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/Main.java
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/Main.java
@@ -16,8 +16,8 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.generator.base.AbstractGenerator;
-import org.eclipse.etrice.generator.etricegen.Root;
import org.eclipse.etrice.generator.java.gen.Validator;
import org.eclipse.etrice.generator.java.setup.GeneratorModule;
import org.eclipse.xtext.generator.IGenerator;
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend
index 260af5753..aa8bf19fe 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend
@@ -15,9 +15,9 @@ package org.eclipse.etrice.generator.java.gen
import com.google.inject.Inject
import com.google.inject.Singleton
import org.eclipse.etrice.core.room.ActorClass
-import org.eclipse.etrice.generator.base.ILogger
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass
-import org.eclipse.etrice.generator.etricegen.Root
+import org.eclipse.etrice.core.genmodel.base.ILogger
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass
+import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import static extension org.eclipse.etrice.core.room.util.RoomHelpers.*
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend
index 76f74adbe..adcb1c1bc 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend
@@ -20,8 +20,8 @@ import org.eclipse.etrice.core.room.DataClass
import org.eclipse.etrice.core.room.ComplexType
import static extension org.eclipse.etrice.core.room.util.RoomHelpers.*
-import org.eclipse.etrice.generator.base.ILogger
-import org.eclipse.etrice.generator.etricegen.Root
+import org.eclipse.etrice.core.genmodel.base.ILogger
+import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.generator.generic.ProcedureHelpers
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaTranslationProvider.java b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaTranslationProvider.java
index 774d6a712..4efd798e6 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaTranslationProvider.java
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaTranslationProvider.java
@@ -19,7 +19,7 @@ import org.eclipse.etrice.core.room.DetailCode;
import org.eclipse.etrice.core.room.InterfaceItem;
import org.eclipse.etrice.core.room.Message;
import org.eclipse.etrice.generator.base.DefaultTranslationProvider;
-import org.eclipse.etrice.generator.base.ILogger;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/MainGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/MainGen.xtend
index 0a903eb03..61f7b82f2 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/MainGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/MainGen.xtend
@@ -15,7 +15,7 @@ package org.eclipse.etrice.generator.java.gen
import com.google.inject.Inject
import com.google.inject.Singleton
import org.eclipse.emf.ecore.resource.Resource
-import org.eclipse.etrice.generator.etricegen.Root
+import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.xtext.generator.IFileSystemAccess
import org.eclipse.xtext.generator.IGenerator
import org.eclipse.etrice.generator.generic.PrepareFileSystem
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend
index 8cd5a4abb..c333188b3 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend
@@ -18,8 +18,8 @@ import org.eclipse.etrice.core.room.Message
import org.eclipse.etrice.core.room.ProtocolClass
import org.eclipse.etrice.core.room.PrimitiveType
import org.eclipse.etrice.core.room.DataClass
-import org.eclipse.etrice.generator.base.ILogger
-import org.eclipse.etrice.generator.etricegen.Root
+import org.eclipse.etrice.core.genmodel.base.ILogger
+import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.etrice.generator.generic.RoomExtensions
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/StateMachineGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/StateMachineGen.xtend
index 8cdc38747..f3bf58525 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/StateMachineGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/StateMachineGen.xtend
@@ -15,7 +15,7 @@ package org.eclipse.etrice.generator.java.gen
import com.google.inject.Inject
import com.google.inject.Singleton
import org.eclipse.etrice.core.room.ActorClass
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.generator.generic.GenericStateMachineGenerator
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend
index 36175f93a..54a6449ba 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend
@@ -15,9 +15,9 @@ package org.eclipse.etrice.generator.java.gen
import com.google.inject.Inject
import com.google.inject.Singleton
import org.eclipse.etrice.core.room.SubSystemClass
-import org.eclipse.etrice.generator.base.ILogger
-import org.eclipse.etrice.generator.etricegen.Root
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance
+import org.eclipse.etrice.core.genmodel.base.ILogger
+import org.eclipse.etrice.core.genmodel.etricegen.Root
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.generator.generic.ProcedureHelpers
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.xtend
index e89475d50..69dba9085 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.xtend
@@ -15,8 +15,8 @@ package org.eclipse.etrice.generator.java.gen
import com.google.inject.Inject
import com.google.inject.Singleton
import org.eclipse.etrice.core.room.SubSystemClass
-import org.eclipse.etrice.generator.etricegen.Root
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance
+import org.eclipse.etrice.core.genmodel.etricegen.Root
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.etrice.generator.generic.RoomExtensions
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/Validator.java b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/Validator.java
index e57a1c515..f5276673c 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/Validator.java
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/Validator.java
@@ -12,8 +12,8 @@
package org.eclipse.etrice.generator.java.gen;
-import org.eclipse.etrice.generator.base.ILogger;
-import org.eclipse.etrice.generator.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
index f3a9d8815..54ad9be0b 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
@@ -4,6 +4,9 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.List;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.Attribute;
import org.eclipse.etrice.core.room.DetailCode;
@@ -15,9 +18,6 @@ import org.eclipse.etrice.core.room.SPPRef;
import org.eclipse.etrice.core.room.ServiceImplementation;
import org.eclipse.etrice.core.room.StandardOperation;
import org.eclipse.etrice.core.room.util.RoomHelpers;
-import org.eclipse.etrice.generator.base.ILogger;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.Root;
import org.eclipse.etrice.generator.generic.GenericActorClassGenerator;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java
index 5b2db7f7d..459734e95 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java
@@ -4,6 +4,8 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.List;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.core.room.Attribute;
import org.eclipse.etrice.core.room.ComplexType;
import org.eclipse.etrice.core.room.DataClass;
@@ -13,8 +15,6 @@ import org.eclipse.etrice.core.room.RefableType;
import org.eclipse.etrice.core.room.RoomModel;
import org.eclipse.etrice.core.room.StandardOperation;
import org.eclipse.etrice.core.room.util.RoomHelpers;
-import org.eclipse.etrice.generator.base.ILogger;
-import org.eclipse.etrice.generator.etricegen.Root;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.generic.TypeHelpers;
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java
index 090f20e7a..e03ec7cd6 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java
@@ -5,7 +5,7 @@ import com.google.inject.Singleton;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.etrice.generator.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.generator.generic.PrepareFileSystem;
import org.eclipse.etrice.generator.java.gen.ActorClassGen;
import org.eclipse.etrice.generator.java.gen.DataClassGen;
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java
index 7fb08aaf7..34bbe285d 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java
@@ -4,6 +4,8 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.List;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.core.room.Attribute;
import org.eclipse.etrice.core.room.DataClass;
import org.eclipse.etrice.core.room.DataType;
@@ -17,8 +19,6 @@ import org.eclipse.etrice.core.room.ProtocolClass;
import org.eclipse.etrice.core.room.RefableType;
import org.eclipse.etrice.core.room.RoomModel;
import org.eclipse.etrice.core.room.VarDecl;
-import org.eclipse.etrice.generator.base.ILogger;
-import org.eclipse.etrice.generator.etricegen.Root;
import org.eclipse.etrice.generator.generic.GenericProtocolClassGenerator;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java
index 37bfe72db..4854aa8dc 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java
@@ -3,9 +3,9 @@ package org.eclipse.etrice.generator.java.gen;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.List;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.State;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
import org.eclipse.etrice.generator.generic.GenericStateMachineGenerator;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtext.xtend2.lib.StringConcatenation;
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java
index 237e29755..652c34c40 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java
@@ -4,17 +4,17 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.DetailCode;
import org.eclipse.etrice.core.room.LogicalThread;
import org.eclipse.etrice.core.room.RoomModel;
import org.eclipse.etrice.core.room.SubSystemClass;
-import org.eclipse.etrice.generator.base.ILogger;
import org.eclipse.etrice.generator.base.Indexed;
-import org.eclipse.etrice.generator.etricegen.ActorInstance;
-import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance;
-import org.eclipse.etrice.generator.etricegen.Root;
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.java.gen.JavaExtensions;
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java
index 8d2624715..e1916f03d 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java
@@ -3,9 +3,9 @@ package org.eclipse.etrice.generator.java.gen;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
import org.eclipse.etrice.core.room.SubSystemClass;
-import org.eclipse.etrice.generator.etricegen.Root;
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
import org.eclipse.xtext.xbase.lib.StringExtensions;
diff --git a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
index d3b9fb263..53207e9f2 100644
--- a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
@@ -6,30 +6,10 @@ Bundle-Version: 0.2.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: eTrice (Incubation)
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.etrice.generator,
- org.eclipse.etrice.generator.base,
- org.eclipse.etrice.generator.builder;uses:="org.eclipse.emf.ecore,org.eclipse.etrice.generator.etricegen",
- org.eclipse.etrice.generator.etricegen;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util,org.eclipse.etrice.core.room",
- org.eclipse.etrice.generator.etricegen.impl;
- uses:="org.eclipse.emf.ecore,
- org.eclipse.emf.common.util,
- org.eclipse.etrice.core.room.impl,
- org.eclipse.etrice.core.room,
- org.eclipse.etrice.generator.etricegen,
- org.eclipse.emf.ecore.impl,
- org.eclipse.emf.common.notify",
- org.eclipse.etrice.generator.etricegen.util;
- uses:="org.eclipse.emf.ecore.xmi.impl,
- org.eclipse.emf.ecore.resource,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common.util,
- org.eclipse.emf.common.notify.impl,
- org.eclipse.etrice.core.room,
- org.eclipse.etrice.generator.etricegen,
- org.eclipse.emf.ecore.resource.impl,
- org.eclipse.emf.common.notify",
+Export-Package: org.eclipse.etrice.generator.base,
org.eclipse.etrice.generator.generic
Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.1.0",
+ org.eclipse.etrice.core.genmodel;bundle-version="0.2.0",
org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.emf.ecore;bundle-version="2.6.0";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",
diff --git a/plugins/org.eclipse.etrice.generator/plugin.xml b/plugins/org.eclipse.etrice.generator/plugin.xml
index d9f39f2e7..f78f6adc5 100644
--- a/plugins/org.eclipse.etrice.generator/plugin.xml
+++ b/plugins/org.eclipse.etrice.generator/plugin.xml
@@ -10,12 +10,6 @@
<plugin>
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.eclipse.org/etrice/generator"
- class="org.eclipse.etrice.generator.etricegen.ETriceGenPackage"
- genModel="model/etricegen.genmodel"/>
- </extension>
</plugin>
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java
index c118978f2..99687aec0 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java
@@ -25,9 +25,9 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.etrice.core.room.RoomModel;
import org.eclipse.etrice.core.scoping.PlatformRelativeUriResolver;
-import org.eclipse.etrice.generator.builder.GeneratorModelBuilder;
-import org.eclipse.etrice.generator.etricegen.IDiagnostician;
-import org.eclipse.etrice.generator.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.builder.GeneratorModelBuilder;
+import org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.xtext.diagnostics.Severity;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
import org.eclipse.xtext.util.CancelIndicator;
@@ -107,7 +107,7 @@ public abstract class AbstractGenerator {
protected void setupRoomModel() {
Injector roomInjector = new org.eclipse.etrice.core.RoomStandaloneSetup().createInjectorAndDoEMFRegistration();
validator = roomInjector.getInstance(IResourceValidator.class);
- org.eclipse.etrice.generator.SetupGenerator.doSetup();
+ org.eclipse.etrice.core.genmodel.SetupGenmodel.doSetup();
}
/**
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/CodegenHelpers.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/CodegenHelpers.java
index d4fa7784e..d6cbdb141 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/CodegenHelpers.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/CodegenHelpers.java
@@ -16,7 +16,7 @@ import org.eclipse.etrice.core.naming.RoomNameProvider;
import org.eclipse.etrice.core.room.State;
import org.eclipse.etrice.core.room.StateGraphNode;
import org.eclipse.etrice.core.room.Transition;
-import org.eclipse.etrice.generator.etricegen.TransitionChain;
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
/**
* @author Henrik Rentz-Reichert
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/Diagnostician.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/Diagnostician.java
index 2cf016d82..9234e9c2e 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/Diagnostician.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/Diagnostician.java
@@ -15,7 +15,7 @@ package org.eclipse.etrice.generator.base;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.etrice.core.naming.RoomNameProvider;
-import org.eclipse.etrice.generator.etricegen.IDiagnostician;
+import org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician;
import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/GeneratorBaseModule.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/GeneratorBaseModule.java
index 026c03345..1eecf2d2f 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/GeneratorBaseModule.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/GeneratorBaseModule.java
@@ -14,7 +14,8 @@ package org.eclipse.etrice.generator.base;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.etrice.generator.etricegen.IDiagnostician;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician;
import com.google.inject.Binder;
import com.google.inject.Module;
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ILineOutputLogger.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ILineOutputLogger.java
index 622f24af4..89e709cd7 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ILineOutputLogger.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ILineOutputLogger.java
@@ -12,6 +12,8 @@
package org.eclipse.etrice.generator.base;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+
/**
* An ILineOutputLogger will send its output to the specified {@link org.eclipse.etrice.generator.base.ILogger ILogger} if one is set.
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/IRoomGenerator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/IRoomGenerator.java
index d6a830ac6..37d8e4e2d 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/IRoomGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/IRoomGenerator.java
@@ -12,7 +12,7 @@
package org.eclipse.etrice.generator.base;
-import org.eclipse.etrice.generator.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
/**
* @author Henrik Rentz-Reichert
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ActiveTriggerValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ActiveTriggerValidator.java
deleted file mode 100644
index d2968748c..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ActiveTriggerValidator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-import org.eclipse.etrice.core.room.InterfaceItem;
-import org.eclipse.etrice.core.room.Message;
-import org.eclipse.etrice.core.room.TriggeredTransition;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.ActiveTrigger}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ActiveTriggerValidator {
- boolean validate();
-
- boolean validateMsg(Message value);
- boolean validateIfitem(InterfaceItem value);
- boolean validateTrigger(String value);
- boolean validateTransitions(EList<TriggeredTransition> value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ActorInstanceValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ActorInstanceValidator.java
deleted file mode 100644
index ad41c5aeb..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ActorInstanceValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-import org.eclipse.etrice.core.room.ActorClass;
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.ActorInstance}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ActorInstanceValidator {
- boolean validate();
-
- boolean validateActorClass(ActorClass value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/BindingInstanceValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/BindingInstanceValidator.java
deleted file mode 100644
index 2149d9a86..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/BindingInstanceValidator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.etrice.generator.etricegen.PortInstance;
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.BindingInstance}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface BindingInstanceValidator {
- boolean validate();
-
- boolean validatePorts(EList<PortInstance> value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ConnectionInstanceValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ConnectionInstanceValidator.java
deleted file mode 100644
index 9708ba934..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ConnectionInstanceValidator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-import org.eclipse.etrice.core.room.LayerConnection;
-import org.eclipse.etrice.generator.etricegen.ActorInstance;
-import org.eclipse.etrice.generator.etricegen.SPPInstance;
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.ConnectionInstance}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ConnectionInstanceValidator {
- boolean validate();
-
- boolean validateFromAI(ActorInstance value);
- boolean validateFromSPP(SPPInstance value);
- boolean validateToSPP(SPPInstance value);
- boolean validateConnection(LayerConnection value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/CounterValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/CounterValidator.java
deleted file mode 100644
index 8b3346e75..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/CounterValidator.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.Counter}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface CounterValidator {
- boolean validate();
-
- boolean validateCounter(int value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ExpandedActorClassValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ExpandedActorClassValidator.java
deleted file mode 100644
index 93e0916de..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ExpandedActorClassValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-import org.eclipse.etrice.core.room.ActorClass;
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.ExpandedActorClass}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ExpandedActorClassValidator {
- boolean validate();
-
- boolean validateActorClass(ActorClass value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/IDiagnosticianValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/IDiagnosticianValidator.java
deleted file mode 100644
index ef81d4840..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/IDiagnosticianValidator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-
-/**
- * A sample validator interface for {@link IDiagnostician}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface IDiagnosticianValidator {
- boolean validate();
-
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ITransitionChainVisitorValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ITransitionChainVisitorValidator.java
deleted file mode 100644
index d8395694d..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ITransitionChainVisitorValidator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-
-/**
- * A sample validator interface for {@link ITransitionChainVisitor}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ITransitionChainVisitorValidator {
- boolean validate();
-
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/InstanceBaseValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/InstanceBaseValidator.java
deleted file mode 100644
index 7965b00c4..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/InstanceBaseValidator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.InstanceBase}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface InstanceBaseValidator {
- boolean validate();
-
- boolean validateName(String value);
- boolean validatePath(String value);
- boolean validateObjId(int value);
-
- boolean validateThreadId(int value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/InterfaceItemInstanceValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/InterfaceItemInstanceValidator.java
deleted file mode 100644
index 9fd44a9bb..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/InterfaceItemInstanceValidator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance;
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.InterfaceItemInstance}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface InterfaceItemInstanceValidator {
- boolean validate();
-
- boolean validatePeers(EList<InterfaceItemInstance> value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/PortInstanceValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/PortInstanceValidator.java
deleted file mode 100644
index 32d3248ae..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/PortInstanceValidator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-
-import org.eclipse.etrice.core.room.Port;
-import org.eclipse.etrice.generator.etricegen.BindingInstance;
-import org.eclipse.etrice.generator.etricegen.PortKind;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.PortInstance}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface PortInstanceValidator {
- boolean validate();
-
- boolean validatePort(Port value);
- boolean validateKind(PortKind value);
- boolean validateBindings(EList<BindingInstance> value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/RootValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/RootValidator.java
deleted file mode 100644
index 9e8e83888..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/RootValidator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-
-import org.eclipse.etrice.core.room.ActorClass;
-import org.eclipse.etrice.core.room.DataClass;
-import org.eclipse.etrice.core.room.ProtocolClass;
-import org.eclipse.etrice.core.room.RoomModel;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.SubSystemInstance;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.Root}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface RootValidator {
- boolean validate();
-
- boolean validateSubSystems(EList<SubSystemInstance> value);
-
- boolean validateComponents(EList<SubSystemInstance> value);
- boolean validateModels(EList<RoomModel> value);
- boolean validateXpActorClasses(EList<ExpandedActorClass> value);
- boolean validateUsedDataClasses(EList<DataClass> value);
- boolean validateUsedProtocolClasses(EList<ProtocolClass> value);
- boolean validateUsedActorClasses(EList<ActorClass> value);
- boolean validateUsedRoomModels(EList<RoomModel> value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/SAPInstanceValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/SAPInstanceValidator.java
deleted file mode 100644
index f726a31fb..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/SAPInstanceValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-import org.eclipse.etrice.core.room.SAPRef;
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.SAPInstance}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface SAPInstanceValidator {
- boolean validate();
-
- boolean validateSap(SAPRef value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/SPPInstanceValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/SPPInstanceValidator.java
deleted file mode 100644
index ca73aeca0..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/SPPInstanceValidator.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-
-import org.eclipse.etrice.core.room.SPPRef;
-import org.eclipse.etrice.generator.etricegen.ConnectionInstance;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.SPPInstance}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface SPPInstanceValidator {
- boolean validate();
-
- boolean validateSpp(SPPRef value);
- boolean validateIncoming(EList<ConnectionInstance> value);
- boolean validateOutgoing(ConnectionInstance value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ServiceImplInstanceValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ServiceImplInstanceValidator.java
deleted file mode 100644
index baeed4d7b..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/ServiceImplInstanceValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-import org.eclipse.etrice.core.room.ServiceImplementation;
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.ServiceImplInstance}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ServiceImplInstanceValidator {
- boolean validate();
-
- boolean validateSvcImpl(ServiceImplementation value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/StructureInstanceValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/StructureInstanceValidator.java
deleted file mode 100644
index ca81b4ebb..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/StructureInstanceValidator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.etrice.generator.etricegen.ActorInstance;
-import org.eclipse.etrice.generator.etricegen.BindingInstance;
-import org.eclipse.etrice.generator.etricegen.ConnectionInstance;
-import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance;
-import org.eclipse.etrice.generator.etricegen.PortInstance;
-import org.eclipse.etrice.generator.etricegen.SAPInstance;
-import org.eclipse.etrice.generator.etricegen.SPPInstance;
-import org.eclipse.etrice.generator.etricegen.ServiceImplInstance;
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.StructureInstance}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface StructureInstanceValidator {
- boolean validate();
-
- boolean validateInstances(EList<ActorInstance> value);
- boolean validatePorts(EList<PortInstance> value);
- boolean validateSaps(EList<SAPInstance> value);
- boolean validateSpps(EList<SPPInstance> value);
- boolean validateServices(EList<ServiceImplInstance> value);
- boolean validateBindings(EList<BindingInstance> value);
- boolean validateConnections(EList<ConnectionInstance> value);
- boolean validateAllContainedInstances(EList<ActorInstance> value);
- boolean validateOrderedIfItemInstances(EList<InterfaceItemInstance> value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/SubSystemInstanceValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/SubSystemInstanceValidator.java
deleted file mode 100644
index 851c60f2b..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/SubSystemInstanceValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-import org.eclipse.etrice.core.room.SubSystemClass;
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.SubSystemInstance}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface SubSystemInstanceValidator {
- boolean validate();
-
- boolean validateSubSystemClass(SubSystemClass value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/TransitionChainValidator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/TransitionChainValidator.java
deleted file mode 100644
index bc4453d6b..000000000
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/validation/TransitionChainValidator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.etrice.generator.etricegen.validation;
-
-import org.eclipse.etrice.core.room.Transition;
-import org.eclipse.etrice.core.room.TriggeredTransition;
-
-/**
- * A sample validator interface for {@link org.eclipse.etrice.generator.etricegen.TransitionChain}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface TransitionChainValidator {
- boolean validate();
-
- boolean validateTransition(Transition value);
-
- boolean validateSkipEntry(boolean value);
-
- boolean validateTransition(TriggeredTransition value);
-}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/AbstractTransitionChainGenerator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/AbstractTransitionChainGenerator.java
index 8d0e3527b..4b2a84d1b 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/AbstractTransitionChainGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/AbstractTransitionChainGenerator.java
@@ -12,6 +12,8 @@
package org.eclipse.etrice.generator.generic;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
import org.eclipse.etrice.core.room.InitialTransition;
import org.eclipse.etrice.core.room.Message;
import org.eclipse.etrice.core.room.MessageFromIf;
@@ -21,8 +23,6 @@ import org.eclipse.etrice.core.room.TriggeredTransition;
import org.eclipse.etrice.core.room.VarDecl;
import org.eclipse.etrice.generator.base.AbstractGenerator;
import org.eclipse.etrice.generator.base.DetailCodeTranslator;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.TransitionChain;
/**
* base class for
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.xtend
index 1d50548c3..009b82d1d 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.xtend
@@ -15,7 +15,7 @@ package org.eclipse.etrice.generator.generic
import com.google.inject.Inject
import java.util.ArrayList
import org.eclipse.etrice.core.room.ActorClass
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.xtext.util.Pair
import static org.eclipse.xtext.util.Tuples.*
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend
index 89bade879..e2d872771 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend
@@ -22,8 +22,8 @@ import org.eclipse.etrice.core.room.Transition
import org.eclipse.etrice.core.room.GuardedTransition
import org.eclipse.etrice.core.room.TriggeredTransition
import org.eclipse.etrice.core.room.NonInitialTransition
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass
-import org.eclipse.etrice.generator.etricegen.ActiveTrigger
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass
+import org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.generator.base.DetailCodeTranslator
import org.eclipse.etrice.generator.base.ITranslationProvider
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/PrepareFileSystem.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/PrepareFileSystem.xtend
index ecf1c8d3f..874a6170d 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/PrepareFileSystem.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/PrepareFileSystem.xtend
@@ -18,8 +18,8 @@ import java.io.File
import java.util.HashSet
import java.util.Set
import org.eclipse.emf.ecore.resource.Resource
-import org.eclipse.etrice.generator.base.ILogger
-import org.eclipse.etrice.generator.etricegen.Root
+import org.eclipse.etrice.core.genmodel.base.ILogger
+import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.etrice.generator.generic.RoomExtensions
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend
index b4fe81b0d..b47676dbc 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend
@@ -25,7 +25,7 @@ import org.eclipse.etrice.core.room.ComplexType
import static extension org.eclipse.etrice.core.room.util.RoomHelpers.*
import org.eclipse.etrice.generator.base.DetailCodeTranslator
-import org.eclipse.etrice.generator.base.ILogger
+import org.eclipse.etrice.core.genmodel.base.ILogger
import org.eclipse.etrice.generator.base.ITranslationProvider
import org.eclipse.emf.common.util.EList
import org.eclipse.etrice.core.room.RefableType
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend
index 8097bdbba..ddf596992 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend
@@ -44,13 +44,13 @@ import org.eclipse.etrice.core.room.TransitionPoint
import org.eclipse.etrice.core.room.Trigger
import org.eclipse.etrice.core.room.RoomClass
import org.eclipse.etrice.core.room.RoomModel
-import org.eclipse.etrice.generator.etricegen.ActiveTrigger
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass
-import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance
-import org.eclipse.etrice.generator.etricegen.PortInstance
-import org.eclipse.etrice.generator.etricegen.ServiceImplInstance
-import org.eclipse.etrice.generator.etricegen.SAPInstance
-import org.eclipse.etrice.generator.etricegen.TransitionChain
+import org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance
+import org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance
+import org.eclipse.etrice.core.genmodel.etricegen.SAPInstance
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain
import org.eclipse.etrice.generator.base.DetailCodeTranslator
import static extension org.eclipse.etrice.generator.base.CodegenHelpers.*
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TransitionChainVisitor.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TransitionChainVisitor.java
index bcbc84b16..7a590e925 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TransitionChainVisitor.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TransitionChainVisitor.java
@@ -12,6 +12,8 @@
package org.eclipse.etrice.generator.generic;
+import org.eclipse.etrice.core.genmodel.etricegen.ITransitionChainVisitor;
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
import org.eclipse.etrice.core.room.CPBranchTransition;
import org.eclipse.etrice.core.room.ContinuationTransition;
import org.eclipse.etrice.core.room.GuardedTransition;
@@ -21,13 +23,11 @@ import org.eclipse.etrice.core.room.Transition;
import org.eclipse.etrice.core.room.TriggeredTransition;
import org.eclipse.etrice.generator.base.CodegenHelpers;
import org.eclipse.etrice.generator.base.DetailCodeTranslator;
-import org.eclipse.etrice.generator.etricegen.ITransitionChainVisitor;
-import org.eclipse.etrice.generator.etricegen.TransitionChain;
import com.google.inject.Inject;
/**
- * Implementation of the {@link org.eclipse.etrice.generator.etricegen.ITransitionChainVisitor ITransitionChainVisitor} interface.
+ * Implementation of the {@link org.eclipse.etrice.core.genmodel.etricegen.ITransitionChainVisitor ITransitionChainVisitor} interface.
* Uses an {@link org.eclipse.etrice.generator.generic.ILanguageExtension ILanguageExtension} for target language specific things.
*
* @author Henrik Rentz-Reichert
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java
index 14268464f..85d09c0a9 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java
@@ -4,12 +4,12 @@ import com.google.inject.Inject;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.Port;
import org.eclipse.etrice.core.room.SAPRef;
import org.eclipse.etrice.core.room.SPPRef;
import org.eclipse.etrice.core.room.ServiceImplementation;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtext.util.Pair;
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
index a5f0245f3..56da27ddc 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
@@ -5,6 +5,9 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.ActorCommunicationType;
import org.eclipse.etrice.core.room.DetailCode;
@@ -22,9 +25,6 @@ import org.eclipse.etrice.core.room.TriggeredTransition;
import org.eclipse.etrice.generator.base.CodegenHelpers;
import org.eclipse.etrice.generator.base.DetailCodeTranslator;
import org.eclipse.etrice.generator.base.ITranslationProvider;
-import org.eclipse.etrice.generator.etricegen.ActiveTrigger;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.TransitionChain;
import org.eclipse.etrice.generator.generic.AbstractTransitionChainGenerator;
import org.eclipse.etrice.generator.generic.GenericProtocolClassGenerator;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java
index bfd59ff64..752d71f47 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java
@@ -8,9 +8,9 @@ import java.util.Set;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.core.room.RoomModel;
-import org.eclipse.etrice.generator.base.ILogger;
-import org.eclipse.etrice.generator.etricegen.Root;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
import org.eclipse.xtext.xbase.lib.StringExtensions;
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
index ce168bb74..05ebb5504 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
@@ -4,6 +4,7 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.List;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.Attribute;
import org.eclipse.etrice.core.room.ComplexType;
@@ -15,7 +16,6 @@ import org.eclipse.etrice.core.room.StandardOperation;
import org.eclipse.etrice.core.room.VarDecl;
import org.eclipse.etrice.core.room.util.RoomHelpers;
import org.eclipse.etrice.generator.base.DetailCodeTranslator;
-import org.eclipse.etrice.generator.base.ILogger;
import org.eclipse.etrice.generator.base.ITranslationProvider;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
import org.eclipse.etrice.generator.generic.TypeHelpers;
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
index 9f99a8517..4fea87646 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
@@ -8,6 +8,13 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.SAPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.Attribute;
import org.eclipse.etrice.core.room.DataClass;
@@ -39,13 +46,6 @@ import org.eclipse.etrice.core.room.TriggeredTransition;
import org.eclipse.etrice.core.room.VarDecl;
import org.eclipse.etrice.generator.base.CodegenHelpers;
import org.eclipse.etrice.generator.base.DetailCodeTranslator;
-import org.eclipse.etrice.generator.etricegen.ActiveTrigger;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance;
-import org.eclipse.etrice.generator.etricegen.PortInstance;
-import org.eclipse.etrice.generator.etricegen.SAPInstance;
-import org.eclipse.etrice.generator.etricegen.ServiceImplInstance;
-import org.eclipse.etrice.generator.etricegen.TransitionChain;
import org.eclipse.xtext.xbase.lib.BooleanExtensions;
import org.eclipse.xtext.xbase.lib.CollectionExtensions;
import org.eclipse.xtext.xbase.lib.ComparableExtensions;
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/.classpath b/tests/org.eclipse.etrice.core.genmodel.tests/.classpath
new file mode 100644
index 000000000..8a8f1668c
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/.gitignore b/tests/org.eclipse.etrice.core.genmodel.tests/.gitignore
new file mode 100644
index 000000000..092357e47
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/.gitignore
@@ -0,0 +1 @@
+bin
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/.project b/tests/org.eclipse.etrice.core.genmodel.tests/.project
new file mode 100644
index 000000000..da29983e2
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.etrice.core.genmodel.tests</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.core.genmodel.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..f4c6d898b
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Tue May 22 09:38:05 CEST 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..c5acb2e4a
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.tests
+Bundle-Version: 0.2.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.2.0",
+ org.eclipse.etrice.core.genmodel;bundle-version="0.2.0",
+ org.junit4;bundle-version="4.8.1",
+ org.eclipse.xtext;bundle-version="2.1.1",
+ org.eclipse.core.runtime;bundle-version="3.7.0"
+Bundle-Activator: org.eclipse.etrice.core.genmodel.GenmodelTestsActivator
+Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/about.html b/tests/org.eclipse.etrice.core.genmodel.tests/about.html
new file mode 100644
index 000000000..f47dbddbb
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2006</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html> \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/build.properties b/tests/org.eclipse.etrice.core.genmodel.tests/build.properties
new file mode 100644
index 000000000..b338525ec
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ models/
diff --git a/tests/org.eclipse.etrice.generator.tests/models/connected_ports.room b/tests/org.eclipse.etrice.core.genmodel.tests/models/connected_ports.room
index 39a835514..39a835514 100644
--- a/tests/org.eclipse.etrice.generator.tests/models/connected_ports.room
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/models/connected_ports.room
diff --git a/tests/org.eclipse.etrice.generator.tests/models/hierarchy.room b/tests/org.eclipse.etrice.core.genmodel.tests/models/hierarchy.room
index 0d4bb03c2..0d4bb03c2 100644
--- a/tests/org.eclipse.etrice.generator.tests/models/hierarchy.room
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/models/hierarchy.room
diff --git a/tests/org.eclipse.etrice.generator.tests/models/layers.room b/tests/org.eclipse.etrice.core.genmodel.tests/models/layers.room
index 900edc528..900edc528 100644
--- a/tests/org.eclipse.etrice.generator.tests/models/layers.room
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/models/layers.room
diff --git a/tests/org.eclipse.etrice.generator.tests/models/ports.room b/tests/org.eclipse.etrice.core.genmodel.tests/models/ports.room
index e273cc978..e273cc978 100644
--- a/tests/org.eclipse.etrice.generator.tests/models/ports.room
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/models/ports.room
diff --git a/tests/org.eclipse.etrice.generator.tests/models/states.room b/tests/org.eclipse.etrice.core.genmodel.tests/models/states.room
index d12ae2f3e..d12ae2f3e 100644
--- a/tests/org.eclipse.etrice.generator.tests/models/states.room
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/models/states.room
diff --git a/tests/org.eclipse.etrice.generator.tests/models/states_inheritance.room b/tests/org.eclipse.etrice.core.genmodel.tests/models/states_inheritance.room
index 16997ec0a..16997ec0a 100644
--- a/tests/org.eclipse.etrice.generator.tests/models/states_inheritance.room
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/models/states_inheritance.room
diff --git a/tests/org.eclipse.etrice.generator.tests/models/states_triggers.room b/tests/org.eclipse.etrice.core.genmodel.tests/models/states_triggers.room
index de2e02833..de2e02833 100644
--- a/tests/org.eclipse.etrice.generator.tests/models/states_triggers.room
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/models/states_triggers.room
diff --git a/tests/org.eclipse.etrice.generator.tests/models/structure_inheritance.room b/tests/org.eclipse.etrice.core.genmodel.tests/models/structure_inheritance.room
index c262127b9..c262127b9 100644
--- a/tests/org.eclipse.etrice.generator.tests/models/structure_inheritance.room
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/models/structure_inheritance.room
diff --git a/tests/org.eclipse.etrice.generator.tests/models/test.room b/tests/org.eclipse.etrice.core.genmodel.tests/models/test.room
index 6a608fc09..6a608fc09 100644
--- a/tests/org.eclipse.etrice.generator.tests/models/test.room
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/models/test.room
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/org.eclipse.etrice.core.genmodel.tests.launch b/tests/org.eclipse.etrice.core.genmodel.tests/org.eclipse.etrice.core.genmodel.tests.launch
new file mode 100644
index 000000000..5edcebeb8
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/org.eclipse.etrice.core.genmodel.tests.launch
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.etrice.core.genmodel.tests"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.etrice.core.genmodel.tests"/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_17"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.core.genmodel.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m&#13;&#10;-Xms128m&#13;&#10;-XX:PermSize=32m&#13;&#10;-XX:MaxPermSize=256m&#13;&#10;-Dfile.encoding=UTF-8&#13;&#10;-Dosgi.requiredJavaVersion=1.5"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/GenmodelTestsActivator.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/GenmodelTestsActivator.java
new file mode 100644
index 000000000..481455cb1
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/GenmodelTestsActivator.java
@@ -0,0 +1,22 @@
+package org.eclipse.etrice.core.genmodel;
+
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class GenmodelTestsActivator extends Plugin implements BundleActivator {
+
+ private static GenmodelTestsActivator instance = null;
+
+ public static GenmodelTestsActivator getInstance() {
+ return instance;
+ }
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+
+ instance = this;
+ }
+
+}
diff --git a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestConnectedPorts.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestConnectedPorts.java
index 2823073f9..1e9561d45 100644
--- a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestConnectedPorts.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestConnectedPorts.java
@@ -10,7 +10,7 @@
*
*******************************************************************************/
-package org.eclipse.etrice.generator;
+package org.eclipse.etrice.core.genmodel;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -22,10 +22,10 @@ import java.util.HashMap;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.PortInstance;
-import org.eclipse.etrice.generator.etricegen.PortKind;
-import org.eclipse.etrice.generator.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortKind;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestHierarchy.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestHierarchy.java
index d0178becb..a102fadba 100644
--- a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestHierarchy.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestHierarchy.java
@@ -10,7 +10,7 @@
*
*******************************************************************************/
-package org.eclipse.etrice.generator;
+package org.eclipse.etrice.core.genmodel;
import static org.junit.Assert.*;
@@ -19,9 +19,9 @@ import java.util.HashMap;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.etrice.generator.etricegen.ActorInstance;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestInstanceModelBuilderBase.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java
index df4b9257a..cb2f988db 100644
--- a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestInstanceModelBuilderBase.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java
@@ -10,7 +10,7 @@
*
*******************************************************************************/
-package org.eclipse.etrice.generator;
+package org.eclipse.etrice.core.genmodel;
import static org.junit.Assert.fail;
@@ -28,17 +28,17 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician;
+import org.eclipse.etrice.core.genmodel.etricegen.InstanceBase;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.core.naming.RoomNameProvider;
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.resource.XtextResourceSet;
import org.eclipse.etrice.core.room.RoomModel;
import org.eclipse.etrice.core.room.StateGraphItem;
-import org.eclipse.etrice.generator.base.ILogger;
-import org.eclipse.etrice.generator.builder.GeneratorModelBuilder;
-import org.eclipse.etrice.generator.etricegen.IDiagnostician;
-import org.eclipse.etrice.generator.etricegen.InstanceBase;
-import org.eclipse.etrice.generator.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.base.ILogger;
+import org.eclipse.etrice.core.genmodel.builder.GeneratorModelBuilder;
public class TestInstanceModelBuilderBase {
@@ -85,7 +85,7 @@ public class TestInstanceModelBuilderBase {
protected void prepare() {
try {
- URL modelsDir = InstanceTestsActivator.getInstance().getBundle().getEntry("models");
+ URL modelsDir = GenmodelTestsActivator.getInstance().getBundle().getEntry("models");
URL fileURL = FileLocator.toFileURL(modelsDir);
basePath = fileURL.getFile();
} catch (IOException e) {
diff --git a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestLayers.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestLayers.java
index b8bb08a37..d41ca068e 100644
--- a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestLayers.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestLayers.java
@@ -10,7 +10,7 @@
*
*******************************************************************************/
-package org.eclipse.etrice.generator;
+package org.eclipse.etrice.core.genmodel;
import static org.junit.Assert.*;
@@ -19,11 +19,11 @@ import java.util.HashMap;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance;
-import org.eclipse.etrice.generator.etricegen.Root;
-import org.eclipse.etrice.generator.etricegen.SAPInstance;
-import org.eclipse.etrice.generator.etricegen.ServiceImplInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.SAPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestPorts.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestPorts.java
index cc2bd6c46..e2e846d1a 100644
--- a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestPorts.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestPorts.java
@@ -10,7 +10,7 @@
*
*******************************************************************************/
-package org.eclipse.etrice.generator;
+package org.eclipse.etrice.core.genmodel;
import static org.junit.Assert.assertEquals;
@@ -19,9 +19,9 @@ import java.util.HashMap;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.PortInstance;
-import org.eclipse.etrice.generator.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestStates.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStates.java
index 0c78f11b1..db17542ea 100644
--- a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestStates.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStates.java
@@ -10,7 +10,7 @@
*
*******************************************************************************/
-package org.eclipse.etrice.generator;
+package org.eclipse.etrice.core.genmodel;
import static org.junit.Assert.*;
@@ -20,6 +20,9 @@ import java.util.HashMap;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
import org.eclipse.etrice.core.naming.RoomNameProvider;
import org.junit.Before;
import org.junit.Test;
@@ -29,9 +32,6 @@ import org.eclipse.etrice.core.room.ContinuationTransition;
import org.eclipse.etrice.core.room.RoomPackage;
import org.eclipse.etrice.core.room.State;
import org.eclipse.etrice.core.room.Transition;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.Root;
-import org.eclipse.etrice.generator.etricegen.TransitionChain;
public class TestStates extends TestInstanceModelBuilderBase {
diff --git a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestStatesAndTriggers.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesAndTriggers.java
index fcc4fa84d..756ef7f6b 100644
--- a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestStatesAndTriggers.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesAndTriggers.java
@@ -9,7 +9,7 @@
* Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
*
*******************************************************************************/
-package org.eclipse.etrice.generator;
+package org.eclipse.etrice.core.genmodel;
import static org.junit.Assert.*;
@@ -19,6 +19,9 @@ import java.util.HashMap;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
import org.eclipse.etrice.core.naming.RoomNameProvider;
import org.junit.Before;
import org.junit.Test;
@@ -30,9 +33,6 @@ import org.eclipse.etrice.core.room.RoomPackage;
import org.eclipse.etrice.core.room.SAPRef;
import org.eclipse.etrice.core.room.State;
import org.eclipse.etrice.core.room.Transition;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.Root;
-import org.eclipse.etrice.generator.etricegen.TransitionChain;
public class TestStatesAndTriggers extends TestInstanceModelBuilderBase {
diff --git a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestStatesInheritance.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesInheritance.java
index 954a7bd27..ef8f6bfa0 100644
--- a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestStatesInheritance.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesInheritance.java
@@ -10,7 +10,7 @@
*
*******************************************************************************/
-package org.eclipse.etrice.generator;
+package org.eclipse.etrice.core.genmodel;
import static org.junit.Assert.*;
@@ -20,6 +20,9 @@ import java.util.HashMap;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
import org.eclipse.etrice.core.naming.RoomNameProvider;
import org.junit.Before;
import org.junit.Test;
@@ -29,9 +32,6 @@ import org.eclipse.etrice.core.room.ContinuationTransition;
import org.eclipse.etrice.core.room.RoomPackage;
import org.eclipse.etrice.core.room.State;
import org.eclipse.etrice.core.room.Transition;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.Root;
-import org.eclipse.etrice.generator.etricegen.TransitionChain;
public class TestStatesInheritance extends TestInstanceModelBuilderBase {
diff --git a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestStructureInheritance.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStructureInheritance.java
index 2f1f22d1c..1772f7dd1 100644
--- a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/TestStructureInheritance.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStructureInheritance.java
@@ -10,7 +10,7 @@
*
*******************************************************************************/
-package org.eclipse.etrice.generator;
+package org.eclipse.etrice.core.genmodel;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -26,17 +26,17 @@ import org.eclipse.emf.ecore.EObject;
import org.junit.Before;
import org.junit.Test;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.PortKind;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.SAPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.Port;
import org.eclipse.etrice.core.room.SAPRef;
-import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;
-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance;
-import org.eclipse.etrice.generator.etricegen.PortInstance;
-import org.eclipse.etrice.generator.etricegen.PortKind;
-import org.eclipse.etrice.generator.etricegen.Root;
-import org.eclipse.etrice.generator.etricegen.SAPInstance;
-import org.eclipse.etrice.generator.etricegen.ServiceImplInstance;
public class TestStructureInheritance extends TestInstanceModelBuilderBase {
diff --git a/tests/org.eclipse.etrice.generator.tests/org.eclipse.etrice.generator.tests.launch b/tests/org.eclipse.etrice.generator.tests/org.eclipse.etrice.generator.tests.launch
index 163563067..e6ec15e47 100644
--- a/tests/org.eclipse.etrice.generator.tests/org.eclipse.etrice.generator.tests.launch
+++ b/tests/org.eclipse.etrice.generator.tests/org.eclipse.etrice.generator.tests.launch
@@ -23,6 +23,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_17"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.generator.tests"/>

Back to the top