[genmodel] fixed import paths and regenerated for java 8

Change-Id: I3a431fb6610412ce071525b1aded632367a3a744
author: Juergen Haug 2020-11-26 08:35:51 +0000
committer: Juergen Haug 2020-11-26 08:39:08 +0000
commit: 1bbc3434b313ccd62994586bd4efaa4560fe5e7d (patch)
tree: 8b3135429d42a3bb9614717aaeddd2fa93e5acea /plugins
parent: 35e8fb0e6be46e55fbc66540c8b15ee57b27c5bd (diff)
download: org.eclipse.etrice-1bbc3434b313ccd62994586bd4efaa4560fe5e7d.tar.gz
org.eclipse.etrice-1bbc3434b313ccd62994586bd4efaa4560fe5e7d.tar.xz
org.eclipse.etrice-1bbc3434b313ccd62994586bd4efaa4560fe5e7d.zip
44 files changed, 410 insertions, 78 deletions
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF
index 3558b5540..bf1932944 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF
@@ -10,12 +10,12 @@ Export-Package: org.eclipse.etrice.core.genmodel.fsm,
  org.eclipse.etrice.core.genmodel.fsm.fsmgen.impl,
  org.eclipse.etrice.core.genmodel.fsm.fsmgen.util
 Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport,
-  org.eclipse.etrice.core.fsm;visibility:=reexport,
+ org.eclipse.etrice.core.fsm;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
  org.eclipse.xtext.xbase.lib,
-  org.eclipse.etrice.generator.base
+ org.eclipse.etrice.generator.base
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/model/fsmgen.genmodel b/plugins/org.eclipse.etrice.core.genmodel.fsm/model/fsmgen.genmodel
index 109b764a1..05baf5442 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/model/fsmgen.genmodel
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/model/fsmgen.genmodel
@@ -3,9 +3,9 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.core.genmodel.fsm/src-gen"
     editDirectory="/org.eclipse.etrice.core.genmodel.fsm.edit/src" editorDirectory="/org.eclipse.etrice.core.genmodel.fsm.editor/src"
     modelPluginID="org.eclipse.etrice.core.genmodel.fsm" modelName="Fsmgen" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
     editPluginID="org.eclipse.etrice.core.genmodel.fsm.edit" editorPluginID="org.eclipse.etrice.core.genmodel.fsm.editor"
-    usedGenPackages="../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base ../../org.eclipse.etrice.core.fsm/model/generated/FSM.genmodel#//fSM"
+    usedGenPackages="../../org.eclipse.etrice.core.common/model/generated/Base.genmodel#//base ../../org.eclipse.etrice.core.fsm/model/generated/FSM.genmodel#//fSM"
     operationReflection="true" importOrganizing="true">
   <foreignModel>fsmgen.ecore</foreignModel>
   <genPackages prefix="FsmGen" basePackage="org.eclipse.etrice.core.genmodel.fsm"
@@ -13,12 +13,16 @@
     <genClasses ecoreClass="fsmgen.ecore#//GraphContainer">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference fsmgen.ecore#//GraphContainer/graph"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference fsmgen.ecore#//GraphContainer/component"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute fsmgen.ecore#//GraphContainer/initializedTriggersInStates"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute fsmgen.ecore#//GraphContainer/initializedChainHeads"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute fsmgen.ecore#//GraphContainer/initializedCommonData"/>
     </genClasses>
     <genClasses ecoreClass="fsmgen.ecore#//Graph">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference fsmgen.ecore#//Graph/nodes"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference fsmgen.ecore#//Graph/links"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference fsmgen.ecore#//Graph/stateGraph"/>
-      <genOperations ecoreOperation="fsmgen.ecore#//Graph/toString"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference fsmgen.ecore#//Graph/node"/>
+      <genOperations ecoreOperation="fsmgen.ecore#//Graph/toString" body="StringBuilder result = new StringBuilder();&#xD;&#xA;result.append(&quot;StateGraph {\n&quot;);&#xD;&#xA;for (Node n : getNodes()) {&#xD;&#xA;&#x9;result.append(&quot;  &quot; + n.toString() + &quot;\n&quot;);&#xD;&#xA;}&#xD;&#xA;for (Link l : getLinks()) {&#xD;&#xA;&#x9;result.append(&quot;  &quot; + l.toString() + &quot;\n&quot;);&#xD;&#xA;}&#xD;&#xA;result.append(&quot;}&quot;);&#xD;&#xA;return result.toString();"/>
     </genClasses>
     <genClasses ecoreClass="fsmgen.ecore#//GraphItem">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute fsmgen.ecore#//GraphItem/inherited"/>
@@ -30,7 +34,8 @@
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference fsmgen.ecore#//Node/incoming"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference fsmgen.ecore#//Node/stateGraphNode"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference fsmgen.ecore#//Node/caughtTriggers"/>
-      <genOperations ecoreOperation="fsmgen.ecore#//Node/toString"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute fsmgen.ecore#//Node/inheritanceLevel"/>
+      <genOperations ecoreOperation="fsmgen.ecore#//Node/toString" body="String type = &quot;?&quot;;&#xD;&#xA;if (getStateGraphNode() instanceof &lt;%org.eclipse.etrice.core.fsm.fSM.RefinedState%>) {&#xD;&#xA;&#x9;type = &quot;RefinedState&quot;;&#xD;&#xA;}&#xD;&#xA;else if (getStateGraphNode() instanceof &lt;%org.eclipse.etrice.core.fsm.fSM.SimpleState%>) {&#xD;&#xA;&#x9;type = &quot;SimpleState&quot;;&#xD;&#xA;}&#xD;&#xA;else if (getStateGraphNode() instanceof &lt;%org.eclipse.etrice.core.fsm.fSM.TrPoint%>) {&#xD;&#xA;&#x9;type = &quot;TrPoint&quot;;&#xD;&#xA;}&#xD;&#xA;else if (getStateGraphNode() instanceof &lt;%org.eclipse.etrice.core.fsm.fSM.ChoicePoint%>) {&#xD;&#xA;&#x9;type = &quot;ChoicePoint&quot;;&#xD;&#xA;}&#xD;&#xA;return &quot;Node &quot; + getStateGraphNode().getName() + &quot; (&quot; + type + &quot;)&quot;;"/>
     </genClasses>
     <genClasses ecoreClass="fsmgen.ecore#//Link">
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference fsmgen.ecore#//Link/graph"/>
@@ -40,13 +45,15 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute fsmgen.ecore#//Link/ifitemTriggered"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference fsmgen.ecore#//Link/commonData"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference fsmgen.ecore#//Link/transition"/>
-      <genOperations ecoreOperation="fsmgen.ecore#//Link/toString"/>
+      <genOperations ecoreOperation="fsmgen.ecore#//Link/toString" body="if (getTransition() instanceof &lt;%org.eclipse.etrice.core.fsm.fSM.InitialTransition%>) {&#xD;&#xA;&#x9;return &quot;Link initial -> &quot; + getTarget().toString() + &quot; (InitialTransition)&quot;;&#xD;&#xA;}&#xD;&#xA;else if (getTransition() instanceof &lt;%org.eclipse.etrice.core.fsm.fSM.NonInitialTransition%>) {&#xD;&#xA;&#x9;return &quot;Link &quot; + getSource().toString() + &quot; -> &quot; + getTarget().toString() + &quot; (InitialTransition)&quot;;&#xD;&#xA;}&#xD;&#xA;else if (getTransition() instanceof &lt;%org.eclipse.etrice.core.fsm.fSM.RefinedTransition%>) {&#xD;&#xA;&#x9;return &quot;RefinedTransition&quot;;&#xD;&#xA;}&#xD;&#xA;return &quot;?&quot;;"/>
     </genClasses>
     <genClasses ecoreClass="fsmgen.ecore#//CommonTrigger">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference fsmgen.ecore#//CommonTrigger/msg"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference fsmgen.ecore#//CommonTrigger/ifitem"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute fsmgen.ecore#//CommonTrigger/hasGuard"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute fsmgen.ecore#//CommonTrigger/trigger"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference fsmgen.ecore#//CommonTrigger/transitions"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference fsmgen.ecore#//CommonTrigger/links"/>
     </genClasses>
+    <genClasses ecoreClass="fsmgen.ecore#//FSMGenElement"/>
   </genPackages>
 </genmodel:GenModel>
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Graph.java b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Graph.java
index 81760bb60..9dacdba3b 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Graph.java
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Graph.java
@@ -118,7 +118,7 @@ public interface Graph extends FSMGenElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel body='StringBuilder result = new StringBuilder();\r\nresult.append(\"StateGraph {\\n\");\r\nfor (Node n : getNodes()) {\r\n\tresult.append(\"  \" + n.toString() + \"\\n\");\r\n}\r\nfor (Link l : getLinks()) {\r\n\tresult.append(\"  \" + l.toString() + \"\\n\");\r\n}\r\nresult.append(\"}\");\r\nreturn result.toString();'"
+	 * @model
 	 * @generated
 	 */
 	String toString();
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Link.java b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Link.java
index bbceb1278..dd6ef8913 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Link.java
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Link.java
@@ -211,7 +211,7 @@ public interface Link extends GraphItem {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel body='if (getTransition() instanceof <%org.eclipse.etrice.core.fsm.fSM.InitialTransition%>) {\r\n\treturn \"Link initial -> \" + getTarget().toString() + \" (InitialTransition)\";\r\n}\r\nelse if (getTransition() instanceof <%org.eclipse.etrice.core.fsm.fSM.NonInitialTransition%>) {\r\n\treturn \"Link \" + getSource().toString() + \" -> \" + getTarget().toString() + \" (InitialTransition)\";\r\n}\r\nelse if (getTransition() instanceof <%org.eclipse.etrice.core.fsm.fSM.RefinedTransition%>) {\r\n\treturn \"RefinedTransition\";\r\n}\r\nreturn \"?\";'"
+	 * @model
 	 * @generated
 	 */
 	String toString();
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Node.java b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Node.java
index 3b0530b00..bae7857a9 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Node.java
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Node.java
@@ -192,7 +192,7 @@ public interface Node extends GraphItem {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel body='String type = \"?\";\r\nif (getStateGraphNode() instanceof <%org.eclipse.etrice.core.fsm.fSM.RefinedState%>) {\r\n\ttype = \"RefinedState\";\r\n}\r\nelse if (getStateGraphNode() instanceof <%org.eclipse.etrice.core.fsm.fSM.SimpleState%>) {\r\n\ttype = \"SimpleState\";\r\n}\r\nelse if (getStateGraphNode() instanceof <%org.eclipse.etrice.core.fsm.fSM.TrPoint%>) {\r\n\ttype = \"TrPoint\";\r\n}\r\nelse if (getStateGraphNode() instanceof <%org.eclipse.etrice.core.fsm.fSM.ChoicePoint%>) {\r\n\ttype = \"ChoicePoint\";\r\n}\r\nreturn \"Node \" + getStateGraphNode().getName() + \" (\" + type + \")\";'"
+	 * @model
 	 * @generated
 	 */
 	String toString();
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/CommonTriggerImpl.java b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/CommonTriggerImpl.java
index cf7e61ca7..7cab358aa 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/CommonTriggerImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/CommonTriggerImpl.java
@@ -132,6 +132,7 @@ public class CommonTriggerImpl extends FSMGenElementImpl implements CommonTrigge
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getMsg() {
 		if (msg != null && msg.eIsProxy()) {
 			InternalEObject oldMsg = (InternalEObject)msg;
@@ -158,6 +159,7 @@ public class CommonTriggerImpl extends FSMGenElementImpl implements CommonTrigge
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setMsg(EObject newMsg) {
 		EObject oldMsg = msg;
 		msg = newMsg;
@@ -170,6 +172,7 @@ public class CommonTriggerImpl extends FSMGenElementImpl implements CommonTrigge
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public AbstractInterfaceItem getIfitem() {
 		if (ifitem != null && ifitem.eIsProxy()) {
 			InternalEObject oldIfitem = (InternalEObject)ifitem;
@@ -196,6 +199,7 @@ public class CommonTriggerImpl extends FSMGenElementImpl implements CommonTrigge
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setIfitem(AbstractInterfaceItem newIfitem) {
 		AbstractInterfaceItem oldIfitem = ifitem;
 		ifitem = newIfitem;
@@ -208,6 +212,7 @@ public class CommonTriggerImpl extends FSMGenElementImpl implements CommonTrigge
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getTrigger() {
 		return trigger;
 	}
@@ -217,6 +222,7 @@ public class CommonTriggerImpl extends FSMGenElementImpl implements CommonTrigge
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setTrigger(String newTrigger) {
 		String oldTrigger = trigger;
 		trigger = newTrigger;
@@ -229,6 +235,7 @@ public class CommonTriggerImpl extends FSMGenElementImpl implements CommonTrigge
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Link> getLinks() {
 		if (links == null) {
 			links = new EObjectResolvingEList<Link>(Link.class, this, FsmGenPackage.COMMON_TRIGGER__LINKS);
@@ -241,6 +248,7 @@ public class CommonTriggerImpl extends FSMGenElementImpl implements CommonTrigge
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isHasGuard() {
 		return hasGuard;
 	}
@@ -250,6 +258,7 @@ public class CommonTriggerImpl extends FSMGenElementImpl implements CommonTrigge
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setHasGuard(boolean newHasGuard) {
 		boolean oldHasGuard = hasGuard;
 		hasGuard = newHasGuard;
@@ -368,7 +377,7 @@ public class CommonTriggerImpl extends FSMGenElementImpl implements CommonTrigge
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (hasGuard: ");
 		result.append(hasGuard);
 		result.append(", trigger: ");
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenFactoryImpl.java b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenFactoryImpl.java
index 32092c0b0..ccf44f68e 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenFactoryImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenFactoryImpl.java
@@ -73,6 +73,7 @@ public class FsmGenFactoryImpl extends EFactoryImpl implements FsmGenFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public GraphContainer createGraphContainer() {
 		GraphContainerImpl graphContainer = new GraphContainerImpl();
 		return graphContainer;
@@ -83,6 +84,7 @@ public class FsmGenFactoryImpl extends EFactoryImpl implements FsmGenFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Graph createGraph() {
 		GraphImpl graph = new GraphImpl();
 		return graph;
@@ -93,6 +95,7 @@ public class FsmGenFactoryImpl extends EFactoryImpl implements FsmGenFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public GraphItem createGraphItem() {
 		GraphItemImpl graphItem = new GraphItemImpl();
 		return graphItem;
@@ -103,6 +106,7 @@ public class FsmGenFactoryImpl extends EFactoryImpl implements FsmGenFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Node createNode() {
 		NodeImpl node = new NodeImpl();
 		return node;
@@ -113,6 +117,7 @@ public class FsmGenFactoryImpl extends EFactoryImpl implements FsmGenFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Link createLink() {
 		LinkImpl link = new LinkImpl();
 		return link;
@@ -123,6 +128,7 @@ public class FsmGenFactoryImpl extends EFactoryImpl implements FsmGenFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public CommonTrigger createCommonTrigger() {
 		CommonTriggerImpl commonTrigger = new CommonTriggerImpl();
 		return commonTrigger;
@@ -133,6 +139,7 @@ public class FsmGenFactoryImpl extends EFactoryImpl implements FsmGenFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public FSMGenElement createFSMGenElement() {
 		FSMGenElementImpl fsmGenElement = new FSMGenElementImpl();
 		return fsmGenElement;
@@ -143,6 +150,7 @@ public class FsmGenFactoryImpl extends EFactoryImpl implements FsmGenFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public FsmGenPackage getFsmGenPackage() {
 		return (FsmGenPackage)getEPackage();
 	}
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenPackageImpl.java b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenPackageImpl.java
index e20daf7a2..edd5581fe 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenPackageImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenPackageImpl.java
@@ -10,6 +10,7 @@ import org.eclipse.emf.ecore.EReference;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
+import org.eclipse.etrice.core.common.base.BasePackage;
 import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
 
 import org.eclipse.etrice.core.genmodel.fsm.fsmgen.CommonTrigger;
@@ -106,7 +107,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>This method is used to initialize {@link FsmGenPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
@@ -120,11 +121,13 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 		if (isInited) return (FsmGenPackage)EPackage.Registry.INSTANCE.getEPackage(FsmGenPackage.eNS_URI);
 
 		// Obtain or create and register package
-		FsmGenPackageImpl theFsmGenPackage = (FsmGenPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FsmGenPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FsmGenPackageImpl());
+		Object registeredFsmGenPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		FsmGenPackageImpl theFsmGenPackage = registeredFsmGenPackage instanceof FsmGenPackageImpl ? (FsmGenPackageImpl)registeredFsmGenPackage : new FsmGenPackageImpl();
 
 		isInited = true;
 
 		// Initialize simple dependencies
+		BasePackage.eINSTANCE.eClass();
 		FSMPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
@@ -136,7 +139,6 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 		// Mark meta-data to indicate it can't be changed
 		theFsmGenPackage.freeze();
 
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(FsmGenPackage.eNS_URI, theFsmGenPackage);
 		return theFsmGenPackage;
@@ -147,6 +149,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getGraphContainer() {
 		return graphContainerEClass;
 	}
@@ -156,6 +159,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getGraphContainer_Graph() {
 		return (EReference)graphContainerEClass.getEStructuralFeatures().get(0);
 	}
@@ -165,6 +169,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getGraphContainer_Component() {
 		return (EReference)graphContainerEClass.getEStructuralFeatures().get(1);
 	}
@@ -174,6 +179,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getGraphContainer_InitializedTriggersInStates() {
 		return (EAttribute)graphContainerEClass.getEStructuralFeatures().get(2);
 	}
@@ -183,6 +189,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getGraphContainer_InitializedChainHeads() {
 		return (EAttribute)graphContainerEClass.getEStructuralFeatures().get(3);
 	}
@@ -192,6 +199,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getGraphContainer_InitializedCommonData() {
 		return (EAttribute)graphContainerEClass.getEStructuralFeatures().get(4);
 	}
@@ -201,6 +209,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getGraph() {
 		return graphEClass;
 	}
@@ -210,6 +219,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getGraph_Nodes() {
 		return (EReference)graphEClass.getEStructuralFeatures().get(0);
 	}
@@ -219,6 +229,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getGraph_Links() {
 		return (EReference)graphEClass.getEStructuralFeatures().get(1);
 	}
@@ -228,6 +239,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getGraph_StateGraph() {
 		return (EReference)graphEClass.getEStructuralFeatures().get(2);
 	}
@@ -237,6 +249,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getGraph_Node() {
 		return (EReference)graphEClass.getEStructuralFeatures().get(3);
 	}
@@ -246,6 +259,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EOperation getGraph__ToString() {
 		return graphEClass.getEOperations().get(0);
 	}
@@ -255,6 +269,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getGraphItem() {
 		return graphItemEClass;
 	}
@@ -264,6 +279,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getGraphItem_Inherited() {
 		return (EAttribute)graphItemEClass.getEStructuralFeatures().get(0);
 	}
@@ -273,6 +289,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getNode() {
 		return nodeEClass;
 	}
@@ -282,6 +299,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getNode_Graph() {
 		return (EReference)nodeEClass.getEStructuralFeatures().get(0);
 	}
@@ -291,6 +309,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getNode_Subgraph() {
 		return (EReference)nodeEClass.getEStructuralFeatures().get(1);
 	}
@@ -300,6 +319,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getNode_Outgoing() {
 		return (EReference)nodeEClass.getEStructuralFeatures().get(2);
 	}
@@ -309,6 +329,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getNode_Incoming() {
 		return (EReference)nodeEClass.getEStructuralFeatures().get(3);
 	}
@@ -318,6 +339,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getNode_StateGraphNode() {
 		return (EReference)nodeEClass.getEStructuralFeatures().get(4);
 	}
@@ -327,6 +349,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getNode_CaughtTriggers() {
 		return (EReference)nodeEClass.getEStructuralFeatures().get(5);
 	}
@@ -336,6 +359,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getNode_InheritanceLevel() {
 		return (EAttribute)nodeEClass.getEStructuralFeatures().get(6);
 	}
@@ -345,6 +369,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EOperation getNode__ToString() {
 		return nodeEClass.getEOperations().get(0);
 	}
@@ -354,6 +379,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getLink() {
 		return linkEClass;
 	}
@@ -363,6 +389,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getLink_Graph() {
 		return (EReference)linkEClass.getEStructuralFeatures().get(0);
 	}
@@ -372,6 +399,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getLink_Source() {
 		return (EReference)linkEClass.getEStructuralFeatures().get(1);
 	}
@@ -381,6 +409,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getLink_Target() {
 		return (EReference)linkEClass.getEStructuralFeatures().get(2);
 	}
@@ -390,6 +419,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getLink_ChainHeads() {
 		return (EReference)linkEClass.getEStructuralFeatures().get(3);
 	}
@@ -399,6 +429,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getLink_IfitemTriggered() {
 		return (EAttribute)linkEClass.getEStructuralFeatures().get(4);
 	}
@@ -408,6 +439,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getLink_CommonData() {
 		return (EReference)linkEClass.getEStructuralFeatures().get(5);
 	}
@@ -417,6 +449,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getLink_Transition() {
 		return (EReference)linkEClass.getEStructuralFeatures().get(6);
 	}
@@ -426,6 +459,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EOperation getLink__ToString() {
 		return linkEClass.getEOperations().get(0);
 	}
@@ -435,6 +469,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getCommonTrigger() {
 		return commonTriggerEClass;
 	}
@@ -444,6 +479,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getCommonTrigger_Msg() {
 		return (EReference)commonTriggerEClass.getEStructuralFeatures().get(0);
 	}
@@ -453,6 +489,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getCommonTrigger_Ifitem() {
 		return (EReference)commonTriggerEClass.getEStructuralFeatures().get(1);
 	}
@@ -462,6 +499,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getCommonTrigger_Trigger() {
 		return (EAttribute)commonTriggerEClass.getEStructuralFeatures().get(3);
 	}
@@ -471,6 +509,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getCommonTrigger_Links() {
 		return (EReference)commonTriggerEClass.getEStructuralFeatures().get(4);
 	}
@@ -480,6 +519,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getFSMGenElement() {
 		return fsmGenElementEClass;
 	}
@@ -489,6 +529,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getCommonTrigger_HasGuard() {
 		return (EAttribute)commonTriggerEClass.getEStructuralFeatures().get(2);
 	}
@@ -498,6 +539,7 @@ public class FsmGenPackageImpl extends EPackageImpl implements FsmGenPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public FsmGenFactory getFsmGenFactory() {
 		return (FsmGenFactory)getEFactoryInstance();
 	}
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphContainerImpl.java b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphContainerImpl.java
index 6b2c3afdf..acff7907e 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphContainerImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphContainerImpl.java
@@ -137,6 +137,7 @@ public class GraphContainerImpl extends FSMGenElementImpl implements GraphContai
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Graph getGraph() {
 		return graph;
 	}
@@ -161,6 +162,7 @@ public class GraphContainerImpl extends FSMGenElementImpl implements GraphContai
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setGraph(Graph newGraph) {
 		if (newGraph != graph) {
 			NotificationChain msgs = null;
@@ -180,6 +182,7 @@ public class GraphContainerImpl extends FSMGenElementImpl implements GraphContai
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ModelComponent getComponent() {
 		if (component != null && component.eIsProxy()) {
 			InternalEObject oldComponent = (InternalEObject)component;
@@ -206,6 +209,7 @@ public class GraphContainerImpl extends FSMGenElementImpl implements GraphContai
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setComponent(ModelComponent newComponent) {
 		ModelComponent oldComponent = component;
 		component = newComponent;
@@ -218,6 +222,7 @@ public class GraphContainerImpl extends FSMGenElementImpl implements GraphContai
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isInitializedTriggersInStates() {
 		return initializedTriggersInStates;
 	}
@@ -227,6 +232,7 @@ public class GraphContainerImpl extends FSMGenElementImpl implements GraphContai
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setInitializedTriggersInStates(boolean newInitializedTriggersInStates) {
 		boolean oldInitializedTriggersInStates = initializedTriggersInStates;
 		initializedTriggersInStates = newInitializedTriggersInStates;
@@ -239,6 +245,7 @@ public class GraphContainerImpl extends FSMGenElementImpl implements GraphContai
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isInitializedChainHeads() {
 		return initializedChainHeads;
 	}
@@ -248,6 +255,7 @@ public class GraphContainerImpl extends FSMGenElementImpl implements GraphContai
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setInitializedChainHeads(boolean newInitializedChainHeads) {
 		boolean oldInitializedChainHeads = initializedChainHeads;
 		initializedChainHeads = newInitializedChainHeads;
@@ -260,6 +268,7 @@ public class GraphContainerImpl extends FSMGenElementImpl implements GraphContai
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isInitializedCommonData() {
 		return initializedCommonData;
 	}
@@ -269,6 +278,7 @@ public class GraphContainerImpl extends FSMGenElementImpl implements GraphContai
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setInitializedCommonData(boolean newInitializedCommonData) {
 		boolean oldInitializedCommonData = initializedCommonData;
 		initializedCommonData = newInitializedCommonData;
@@ -398,7 +408,7 @@ public class GraphContainerImpl extends FSMGenElementImpl implements GraphContai
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (initializedTriggersInStates: ");
 		result.append(initializedTriggersInStates);
 		result.append(", initializedChainHeads: ");
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphImpl.java b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphImpl.java
index b6dadf54c..ce7dda200 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphImpl.java
@@ -94,6 +94,7 @@ public class GraphImpl extends FSMGenElementImpl implements Graph {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Node> getNodes() {
 		if (nodes == null) {
 			nodes = new EObjectContainmentWithInverseEList<Node>(Node.class, this, FsmGenPackage.GRAPH__NODES, FsmGenPackage.NODE__GRAPH);
@@ -106,6 +107,7 @@ public class GraphImpl extends FSMGenElementImpl implements Graph {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Link> getLinks() {
 		if (links == null) {
 			links = new EObjectContainmentWithInverseEList<Link>(Link.class, this, FsmGenPackage.GRAPH__LINKS, FsmGenPackage.LINK__GRAPH);
@@ -118,6 +120,7 @@ public class GraphImpl extends FSMGenElementImpl implements Graph {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public StateGraph getStateGraph() {
 		if (stateGraph != null && stateGraph.eIsProxy()) {
 			InternalEObject oldStateGraph = (InternalEObject)stateGraph;
@@ -144,6 +147,7 @@ public class GraphImpl extends FSMGenElementImpl implements Graph {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setStateGraph(StateGraph newStateGraph) {
 		StateGraph oldStateGraph = stateGraph;
 		stateGraph = newStateGraph;
@@ -156,6 +160,7 @@ public class GraphImpl extends FSMGenElementImpl implements Graph {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Node getNode() {
 		if (eContainerFeatureID() != FsmGenPackage.GRAPH__NODE) return null;
 		return (Node)eInternalContainer();
@@ -176,6 +181,7 @@ public class GraphImpl extends FSMGenElementImpl implements Graph {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setNode(Node newNode) {
 		if (newNode != eInternalContainer() || (eContainerFeatureID() != FsmGenPackage.GRAPH__NODE && newNode != null)) {
 			if (EcoreUtil.isAncestor(this, newNode))
@@ -197,6 +203,7 @@ public class GraphImpl extends FSMGenElementImpl implements Graph {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String toString() {
 		StringBuilder result = new StringBuilder();
 		result.append("StateGraph {\n");
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphItemImpl.java b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphItemImpl.java
index 239cfd8aa..8572d8fea 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphItemImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphItemImpl.java
@@ -68,6 +68,7 @@ public class GraphItemImpl extends FSMGenElementImpl implements GraphItem {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isInherited() {
 		return inherited;
 	}
@@ -77,6 +78,7 @@ public class GraphItemImpl extends FSMGenElementImpl implements GraphItem {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setInherited(boolean newInherited) {
 		boolean oldInherited = inherited;
 		inherited = newInherited;
@@ -151,7 +153,7 @@ public class GraphItemImpl extends FSMGenElementImpl implements GraphItem {
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (inherited: ");
 		result.append(inherited);
 		result.append(')');
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/LinkImpl.java b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/LinkImpl.java
index e3190f0c8..770cc1b01 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/LinkImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/LinkImpl.java
@@ -141,6 +141,7 @@ public class LinkImpl extends GraphItemImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Graph getGraph() {
 		if (eContainerFeatureID() != FsmGenPackage.LINK__GRAPH) return null;
 		return (Graph)eInternalContainer();
@@ -161,6 +162,7 @@ public class LinkImpl extends GraphItemImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setGraph(Graph newGraph) {
 		if (newGraph != eInternalContainer() || (eContainerFeatureID() != FsmGenPackage.LINK__GRAPH && newGraph != null)) {
 			if (EcoreUtil.isAncestor(this, newGraph))
@@ -182,6 +184,7 @@ public class LinkImpl extends GraphItemImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Node getSource() {
 		if (source != null && source.eIsProxy()) {
 			InternalEObject oldSource = (InternalEObject)source;
@@ -223,6 +226,7 @@ public class LinkImpl extends GraphItemImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setSource(Node newSource) {
 		if (newSource != source) {
 			NotificationChain msgs = null;
@@ -242,6 +246,7 @@ public class LinkImpl extends GraphItemImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Node getTarget() {
 		if (target != null && target.eIsProxy()) {
 			InternalEObject oldTarget = (InternalEObject)target;
@@ -283,6 +288,7 @@ public class LinkImpl extends GraphItemImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setTarget(Node newTarget) {
 		if (newTarget != target) {
 			NotificationChain msgs = null;
@@ -302,6 +308,7 @@ public class LinkImpl extends GraphItemImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Link> getChainHeads() {
 		if (chainHeads == null) {
 			chainHeads = new EObjectResolvingEList<Link>(Link.class, this, FsmGenPackage.LINK__CHAIN_HEADS);
@@ -314,6 +321,7 @@ public class LinkImpl extends GraphItemImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isIfitemTriggered() {
 		return ifitemTriggered;
 	}
@@ -323,6 +331,7 @@ public class LinkImpl extends GraphItemImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setIfitemTriggered(boolean newIfitemTriggered) {
 		boolean oldIfitemTriggered = ifitemTriggered;
 		ifitemTriggered = newIfitemTriggered;
@@ -335,6 +344,7 @@ public class LinkImpl extends GraphItemImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getCommonData() {
 		if (commonData != null && commonData.eIsProxy()) {
 			InternalEObject oldCommonData = (InternalEObject)commonData;
@@ -361,6 +371,7 @@ public class LinkImpl extends GraphItemImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCommonData(EObject newCommonData) {
 		EObject oldCommonData = commonData;
 		commonData = newCommonData;
@@ -373,6 +384,7 @@ public class LinkImpl extends GraphItemImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public TransitionBase getTransition() {
 		if (transition != null && transition.eIsProxy()) {
 			InternalEObject oldTransition = (InternalEObject)transition;
@@ -399,6 +411,7 @@ public class LinkImpl extends GraphItemImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setTransition(TransitionBase newTransition) {
 		TransitionBase oldTransition = transition;
 		transition = newTransition;
@@ -411,12 +424,13 @@ public class LinkImpl extends GraphItemImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String toString() {
 		if (getTransition() instanceof InitialTransition) {
 			return "Link initial -> " + getTarget().toString() + " (InitialTransition)";
 		}
 		else if (getTransition() instanceof NonInitialTransition) {
-			return "Link " + getSource().toString() + " -> " + getTarget().toString() + " (NonInitialTransition)";
+			return "Link " + getSource().toString() + " -> " + getTarget().toString() + " (InitialTransition)";
 		}
 		else if (getTransition() instanceof RefinedTransition) {
 			return "RefinedTransition";
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/NodeImpl.java b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/NodeImpl.java
index edd491e7c..06ff31ced 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/NodeImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/src-gen/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/NodeImpl.java
@@ -146,6 +146,7 @@ public class NodeImpl extends GraphItemImpl implements Node {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Graph getGraph() {
 		if (eContainerFeatureID() != FsmGenPackage.NODE__GRAPH) return null;
 		return (Graph)eInternalContainer();
@@ -166,6 +167,7 @@ public class NodeImpl extends GraphItemImpl implements Node {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setGraph(Graph newGraph) {
 		if (newGraph != eInternalContainer() || (eContainerFeatureID() != FsmGenPackage.NODE__GRAPH && newGraph != null)) {
 			if (EcoreUtil.isAncestor(this, newGraph))
@@ -187,6 +189,7 @@ public class NodeImpl extends GraphItemImpl implements Node {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Graph getSubgraph() {
 		return subgraph;
 	}
@@ -211,6 +214,7 @@ public class NodeImpl extends GraphItemImpl implements Node {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setSubgraph(Graph newSubgraph) {
 		if (newSubgraph != subgraph) {
 			NotificationChain msgs = null;
@@ -230,6 +234,7 @@ public class NodeImpl extends GraphItemImpl implements Node {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Link> getOutgoing() {
 		if (outgoing == null) {
 			outgoing = new EObjectWithInverseResolvingEList<Link>(Link.class, this, FsmGenPackage.NODE__OUTGOING, FsmGenPackage.LINK__SOURCE);
@@ -242,6 +247,7 @@ public class NodeImpl extends GraphItemImpl implements Node {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Link> getIncoming() {
 		if (incoming == null) {
 			incoming = new EObjectWithInverseResolvingEList<Link>(Link.class, this, FsmGenPackage.NODE__INCOMING, FsmGenPackage.LINK__TARGET);
@@ -254,6 +260,7 @@ public class NodeImpl extends GraphItemImpl implements Node {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public StateGraphNode getStateGraphNode() {
 		if (stateGraphNode != null && stateGraphNode.eIsProxy()) {
 			InternalEObject oldStateGraphNode = (InternalEObject)stateGraphNode;
@@ -280,6 +287,7 @@ public class NodeImpl extends GraphItemImpl implements Node {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setStateGraphNode(StateGraphNode newStateGraphNode) {
 		StateGraphNode oldStateGraphNode = stateGraphNode;
 		stateGraphNode = newStateGraphNode;
@@ -292,6 +300,7 @@ public class NodeImpl extends GraphItemImpl implements Node {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<CommonTrigger> getCaughtTriggers() {
 		if (caughtTriggers == null) {
 			caughtTriggers = new EObjectContainmentEList<CommonTrigger>(CommonTrigger.class, this, FsmGenPackage.NODE__CAUGHT_TRIGGERS);
@@ -304,6 +313,7 @@ public class NodeImpl extends GraphItemImpl implements Node {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getInheritanceLevel() {
 		return inheritanceLevel;
 	}
@@ -313,6 +323,7 @@ public class NodeImpl extends GraphItemImpl implements Node {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setInheritanceLevel(int newInheritanceLevel) {
 		int oldInheritanceLevel = inheritanceLevel;
 		inheritanceLevel = newInheritanceLevel;
@@ -325,6 +336,7 @@ public class NodeImpl extends GraphItemImpl implements Node {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String toString() {
 		String type = "?";
 		if (getStateGraphNode() instanceof RefinedState) {
diff --git a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF
index 44dd15ea2..2af136d82 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.etrice.core.genmodel;singleton:=true
 Bundle-Version: 0.0.0.qualifier
 Bundle-ClassPath: .
-Bundle-Vendor: Eclipse eTrice
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core.genmodel,
@@ -13,13 +13,13 @@ Export-Package: org.eclipse.etrice.core.genmodel,
  org.eclipse.etrice.core.genmodel.etricegen.impl,
  org.eclipse.etrice.core.genmodel.etricegen.util,
  org.eclipse.etrice.core.genmodel.util
-Require-Bundle:  org.eclipse.etrice.core.common;visibility:=reexport,
-  org.eclipse.etrice.core.fsm;visibility:=reexport,
-  org.eclipse.etrice.core.room;visibility:=reexport,
-  org.eclipse.etrice.core.genmodel.fsm;visibility:=reexport,
+Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport,
+ org.eclipse.etrice.core.fsm;visibility:=reexport,
+ org.eclipse.etrice.core.room;visibility:=reexport,
+ org.eclipse.etrice.core.genmodel.fsm;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
-  org.eclipse.etrice.generator.base
+ org.eclipse.etrice.generator.base
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.etrice.core.genmodel
diff --git a/plugins/org.eclipse.etrice.core.genmodel/model/etricegen.ecore b/plugins/org.eclipse.etrice.core.genmodel/model/etricegen.ecore
index 1bdeb278b..a8a18ee85 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/model/etricegen.ecore
+++ b/plugins/org.eclipse.etrice.core.genmodel/model/etricegen.ecore
@@ -2,32 +2,32 @@
 <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 name="getReferencedModels" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//RoomModel">
+      <eParameters name="cls" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/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#//RoomClass"/>
+    <eOperations name="getReferencedProtocolClasses" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ProtocolClass">
+      <eParameters name="cls" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//RoomClass"/>
     </eOperations>
-    <eOperations name="getReferencedDataClasses" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//DataClass">
-      <eParameters name="cls" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//RoomClass"/>
+    <eOperations name="getReferencedDataClasses" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//DataClass">
+      <eParameters name="cls" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//RoomClass"/>
     </eOperations>
-    <eOperations name="getReferencedEnumClasses" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//EnumerationType">
-      <eParameters name="cls" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//RoomClass"/>
+    <eOperations name="getReferencedEnumClasses" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//EnumerationType">
+      <eParameters name="cls" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//RoomClass"/>
     </eOperations>
-    <eOperations name="getReferencedActorClasses" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ActorClass">
-      <eParameters name="cls" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//RoomClass"/>
+    <eOperations name="getReferencedActorClasses" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ActorClass">
+      <eParameters name="cls" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//RoomClass"/>
     </eOperations>
     <eOperations name="getExpandedActorClass" eType="#//ExpandedActorClass">
       <eParameters name="ai" eType="#//ActorInstance"/>
     </eOperations>
     <eOperations name="getExpandedActorClass" eType="#//ExpandedActorClass">
-      <eParameters name="ac" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ActorClass"/>
+      <eParameters name="ac" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ActorClass"/>
     </eOperations>
     <eOperations name="getInstance" eType="#//StructureInstance">
       <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eOperations>
-    <eOperations name="getSubClasses" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ActorClass">
-      <eParameters name="ac" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ActorClass"/>
+    <eOperations name="getSubClasses" upperBound="-1" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ActorClass">
+      <eParameters name="ac" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ActorClass"/>
     </eOperations>
     <eOperations name="computeSubClasses"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="library" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
@@ -39,30 +39,30 @@
         eType="#//SubSystemInstance" changeable="false" volatile="true" transient="true"
         derived="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"/>
+        eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//RoomModel"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="importedModels" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//RoomModel"/>
+        eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//RoomModel"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="xpActorClasses" upperBound="-1"
         eType="#//ExpandedActorClass" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataClasses" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//DataClass"
+        eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//DataClass"
         volatile="true" transient="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="protocolClasses" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ProtocolClass"
+        eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ProtocolClass"
         volatile="true" transient="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="actorClasses" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ActorClass"
+        eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ActorClass"
         volatile="true" transient="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="enumClasses" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//EnumerationType"
+        eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//EnumerationType"
         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"
+        eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//SubSystemClass"
         volatile="true" transient="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="optionalInstances" upperBound="-1"
         eType="#//OptionalActorInstance" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="optionalActorClasses" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ActorClass"/>
+        eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ActorClass"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="wiredInstances" upperBound="-1"
         eType="#//WiredStructureClass" containment="true"/>
   </eClassifiers>
@@ -81,7 +81,7 @@
         eType="#//PortInstance" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ActorInterfaceInstance" eSuperTypes="#//AbstractInstance">
-    <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:EReference" name="actorClass" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ActorClass"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="providedServices" upperBound="-1"
         eType="#//ServiceImplInstance"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="optionalInstances" upperBound="-1"
@@ -112,25 +112,25 @@
   <eClassifiers xsi:type="ecore:EClass" name="SystemInstance" eSuperTypes="#//InstanceBase">
     <eStructuralFeatures xsi:type="ecore:EReference" name="instances" upperBound="-1"
         eType="#//SubSystemInstance" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="logicalSystem" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//LogicalSystem"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="logicalSystem" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//LogicalSystem"/>
   </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:EReference" name="subSystemClass" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/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:EReference" name="actorClass" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/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="OptionalActorInstance" 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:EReference" name="actorClass" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ActorClass"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="requiredServices" upperBound="-1"
         eType="#//SAPInstance"/>
   </eClassifiers>
@@ -138,14 +138,14 @@
     <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="protocol" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ProtocolClass"
+    <eOperations name="getInterfaceItem" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//InterfaceItem"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="protocol" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ProtocolClass"
         changeable="false" volatile="true" transient="true" derived="true"/>
     <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:EReference" name="port" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/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"/>
@@ -159,20 +159,20 @@
   <eClassifiers xsi:type="ecore:EClass" name="BindingInstance">
     <eStructuralFeatures xsi:type="ecore:EReference" name="ports" upperBound="2" eType="#//PortInstance"
         eOpposite="#//PortInstance/bindings"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="binding" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//Binding"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="binding" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//Binding"/>
   </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#//SAP"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sap" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//SAP"/>
   </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#//SPP"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="spp" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//SPP"/>
     <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"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="svcImpl" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ServiceImplementation"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ConnectionInstance">
     <eStructuralFeatures xsi:type="ecore:EReference" name="fromAI" eType="#//AbstractInstance"/>
@@ -180,7 +180,7 @@
         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"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="connection" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//LayerConnection"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="WiredStructureClass" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EReference" name="wires" upperBound="-1"
@@ -195,12 +195,12 @@
   <eClassifiers xsi:type="ecore:EClass" name="OpenBinding">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" unique="false" upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <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:EReference" name="port" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//Port"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="OpenServiceConnection">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" unique="false" upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="protocol" eType="ecore:EClass ../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ProtocolClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="protocol" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ProtocolClass"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Wire">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataDriven" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
@@ -210,16 +210,16 @@
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="WiredActorClass" eSuperTypes="#//WiredStructureClass">
-    <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:EReference" name="actorClass" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ActorClass"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="WiredSubSystemClass" eSuperTypes="#//WiredStructureClass">
-    <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:EReference" name="subSystemClass" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//SubSystemClass"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ExpandedActorClass">
     <eOperations name="getInterfaceItemLocalId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
       <eParameters name="ifitem" eType="ecore:EClass ../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//AbstractInterfaceItem"/>
     </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"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="actorClass" eType="ecore:EClass ../../org.eclipse.etrice.core.room/model/generated/Room.ecore#//ActorClass"
         changeable="false" volatile="true" transient="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="graphContainer" eType="ecore:EClass ../../org.eclipse.etrice.core.genmodel.fsm/model/fsmgen.ecore#//GraphContainer"
         containment="true"/>
diff --git a/plugins/org.eclipse.etrice.core.genmodel/model/etricegen.genmodel b/plugins/org.eclipse.etrice.core.genmodel/model/etricegen.genmodel
index 040cb0426..7314b8126 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/model/etricegen.genmodel
+++ b/plugins/org.eclipse.etrice.core.genmodel/model/etricegen.genmodel
@@ -3,9 +3,9 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2011 protos software gmbh (http://www.protos.de).&#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA; CONTRIBUTORS:&#xD;&#xA; &#x9;&#x9;Henrik Rentz-Reichert (initial contribution)&#xD;&#xA; "
     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"
+    modelName="eTriceGen" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.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 ../../org.eclipse.etrice.core.fsm/model/generated/FSM.genmodel#//fSM ../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base ../../org.eclipse.etrice.core.genmodel.fsm/model/fsmgen.genmodel#//fsmgen">
+    usedGenPackages="../../org.eclipse.etrice.core.room/model/generated/Room.genmodel#//room ../../org.eclipse.etrice.core.fsm/model/generated/FSM.genmodel#//fSM ../../org.eclipse.etrice.core.common/model/generated/Base.genmodel#//base ../../org.eclipse.etrice.core.genmodel.fsm/model/fsmgen.genmodel#//fsmgen">
   <foreignModel>etricegen.ecore</foreignModel>
   <genPackages prefix="ETriceGen" basePackage="org.eclipse.etrice.core.genmodel" resource="XMI"
       disposableProviderFactory="true" ecorePackage="etricegen.ecore#/">
@@ -21,16 +21,16 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/ownSubSystemInstances"/>
       <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 notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/importedModels"/>
       <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/dataClasses"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/protocolClasses"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/actorClasses"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/enumClasses"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/subSystemClasses"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/optionalInstances"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/optionalActorClasses"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/wiredInstances"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//Root/usedEnumClasses"/>
       <genOperations ecoreOperation="etricegen.ecore#//Root/getReferencedModels">
         <genParameters ecoreParameter="etricegen.ecore#//Root/getReferencedModels/cls"/>
       </genOperations>
@@ -49,6 +49,9 @@
       <genOperations ecoreOperation="etricegen.ecore#//Root/getExpandedActorClass">
         <genParameters ecoreParameter="etricegen.ecore#//Root/getExpandedActorClass/ai"/>
       </genOperations>
+      <genOperations ecoreOperation="etricegen.ecore#//Root/getExpandedActorClass.1">
+        <genParameters ecoreParameter="etricegen.ecore#//Root/getExpandedActorClass.1/ac"/>
+      </genOperations>
       <genOperations ecoreOperation="etricegen.ecore#//Root/getInstance">
         <genParameters ecoreParameter="etricegen.ecore#//Root/getInstance/path"/>
       </genOperations>
@@ -165,6 +168,10 @@
     </genClasses>
     <genClasses ecoreClass="etricegen.ecore#//ExpandedActorClass">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference etricegen.ecore#//ExpandedActorClass/actorClass"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etricegen.ecore#//ExpandedActorClass/graphContainer"/>
+      <genOperations ecoreOperation="etricegen.ecore#//ExpandedActorClass/getInterfaceItemLocalId">
+        <genParameters ecoreParameter="etricegen.ecore#//ExpandedActorClass/getInterfaceItemLocalId/ifitem"/>
+      </genOperations>
     </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortKind.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortKind.java
index b8826b774..15f4adcdf 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortKind.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/PortKind.java
@@ -233,6 +233,7 @@ public enum PortKind implements Enumerator {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getValue() {
 	  return value;
 	}
@@ -242,6 +243,7 @@ public enum PortKind implements Enumerator {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 	  return name;
 	}
@@ -251,6 +253,7 @@ public enum PortKind implements Enumerator {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getLiteral() {
 	  return literal;
 	}
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/AbstractInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/AbstractInstanceImpl.java
index 925caa900..6faae3988 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/AbstractInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/AbstractInstanceImpl.java
@@ -81,6 +81,7 @@ public abstract class AbstractInstanceImpl extends InstanceBaseImpl implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<PortInstance> getPorts() {
 		if (ports == null) {
 			ports = new EObjectContainmentEList<PortInstance>(PortInstance.class, this, ETriceGenPackage.ABSTRACT_INSTANCE__PORTS);
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java
index 65cb6982f..6480b8101 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInstanceImpl.java
@@ -103,6 +103,7 @@ public class ActorInstanceImpl extends StructureInstanceImpl implements ActorIns
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ActorClass getActorClass() {
 		if (actorClass != null && actorClass.eIsProxy()) {
 			InternalEObject oldActorClass = (InternalEObject)actorClass;
@@ -129,6 +130,7 @@ public class ActorInstanceImpl extends StructureInstanceImpl implements ActorIns
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setActorClass(ActorClass newActorClass) {
 		ActorClass oldActorClass = actorClass;
 		actorClass = newActorClass;
@@ -141,6 +143,7 @@ public class ActorInstanceImpl extends StructureInstanceImpl implements ActorIns
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getReplIdx() {
 		return replIdx;
 	}
@@ -150,6 +153,7 @@ public class ActorInstanceImpl extends StructureInstanceImpl implements ActorIns
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setReplIdx(int newReplIdx) {
 		int oldReplIdx = replIdx;
 		replIdx = newReplIdx;
@@ -248,7 +252,7 @@ public class ActorInstanceImpl extends StructureInstanceImpl implements ActorIns
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (replIdx: ");
 		result.append(replIdx);
 		result.append(')');
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInterfaceInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInterfaceInstanceImpl.java
index 42d44e39e..2cf4515bb 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInterfaceInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ActorInterfaceInstanceImpl.java
@@ -117,6 +117,7 @@ public class ActorInterfaceInstanceImpl extends AbstractInstanceImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ActorClass getActorClass() {
 		if (actorClass != null && actorClass.eIsProxy()) {
 			InternalEObject oldActorClass = (InternalEObject)actorClass;
@@ -143,6 +144,7 @@ public class ActorInterfaceInstanceImpl extends AbstractInstanceImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setActorClass(ActorClass newActorClass) {
 		ActorClass oldActorClass = actorClass;
 		actorClass = newActorClass;
@@ -155,6 +157,7 @@ public class ActorInterfaceInstanceImpl extends AbstractInstanceImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ServiceImplInstance> getProvidedServices() {
 		if (providedServices == null) {
 			providedServices = new EObjectResolvingEList<ServiceImplInstance>(ServiceImplInstance.class, this, ETriceGenPackage.ACTOR_INTERFACE_INSTANCE__PROVIDED_SERVICES);
@@ -167,6 +170,7 @@ public class ActorInterfaceInstanceImpl extends AbstractInstanceImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<OptionalActorInstance> getOptionalInstances() {
 		if (optionalInstances == null) {
 			optionalInstances = new EObjectResolvingEList<OptionalActorInstance>(OptionalActorInstance.class, this, ETriceGenPackage.ACTOR_INTERFACE_INSTANCE__OPTIONAL_INSTANCES);
@@ -179,6 +183,7 @@ public class ActorInterfaceInstanceImpl extends AbstractInstanceImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isArray() {
 		return array;
 	}
@@ -188,6 +193,7 @@ public class ActorInterfaceInstanceImpl extends AbstractInstanceImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setArray(boolean newArray) {
 		boolean oldArray = array;
 		array = newArray;
@@ -296,7 +302,7 @@ public class ActorInterfaceInstanceImpl extends AbstractInstanceImpl implements
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (array: ");
 		result.append(array);
 		result.append(')');
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/BindingInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/BindingInstanceImpl.java
index c8f950786..732c52c0f 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/BindingInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/BindingInstanceImpl.java
@@ -94,6 +94,7 @@ public class BindingInstanceImpl extends EObjectImpl implements BindingInstance
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<PortInstance> getPorts() {
 		if (ports == null) {
 			ports = new EObjectWithInverseResolvingEList.ManyInverse<PortInstance>(PortInstance.class, this, ETriceGenPackage.BINDING_INSTANCE__PORTS, ETriceGenPackage.PORT_INSTANCE__BINDINGS);
@@ -106,6 +107,7 @@ public class BindingInstanceImpl extends EObjectImpl implements BindingInstance
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Binding getBinding() {
 		if (binding != null && binding.eIsProxy()) {
 			InternalEObject oldBinding = (InternalEObject)binding;
@@ -132,6 +134,7 @@ public class BindingInstanceImpl extends EObjectImpl implements BindingInstance
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setBinding(Binding newBinding) {
 		Binding oldBinding = binding;
 		binding = newBinding;
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ConnectionInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ConnectionInstanceImpl.java
index a8c75ed0b..fbe5fd18c 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ConnectionInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ConnectionInstanceImpl.java
@@ -107,6 +107,7 @@ public class ConnectionInstanceImpl extends EObjectImpl implements ConnectionIns
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public AbstractInstance getFromAI() {
 		if (fromAI != null && fromAI.eIsProxy()) {
 			InternalEObject oldFromAI = (InternalEObject)fromAI;
@@ -133,6 +134,7 @@ public class ConnectionInstanceImpl extends EObjectImpl implements ConnectionIns
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setFromAI(AbstractInstance newFromAI) {
 		AbstractInstance oldFromAI = fromAI;
 		fromAI = newFromAI;
@@ -145,6 +147,7 @@ public class ConnectionInstanceImpl extends EObjectImpl implements ConnectionIns
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SPPInstance getFromSPP() {
 		if (fromSPP != null && fromSPP.eIsProxy()) {
 			InternalEObject oldFromSPP = (InternalEObject)fromSPP;
@@ -186,6 +189,7 @@ public class ConnectionInstanceImpl extends EObjectImpl implements ConnectionIns
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setFromSPP(SPPInstance newFromSPP) {
 		if (newFromSPP != fromSPP) {
 			NotificationChain msgs = null;
@@ -205,6 +209,7 @@ public class ConnectionInstanceImpl extends EObjectImpl implements ConnectionIns
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SPPInstance getToSPP() {
 		if (toSPP != null && toSPP.eIsProxy()) {
 			InternalEObject oldToSPP = (InternalEObject)toSPP;
@@ -246,6 +251,7 @@ public class ConnectionInstanceImpl extends EObjectImpl implements ConnectionIns
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setToSPP(SPPInstance newToSPP) {
 		if (newToSPP != toSPP) {
 			NotificationChain msgs = null;
@@ -265,6 +271,7 @@ public class ConnectionInstanceImpl extends EObjectImpl implements ConnectionIns
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public LayerConnection getConnection() {
 		if (connection != null && connection.eIsProxy()) {
 			InternalEObject oldConnection = (InternalEObject)connection;
@@ -291,6 +298,7 @@ public class ConnectionInstanceImpl extends EObjectImpl implements ConnectionIns
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setConnection(LayerConnection newConnection) {
 		LayerConnection oldConnection = connection;
 		connection = newConnection;
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenFactoryImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenFactoryImpl.java
index b716ba90e..83698f75a 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenFactoryImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenFactoryImpl.java
@@ -126,6 +126,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Root createRoot() {
 		RootImpl root = new RootImpl();
 		return root;
@@ -136,6 +137,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ActorInterfaceInstance createActorInterfaceInstance() {
 		ActorInterfaceInstanceImpl actorInterfaceInstance = new ActorInterfaceInstanceImpl();
 		return actorInterfaceInstance;
@@ -146,6 +148,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public StructureInstance createStructureInstance() {
 		StructureInstanceImpl structureInstance = new StructureInstanceImpl();
 		return structureInstance;
@@ -156,6 +159,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SystemInstance createSystemInstance() {
 		SystemInstanceImpl systemInstance = new SystemInstanceImpl();
 		return systemInstance;
@@ -166,6 +170,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SubSystemInstance createSubSystemInstance() {
 		SubSystemInstanceImpl subSystemInstance = new SubSystemInstanceImpl();
 		return subSystemInstance;
@@ -176,6 +181,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ActorInstance createActorInstance() {
 		ActorInstanceImpl actorInstance = new ActorInstanceImpl();
 		return actorInstance;
@@ -186,6 +192,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public OptionalActorInstance createOptionalActorInstance() {
 		OptionalActorInstanceImpl optionalActorInstance = new OptionalActorInstanceImpl();
 		return optionalActorInstance;
@@ -196,6 +203,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public InterfaceItemInstance createInterfaceItemInstance() {
 		InterfaceItemInstanceImpl interfaceItemInstance = new InterfaceItemInstanceImpl();
 		return interfaceItemInstance;
@@ -206,6 +214,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public PortInstance createPortInstance() {
 		PortInstanceImpl portInstance = new PortInstanceImpl();
 		return portInstance;
@@ -216,6 +225,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public BindingInstance createBindingInstance() {
 		BindingInstanceImpl bindingInstance = new BindingInstanceImpl();
 		return bindingInstance;
@@ -226,6 +236,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SAPInstance createSAPInstance() {
 		SAPInstanceImpl sapInstance = new SAPInstanceImpl();
 		return sapInstance;
@@ -236,6 +247,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SPPInstance createSPPInstance() {
 		SPPInstanceImpl sppInstance = new SPPInstanceImpl();
 		return sppInstance;
@@ -246,6 +258,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ServiceImplInstance createServiceImplInstance() {
 		ServiceImplInstanceImpl serviceImplInstance = new ServiceImplInstanceImpl();
 		return serviceImplInstance;
@@ -256,6 +269,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ConnectionInstance createConnectionInstance() {
 		ConnectionInstanceImpl connectionInstance = new ConnectionInstanceImpl();
 		return connectionInstance;
@@ -266,6 +280,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ExpandedActorClass createExpandedActorClass() {
 		ExpandedActorClassImpl expandedActorClass = new ExpandedActorClassImpl();
 		return expandedActorClass;
@@ -276,6 +291,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public OpenBinding createOpenBinding() {
 		OpenBindingImpl openBinding = new OpenBindingImpl();
 		return openBinding;
@@ -286,6 +302,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public OpenServiceConnection createOpenServiceConnection() {
 		OpenServiceConnectionImpl openServiceConnection = new OpenServiceConnectionImpl();
 		return openServiceConnection;
@@ -296,6 +313,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Wire createWire() {
 		WireImpl wire = new WireImpl();
 		return wire;
@@ -306,6 +324,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public WiredActorClass createWiredActorClass() {
 		WiredActorClassImpl wiredActorClass = new WiredActorClassImpl();
 		return wiredActorClass;
@@ -316,6 +335,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public WiredSubSystemClass createWiredSubSystemClass() {
 		WiredSubSystemClassImpl wiredSubSystemClass = new WiredSubSystemClassImpl();
 		return wiredSubSystemClass;
@@ -346,6 +366,7 @@ public class ETriceGenFactoryImpl extends EFactoryImpl implements ETriceGenFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ETriceGenPackage getETriceGenPackage() {
 		return (ETriceGenPackage)getEPackage();
 	}
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenPackageImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenPackageImpl.java
index b0bb5a8a9..540d67942 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenPackageImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenPackageImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.etrice.core.common.base.BasePackage;
 import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
 import org.eclipse.etrice.core.genmodel.etricegen.AbstractInstance;
 import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
@@ -254,7 +255,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>This method is used to initialize {@link ETriceGenPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
@@ -268,12 +269,15 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 		if (isInited) return (ETriceGenPackage)EPackage.Registry.INSTANCE.getEPackage(ETriceGenPackage.eNS_URI);
 
 		// Obtain or create and register package
-		ETriceGenPackageImpl theETriceGenPackage = (ETriceGenPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ETriceGenPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ETriceGenPackageImpl());
+		Object registeredETriceGenPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		ETriceGenPackageImpl theETriceGenPackage = registeredETriceGenPackage instanceof ETriceGenPackageImpl ? (ETriceGenPackageImpl)registeredETriceGenPackage : new ETriceGenPackageImpl();
 
 		isInited = true;
 
 		// Initialize simple dependencies
 		RoomPackage.eINSTANCE.eClass();
+		FSMPackage.eINSTANCE.eClass();
+		BasePackage.eINSTANCE.eClass();
 		FsmGenPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
@@ -285,7 +289,6 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 		// Mark meta-data to indicate it can't be changed
 		theETriceGenPackage.freeze();
 
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(ETriceGenPackage.eNS_URI, theETriceGenPackage);
 		return theETriceGenPackage;
@@ -296,6 +299,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getRoot() {
 		return rootEClass;
 	}
@@ -305,6 +309,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getRoot_Library() {
 		return (EAttribute)rootEClass.getEStructuralFeatures().get(0);
 	}
@@ -314,6 +319,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRoot_SystemInstances() {
 		return (EReference)rootEClass.getEStructuralFeatures().get(1);
 	}
@@ -323,6 +329,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRoot_OwnSubSystemInstances() {
 		return (EReference)rootEClass.getEStructuralFeatures().get(2);
 	}
@@ -332,6 +339,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRoot_SubSystemInstances() {
 		return (EReference)rootEClass.getEStructuralFeatures().get(3);
 	}
@@ -341,6 +349,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRoot_Models() {
 		return (EReference)rootEClass.getEStructuralFeatures().get(4);
 	}
@@ -350,6 +359,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRoot_ImportedModels() {
 		return (EReference)rootEClass.getEStructuralFeatures().get(5);
 	}
@@ -359,6 +369,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRoot_XpActorClasses() {
 		return (EReference)rootEClass.getEStructuralFeatures().get(6);
 	}
@@ -368,6 +379,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRoot_DataClasses() {
 		return (EReference)rootEClass.getEStructuralFeatures().get(7);
 	}
@@ -377,6 +389,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRoot_ProtocolClasses() {
 		return (EReference)rootEClass.getEStructuralFeatures().get(8);
 	}
@@ -386,6 +399,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRoot_ActorClasses() {
 		return (EReference)rootEClass.getEStructuralFeatures().get(9);
 	}
@@ -395,6 +409,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRoot_EnumClasses() {
 		return (EReference)rootEClass.getEStructuralFeatures().get(10);
 	}
@@ -404,6 +419,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRoot_SubSystemClasses() {
 		return (EReference)rootEClass.getEStructuralFeatures().get(11);
 	}
@@ -413,6 +429,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRoot_OptionalInstances() {
 		return (EReference)rootEClass.getEStructuralFeatures().get(12);
 	}
@@ -422,6 +439,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRoot_OptionalActorClasses() {
 		return (EReference)rootEClass.getEStructuralFeatures().get(13);
 	}
@@ -431,6 +449,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRoot_WiredInstances() {
 		return (EReference)rootEClass.getEStructuralFeatures().get(14);
 	}
@@ -440,6 +459,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getInstanceBase() {
 		return instanceBaseEClass;
 	}
@@ -449,6 +469,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getInstanceBase_Name() {
 		return (EAttribute)instanceBaseEClass.getEStructuralFeatures().get(0);
 	}
@@ -458,6 +479,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getInstanceBase_Path() {
 		return (EAttribute)instanceBaseEClass.getEStructuralFeatures().get(1);
 	}
@@ -467,6 +489,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getInstanceBase_ObjId() {
 		return (EAttribute)instanceBaseEClass.getEStructuralFeatures().get(2);
 	}
@@ -476,6 +499,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getInstanceBase_ThreadId() {
 		return (EAttribute)instanceBaseEClass.getEStructuralFeatures().get(3);
 	}
@@ -485,6 +509,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getInstanceBase_NObjIDs() {
 		return (EAttribute)instanceBaseEClass.getEStructuralFeatures().get(4);
 	}
@@ -494,6 +519,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getAbstractInstance() {
 		return abstractInstanceEClass;
 	}
@@ -503,6 +529,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getAbstractInstance_Ports() {
 		return (EReference)abstractInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -512,6 +539,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getActorInterfaceInstance() {
 		return actorInterfaceInstanceEClass;
 	}
@@ -521,6 +549,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getActorInterfaceInstance_ActorClass() {
 		return (EReference)actorInterfaceInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -530,6 +559,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getActorInterfaceInstance_ProvidedServices() {
 		return (EReference)actorInterfaceInstanceEClass.getEStructuralFeatures().get(1);
 	}
@@ -539,6 +569,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getActorInterfaceInstance_OptionalInstances() {
 		return (EReference)actorInterfaceInstanceEClass.getEStructuralFeatures().get(2);
 	}
@@ -548,6 +579,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getActorInterfaceInstance_Array() {
 		return (EAttribute)actorInterfaceInstanceEClass.getEStructuralFeatures().get(3);
 	}
@@ -557,6 +589,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getStructureInstance() {
 		return structureInstanceEClass;
 	}
@@ -566,6 +599,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getStructureInstance_Instances() {
 		return (EReference)structureInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -575,6 +609,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getStructureInstance_Saps() {
 		return (EReference)structureInstanceEClass.getEStructuralFeatures().get(1);
 	}
@@ -584,6 +619,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getStructureInstance_Spps() {
 		return (EReference)structureInstanceEClass.getEStructuralFeatures().get(2);
 	}
@@ -593,6 +629,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getStructureInstance_Services() {
 		return (EReference)structureInstanceEClass.getEStructuralFeatures().get(3);
 	}
@@ -602,6 +639,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getStructureInstance_Bindings() {
 		return (EReference)structureInstanceEClass.getEStructuralFeatures().get(4);
 	}
@@ -611,6 +649,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getStructureInstance_Connections() {
 		return (EReference)structureInstanceEClass.getEStructuralFeatures().get(5);
 	}
@@ -620,6 +659,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getStructureInstance_AllContainedInstances() {
 		return (EReference)structureInstanceEClass.getEStructuralFeatures().get(6);
 	}
@@ -629,6 +669,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getStructureInstance_OrderedIfItemInstances() {
 		return (EReference)structureInstanceEClass.getEStructuralFeatures().get(7);
 	}
@@ -638,6 +679,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSystemInstance() {
 		return systemInstanceEClass;
 	}
@@ -647,6 +689,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSystemInstance_Instances() {
 		return (EReference)systemInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -656,6 +699,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSystemInstance_LogicalSystem() {
 		return (EReference)systemInstanceEClass.getEStructuralFeatures().get(1);
 	}
@@ -665,6 +709,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSubSystemInstance() {
 		return subSystemInstanceEClass;
 	}
@@ -674,6 +719,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSubSystemInstance_SubSystemClass() {
 		return (EReference)subSystemInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -683,6 +729,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getSubSystemInstance_MaxObjId() {
 		return (EAttribute)subSystemInstanceEClass.getEStructuralFeatures().get(1);
 	}
@@ -692,6 +739,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getActorInstance() {
 		return actorInstanceEClass;
 	}
@@ -701,6 +749,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getActorInstance_ActorClass() {
 		return (EReference)actorInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -710,6 +759,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getActorInstance_ReplIdx() {
 		return (EAttribute)actorInstanceEClass.getEStructuralFeatures().get(1);
 	}
@@ -719,6 +769,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getActorInstance_UnindexedName() {
 		return (EAttribute)actorInstanceEClass.getEStructuralFeatures().get(2);
 	}
@@ -728,6 +779,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getOptionalActorInstance() {
 		return optionalActorInstanceEClass;
 	}
@@ -737,6 +789,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getOptionalActorInstance_ActorClass() {
 		return (EReference)optionalActorInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -746,6 +799,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getOptionalActorInstance_RequiredServices() {
 		return (EReference)optionalActorInstanceEClass.getEStructuralFeatures().get(1);
 	}
@@ -755,6 +809,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getInterfaceItemInstance() {
 		return interfaceItemInstanceEClass;
 	}
@@ -764,6 +819,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getInterfaceItemInstance_Protocol() {
 		return (EReference)interfaceItemInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -773,6 +829,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getInterfaceItemInstance_Peers() {
 		return (EReference)interfaceItemInstanceEClass.getEStructuralFeatures().get(1);
 	}
@@ -782,6 +839,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getPortInstance() {
 		return portInstanceEClass;
 	}
@@ -791,6 +849,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getPortInstance_Port() {
 		return (EReference)portInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -800,6 +859,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getPortInstance_Kind() {
 		return (EAttribute)portInstanceEClass.getEStructuralFeatures().get(1);
 	}
@@ -809,6 +869,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getPortInstance_Bindings() {
 		return (EReference)portInstanceEClass.getEStructuralFeatures().get(2);
 	}
@@ -818,6 +879,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getBindingInstance() {
 		return bindingInstanceEClass;
 	}
@@ -827,6 +889,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getBindingInstance_Ports() {
 		return (EReference)bindingInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -836,6 +899,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getBindingInstance_Binding() {
 		return (EReference)bindingInstanceEClass.getEStructuralFeatures().get(1);
 	}
@@ -845,6 +909,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSAPInstance() {
 		return sapInstanceEClass;
 	}
@@ -854,6 +919,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSAPInstance_Sap() {
 		return (EReference)sapInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -863,6 +929,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSPPInstance() {
 		return sppInstanceEClass;
 	}
@@ -872,6 +939,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSPPInstance_Spp() {
 		return (EReference)sppInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -881,6 +949,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSPPInstance_Incoming() {
 		return (EReference)sppInstanceEClass.getEStructuralFeatures().get(1);
 	}
@@ -890,6 +959,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSPPInstance_Outgoing() {
 		return (EReference)sppInstanceEClass.getEStructuralFeatures().get(2);
 	}
@@ -899,6 +969,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getServiceImplInstance() {
 		return serviceImplInstanceEClass;
 	}
@@ -908,6 +979,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getServiceImplInstance_SvcImpl() {
 		return (EReference)serviceImplInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -917,6 +989,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getConnectionInstance() {
 		return connectionInstanceEClass;
 	}
@@ -926,6 +999,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getConnectionInstance_FromAI() {
 		return (EReference)connectionInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -935,6 +1009,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getConnectionInstance_FromSPP() {
 		return (EReference)connectionInstanceEClass.getEStructuralFeatures().get(1);
 	}
@@ -944,6 +1019,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getConnectionInstance_ToSPP() {
 		return (EReference)connectionInstanceEClass.getEStructuralFeatures().get(2);
 	}
@@ -953,6 +1029,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getConnectionInstance_Connection() {
 		return (EReference)connectionInstanceEClass.getEStructuralFeatures().get(3);
 	}
@@ -962,6 +1039,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getExpandedActorClass() {
 		return expandedActorClassEClass;
 	}
@@ -971,6 +1049,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getExpandedActorClass_ActorClass() {
 		return (EReference)expandedActorClassEClass.getEStructuralFeatures().get(0);
 	}
@@ -980,6 +1059,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getExpandedActorClass_GraphContainer() {
 		return (EReference)expandedActorClassEClass.getEStructuralFeatures().get(1);
 	}
@@ -989,6 +1069,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getWiredStructureClass() {
 		return wiredStructureClassEClass;
 	}
@@ -998,6 +1079,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getWiredStructureClass_Wires() {
 		return (EReference)wiredStructureClassEClass.getEStructuralFeatures().get(0);
 	}
@@ -1007,6 +1089,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getWiredStructureClass_OpenBindings() {
 		return (EReference)wiredStructureClassEClass.getEStructuralFeatures().get(1);
 	}
@@ -1016,6 +1099,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getWiredStructureClass_ProvidedServices() {
 		return (EReference)wiredStructureClassEClass.getEStructuralFeatures().get(2);
 	}
@@ -1025,6 +1109,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getWiredStructureClass_RequiredServices() {
 		return (EReference)wiredStructureClassEClass.getEStructuralFeatures().get(3);
 	}
@@ -1034,6 +1119,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getOpenBinding() {
 		return openBindingEClass;
 	}
@@ -1043,6 +1129,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getOpenBinding_Path() {
 		return (EAttribute)openBindingEClass.getEStructuralFeatures().get(0);
 	}
@@ -1052,6 +1139,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getOpenBinding_Port() {
 		return (EReference)openBindingEClass.getEStructuralFeatures().get(1);
 	}
@@ -1061,6 +1149,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getOpenServiceConnection() {
 		return openServiceConnectionEClass;
 	}
@@ -1070,6 +1159,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getOpenServiceConnection_Path() {
 		return (EAttribute)openServiceConnectionEClass.getEStructuralFeatures().get(0);
 	}
@@ -1079,6 +1169,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getOpenServiceConnection_Protocol() {
 		return (EReference)openServiceConnectionEClass.getEStructuralFeatures().get(1);
 	}
@@ -1088,6 +1179,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getWire() {
 		return wireEClass;
 	}
@@ -1097,6 +1189,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getWire_DataDriven() {
 		return (EAttribute)wireEClass.getEStructuralFeatures().get(0);
 	}
@@ -1106,6 +1199,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getWire_Path1() {
 		return (EAttribute)wireEClass.getEStructuralFeatures().get(1);
 	}
@@ -1115,6 +1209,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getWire_Path2() {
 		return (EAttribute)wireEClass.getEStructuralFeatures().get(2);
 	}
@@ -1124,6 +1219,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getWiredActorClass() {
 		return wiredActorClassEClass;
 	}
@@ -1133,6 +1229,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getWiredActorClass_ActorClass() {
 		return (EReference)wiredActorClassEClass.getEStructuralFeatures().get(0);
 	}
@@ -1142,6 +1239,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getWiredSubSystemClass() {
 		return wiredSubSystemClassEClass;
 	}
@@ -1151,6 +1249,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getWiredSubSystemClass_SubSystemClass() {
 		return (EReference)wiredSubSystemClassEClass.getEStructuralFeatures().get(0);
 	}
@@ -1160,6 +1259,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EEnum getPortKind() {
 		return portKindEEnum;
 	}
@@ -1169,6 +1269,7 @@ public class ETriceGenPackageImpl extends EPackageImpl implements ETriceGenPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ETriceGenFactory getETriceGenFactory() {
 		return (ETriceGenFactory)getEFactoryInstance();
 	}
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java
index b54cb5897..83d50e284 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java
@@ -79,6 +79,7 @@ public class ExpandedActorClassImpl extends EObjectImpl implements ExpandedActor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ActorClass getActorClass() {
 		ActorClass actorClass = basicGetActorClass();
 		return actorClass != null && actorClass.eIsProxy() ? (ActorClass)eResolveProxy((InternalEObject)actorClass) : actorClass;
@@ -98,6 +99,7 @@ public class ExpandedActorClassImpl extends EObjectImpl implements ExpandedActor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public GraphContainer getGraphContainer() {
 		return graphContainer;
 	}
@@ -145,6 +147,7 @@ public class ExpandedActorClassImpl extends EObjectImpl implements ExpandedActor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setGraphContainer(GraphContainer newGraphContainer) {
 		if (newGraphContainer != graphContainer) {
 			NotificationChain msgs = null;
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java
index baead788e..315f454c5 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InstanceBaseImpl.java
@@ -148,6 +148,7 @@ public abstract class InstanceBaseImpl extends EObjectImpl implements InstanceBa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -157,6 +158,7 @@ public abstract class InstanceBaseImpl extends EObjectImpl implements InstanceBa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -186,6 +188,7 @@ public abstract class InstanceBaseImpl extends EObjectImpl implements InstanceBa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getObjId() {
 		return objId;
 	}
@@ -195,6 +198,7 @@ public abstract class InstanceBaseImpl extends EObjectImpl implements InstanceBa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setObjId(int newObjId) {
 		int oldObjId = objId;
 		objId = newObjId;
@@ -327,7 +331,7 @@ public abstract class InstanceBaseImpl extends EObjectImpl implements InstanceBa
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(", objId: ");
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java
index 2d478fa18..5c1392df5 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/InterfaceItemInstanceImpl.java
@@ -81,6 +81,7 @@ public class InterfaceItemInstanceImpl extends InstanceBaseImpl implements Inter
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ProtocolClass getProtocol() {
 		ProtocolClass protocol = basicGetProtocol();
 		return protocol != null && protocol.eIsProxy() ? (ProtocolClass)eResolveProxy((InternalEObject)protocol) : protocol;
@@ -109,6 +110,7 @@ public class InterfaceItemInstanceImpl extends InstanceBaseImpl implements Inter
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<InterfaceItemInstance> getPeers() {
 		if (peers == null) {
 			peers = new EObjectResolvingEList<InterfaceItemInstance>(InterfaceItemInstance.class, this, ETriceGenPackage.INTERFACE_ITEM_INSTANCE__PEERS);
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenBindingImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenBindingImpl.java
index f998f9fb6..ed3d74026 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenBindingImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenBindingImpl.java
@@ -85,6 +85,7 @@ public class OpenBindingImpl extends EObjectImpl implements OpenBinding {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<String> getPath() {
 		if (path == null) {
 			path = new EDataTypeEList<String>(String.class, this, ETriceGenPackage.OPEN_BINDING__PATH);
@@ -97,6 +98,7 @@ public class OpenBindingImpl extends EObjectImpl implements OpenBinding {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Port getPort() {
 		if (port != null && port.eIsProxy()) {
 			InternalEObject oldPort = (InternalEObject)port;
@@ -123,6 +125,7 @@ public class OpenBindingImpl extends EObjectImpl implements OpenBinding {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setPort(Port newPort) {
 		Port oldPort = port;
 		port = newPort;
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenServiceConnectionImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenServiceConnectionImpl.java
index 2dc25d9f7..5300ac059 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenServiceConnectionImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OpenServiceConnectionImpl.java
@@ -85,6 +85,7 @@ public class OpenServiceConnectionImpl extends EObjectImpl implements OpenServic
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<String> getPath() {
 		if (path == null) {
 			path = new EDataTypeEList<String>(String.class, this, ETriceGenPackage.OPEN_SERVICE_CONNECTION__PATH);
@@ -97,6 +98,7 @@ public class OpenServiceConnectionImpl extends EObjectImpl implements OpenServic
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ProtocolClass getProtocol() {
 		if (protocol != null && protocol.eIsProxy()) {
 			InternalEObject oldProtocol = (InternalEObject)protocol;
@@ -123,6 +125,7 @@ public class OpenServiceConnectionImpl extends EObjectImpl implements OpenServic
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setProtocol(ProtocolClass newProtocol) {
 		ProtocolClass oldProtocol = protocol;
 		protocol = newProtocol;
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OptionalActorInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OptionalActorInstanceImpl.java
index 45629fd16..5a605fef7 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OptionalActorInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/OptionalActorInstanceImpl.java
@@ -87,6 +87,7 @@ public class OptionalActorInstanceImpl extends StructureInstanceImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ActorClass getActorClass() {
 		if (actorClass != null && actorClass.eIsProxy()) {
 			InternalEObject oldActorClass = (InternalEObject)actorClass;
@@ -113,6 +114,7 @@ public class OptionalActorInstanceImpl extends StructureInstanceImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setActorClass(ActorClass newActorClass) {
 		ActorClass oldActorClass = actorClass;
 		actorClass = newActorClass;
@@ -125,6 +127,7 @@ public class OptionalActorInstanceImpl extends StructureInstanceImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<SAPInstance> getRequiredServices() {
 		if (requiredServices == null) {
 			requiredServices = new EObjectResolvingEList<SAPInstance>(SAPInstance.class, this, ETriceGenPackage.OPTIONAL_ACTOR_INSTANCE__REQUIRED_SERVICES);
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java
index 55477cddf..0f703a6de 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/PortInstanceImpl.java
@@ -112,6 +112,7 @@ public class PortInstanceImpl extends InterfaceItemInstanceImpl implements PortI
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Port getPort() {
 		if (port != null && port.eIsProxy()) {
 			InternalEObject oldPort = (InternalEObject)port;
@@ -138,6 +139,7 @@ public class PortInstanceImpl extends InterfaceItemInstanceImpl implements PortI
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setPort(Port newPort) {
 		Port oldPort = port;
 		port = newPort;
@@ -150,6 +152,7 @@ public class PortInstanceImpl extends InterfaceItemInstanceImpl implements PortI
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public PortKind getKind() {
 		return kind;
 	}
@@ -159,6 +162,7 @@ public class PortInstanceImpl extends InterfaceItemInstanceImpl implements PortI
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setKind(PortKind newKind) {
 		PortKind oldKind = kind;
 		kind = newKind == null ? KIND_EDEFAULT : newKind;
@@ -171,6 +175,7 @@ public class PortInstanceImpl extends InterfaceItemInstanceImpl implements PortI
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<BindingInstance> getBindings() {
 		if (bindings == null) {
 			bindings = new EObjectWithInverseResolvingEList.ManyInverse<BindingInstance>(BindingInstance.class, this, ETriceGenPackage.PORT_INSTANCE__BINDINGS, ETriceGenPackage.BINDING_INSTANCE__PORTS);
@@ -297,7 +302,7 @@ public class PortInstanceImpl extends InterfaceItemInstanceImpl implements PortI
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (kind: ");
 		result.append(kind);
 		result.append(')');
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java
index 9ba9f8285..cba9037fd 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java
@@ -247,6 +247,7 @@ public class RootImpl extends EObjectImpl implements Root {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<RoomModel> getModels() {
 		if (models == null) {
 			models = new EObjectResolvingEList<RoomModel>(RoomModel.class, this, ETriceGenPackage.ROOT__MODELS);
@@ -259,6 +260,7 @@ public class RootImpl extends EObjectImpl implements Root {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<RoomModel> getImportedModels() {
 		if (importedModels == null) {
 			importedModels = new EObjectResolvingEList<RoomModel>(RoomModel.class, this, ETriceGenPackage.ROOT__IMPORTED_MODELS);
@@ -271,6 +273,7 @@ public class RootImpl extends EObjectImpl implements Root {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ExpandedActorClass> getXpActorClasses() {
 		if (xpActorClasses == null) {
 			xpActorClasses = new EObjectContainmentEList<ExpandedActorClass>(ExpandedActorClass.class, this, ETriceGenPackage.ROOT__XP_ACTOR_CLASSES);
@@ -343,6 +346,7 @@ public class RootImpl extends EObjectImpl implements Root {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<OptionalActorInstance> getOptionalInstances() {
 		if (optionalInstances == null) {
 			optionalInstances = new EObjectContainmentEList<OptionalActorInstance>(OptionalActorInstance.class, this, ETriceGenPackage.ROOT__OPTIONAL_INSTANCES);
@@ -355,6 +359,7 @@ public class RootImpl extends EObjectImpl implements Root {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ActorClass> getOptionalActorClasses() {
 		if (optionalActorClasses == null) {
 			optionalActorClasses = new EObjectResolvingEList<ActorClass>(ActorClass.class, this, ETriceGenPackage.ROOT__OPTIONAL_ACTOR_CLASSES);
@@ -367,6 +372,7 @@ public class RootImpl extends EObjectImpl implements Root {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<WiredStructureClass> getWiredInstances() {
 		if (wiredInstances == null) {
 			wiredInstances = new EObjectContainmentEList<WiredStructureClass>(WiredStructureClass.class, this, ETriceGenPackage.ROOT__WIRED_INSTANCES);
@@ -379,6 +385,7 @@ public class RootImpl extends EObjectImpl implements Root {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isLibrary() {
 		return library;
 	}
@@ -388,6 +395,7 @@ public class RootImpl extends EObjectImpl implements Root {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setLibrary(boolean newLibrary) {
 		boolean oldLibrary = library;
 		library = newLibrary;
@@ -400,6 +408,7 @@ public class RootImpl extends EObjectImpl implements Root {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<SystemInstance> getSystemInstances() {
 		if (systemInstances == null) {
 			systemInstances = new EObjectContainmentEList<SystemInstance>(SystemInstance.class, this, ETriceGenPackage.ROOT__SYSTEM_INSTANCES);
@@ -412,6 +421,7 @@ public class RootImpl extends EObjectImpl implements Root {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<SubSystemInstance> getOwnSubSystemInstances() {
 		if (ownSubSystemInstances == null) {
 			ownSubSystemInstances = new EObjectContainmentEList<SubSystemInstance>(SubSystemInstance.class, this, ETriceGenPackage.ROOT__OWN_SUB_SYSTEM_INSTANCES);
@@ -815,7 +825,7 @@ public class RootImpl extends EObjectImpl implements Root {
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (library: ");
 		result.append(library);
 		result.append(')');
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java
index b77f5d38f..7e11b3b7b 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SAPInstanceImpl.java
@@ -73,6 +73,7 @@ public class SAPInstanceImpl extends InterfaceItemInstanceImpl implements SAPIns
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SAP getSap() {
 		if (sap != null && sap.eIsProxy()) {
 			InternalEObject oldSap = (InternalEObject)sap;
@@ -99,6 +100,7 @@ public class SAPInstanceImpl extends InterfaceItemInstanceImpl implements SAPIns
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setSap(SAP newSap) {
 		SAP oldSap = sap;
 		sap = newSap;
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java
index 5c9d137c8..ffab08ebd 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SPPInstanceImpl.java
@@ -105,6 +105,7 @@ public class SPPInstanceImpl extends InstanceBaseImpl implements SPPInstance {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SPP getSpp() {
 		if (spp != null && spp.eIsProxy()) {
 			InternalEObject oldSpp = (InternalEObject)spp;
@@ -131,6 +132,7 @@ public class SPPInstanceImpl extends InstanceBaseImpl implements SPPInstance {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setSpp(SPP newSpp) {
 		SPP oldSpp = spp;
 		spp = newSpp;
@@ -143,6 +145,7 @@ public class SPPInstanceImpl extends InstanceBaseImpl implements SPPInstance {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ConnectionInstance> getIncoming() {
 		if (incoming == null) {
 			incoming = new EObjectWithInverseResolvingEList<ConnectionInstance>(ConnectionInstance.class, this, ETriceGenPackage.SPP_INSTANCE__INCOMING, ETriceGenPackage.CONNECTION_INSTANCE__TO_SPP);
@@ -155,6 +158,7 @@ public class SPPInstanceImpl extends InstanceBaseImpl implements SPPInstance {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ConnectionInstance getOutgoing() {
 		if (outgoing != null && outgoing.eIsProxy()) {
 			InternalEObject oldOutgoing = (InternalEObject)outgoing;
@@ -196,6 +200,7 @@ public class SPPInstanceImpl extends InstanceBaseImpl implements SPPInstance {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setOutgoing(ConnectionInstance newOutgoing) {
 		if (newOutgoing != outgoing) {
 			NotificationChain msgs = null;
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java
index dfd43e0e3..e3871aaa9 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ServiceImplInstanceImpl.java
@@ -74,6 +74,7 @@ public class ServiceImplInstanceImpl extends InterfaceItemInstanceImpl implement
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ServiceImplementation getSvcImpl() {
 		if (svcImpl != null && svcImpl.eIsProxy()) {
 			InternalEObject oldSvcImpl = (InternalEObject)svcImpl;
@@ -100,6 +101,7 @@ public class ServiceImplInstanceImpl extends InterfaceItemInstanceImpl implement
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setSvcImpl(ServiceImplementation newSvcImpl) {
 		ServiceImplementation oldSvcImpl = svcImpl;
 		svcImpl = newSvcImpl;
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java
index 779041686..5fbc02538 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/StructureInstanceImpl.java
@@ -156,6 +156,7 @@ public class StructureInstanceImpl extends AbstractInstanceImpl implements Struc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<AbstractInstance> getInstances() {
 		if (instances == null) {
 			instances = new EObjectContainmentEList<AbstractInstance>(AbstractInstance.class, this, ETriceGenPackage.STRUCTURE_INSTANCE__INSTANCES);
@@ -168,6 +169,7 @@ public class StructureInstanceImpl extends AbstractInstanceImpl implements Struc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<SAPInstance> getSaps() {
 		if (saps == null) {
 			saps = new EObjectContainmentEList<SAPInstance>(SAPInstance.class, this, ETriceGenPackage.STRUCTURE_INSTANCE__SAPS);
@@ -180,6 +182,7 @@ public class StructureInstanceImpl extends AbstractInstanceImpl implements Struc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<SPPInstance> getSpps() {
 		if (spps == null) {
 			spps = new EObjectContainmentEList<SPPInstance>(SPPInstance.class, this, ETriceGenPackage.STRUCTURE_INSTANCE__SPPS);
@@ -192,6 +195,7 @@ public class StructureInstanceImpl extends AbstractInstanceImpl implements Struc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ServiceImplInstance> getServices() {
 		if (services == null) {
 			services = new EObjectContainmentEList<ServiceImplInstance>(ServiceImplInstance.class, this, ETriceGenPackage.STRUCTURE_INSTANCE__SERVICES);
@@ -204,6 +208,7 @@ public class StructureInstanceImpl extends AbstractInstanceImpl implements Struc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<BindingInstance> getBindings() {
 		if (bindings == null) {
 			bindings = new EObjectContainmentEList<BindingInstance>(BindingInstance.class, this, ETriceGenPackage.STRUCTURE_INSTANCE__BINDINGS);
@@ -216,6 +221,7 @@ public class StructureInstanceImpl extends AbstractInstanceImpl implements Struc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ConnectionInstance> getConnections() {
 		if (connections == null) {
 			connections = new EObjectContainmentEList<ConnectionInstance>(ConnectionInstance.class, this, ETriceGenPackage.STRUCTURE_INSTANCE__CONNECTIONS);
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java
index e6b1cc98c..ff4ec66fa 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SubSystemInstanceImpl.java
@@ -91,6 +91,7 @@ public class SubSystemInstanceImpl extends StructureInstanceImpl implements SubS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SubSystemClass getSubSystemClass() {
 		if (subSystemClass != null && subSystemClass.eIsProxy()) {
 			InternalEObject oldSubSystemClass = (InternalEObject)subSystemClass;
@@ -117,6 +118,7 @@ public class SubSystemInstanceImpl extends StructureInstanceImpl implements SubS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setSubSystemClass(SubSystemClass newSubSystemClass) {
 		SubSystemClass oldSubSystemClass = subSystemClass;
 		subSystemClass = newSubSystemClass;
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SystemInstanceImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SystemInstanceImpl.java
index 26b86ebc2..c66fd4e68 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SystemInstanceImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/SystemInstanceImpl.java
@@ -91,6 +91,7 @@ public class SystemInstanceImpl extends InstanceBaseImpl implements SystemInstan
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<SubSystemInstance> getInstances() {
 		if (instances == null) {
 			instances = new EObjectContainmentEList<SubSystemInstance>(SubSystemInstance.class, this, ETriceGenPackage.SYSTEM_INSTANCE__INSTANCES);
@@ -103,6 +104,7 @@ public class SystemInstanceImpl extends InstanceBaseImpl implements SystemInstan
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public LogicalSystem getLogicalSystem() {
 		if (logicalSystem != null && logicalSystem.eIsProxy()) {
 			InternalEObject oldLogicalSystem = (InternalEObject)logicalSystem;
@@ -129,6 +131,7 @@ public class SystemInstanceImpl extends InstanceBaseImpl implements SystemInstan
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setLogicalSystem(LogicalSystem newLogicalSystem) {
 		LogicalSystem oldLogicalSystem = logicalSystem;
 		logicalSystem = newLogicalSystem;
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WireImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WireImpl.java
index fd8d37e9c..505c12fa9 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WireImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WireImpl.java
@@ -104,6 +104,7 @@ public class WireImpl extends EObjectImpl implements Wire {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isDataDriven() {
 		return dataDriven;
 	}
@@ -113,6 +114,7 @@ public class WireImpl extends EObjectImpl implements Wire {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDataDriven(boolean newDataDriven) {
 		boolean oldDataDriven = dataDriven;
 		dataDriven = newDataDriven;
@@ -125,6 +127,7 @@ public class WireImpl extends EObjectImpl implements Wire {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<String> getPath1() {
 		if (path1 == null) {
 			path1 = new EDataTypeEList<String>(String.class, this, ETriceGenPackage.WIRE__PATH1);
@@ -137,6 +140,7 @@ public class WireImpl extends EObjectImpl implements Wire {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<String> getPath2() {
 		if (path2 == null) {
 			path2 = new EDataTypeEList<String>(String.class, this, ETriceGenPackage.WIRE__PATH2);
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredActorClassImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredActorClassImpl.java
index 44163d717..77e2593d2 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredActorClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredActorClassImpl.java
@@ -73,6 +73,7 @@ public class WiredActorClassImpl extends WiredStructureClassImpl implements Wire
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ActorClass getActorClass() {
 		if (actorClass != null && actorClass.eIsProxy()) {
 			InternalEObject oldActorClass = (InternalEObject)actorClass;
@@ -99,6 +100,7 @@ public class WiredActorClassImpl extends WiredStructureClassImpl implements Wire
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setActorClass(ActorClass newActorClass) {
 		ActorClass oldActorClass = actorClass;
 		actorClass = newActorClass;
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredStructureClassImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredStructureClassImpl.java
index 29bc90ed2..8706b3396 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredStructureClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredStructureClassImpl.java
@@ -109,6 +109,7 @@ public abstract class WiredStructureClassImpl extends EObjectImpl implements Wir
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Wire> getWires() {
 		if (wires == null) {
 			wires = new EObjectContainmentEList<Wire>(Wire.class, this, ETriceGenPackage.WIRED_STRUCTURE_CLASS__WIRES);
@@ -121,6 +122,7 @@ public abstract class WiredStructureClassImpl extends EObjectImpl implements Wir
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<OpenBinding> getOpenBindings() {
 		if (openBindings == null) {
 			openBindings = new EObjectContainmentEList<OpenBinding>(OpenBinding.class, this, ETriceGenPackage.WIRED_STRUCTURE_CLASS__OPEN_BINDINGS);
@@ -133,6 +135,7 @@ public abstract class WiredStructureClassImpl extends EObjectImpl implements Wir
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<OpenServiceConnection> getProvidedServices() {
 		if (providedServices == null) {
 			providedServices = new EObjectContainmentEList<OpenServiceConnection>(OpenServiceConnection.class, this, ETriceGenPackage.WIRED_STRUCTURE_CLASS__PROVIDED_SERVICES);
@@ -145,6 +148,7 @@ public abstract class WiredStructureClassImpl extends EObjectImpl implements Wir
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<OpenServiceConnection> getRequiredServices() {
 		if (requiredServices == null) {
 			requiredServices = new EObjectContainmentEList<OpenServiceConnection>(OpenServiceConnection.class, this, ETriceGenPackage.WIRED_STRUCTURE_CLASS__REQUIRED_SERVICES);
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredSubSystemClassImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredSubSystemClassImpl.java
index 719695281..18ecfdfa7 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredSubSystemClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/WiredSubSystemClassImpl.java
@@ -73,6 +73,7 @@ public class WiredSubSystemClassImpl extends WiredStructureClassImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SubSystemClass getSubSystemClass() {
 		if (subSystemClass != null && subSystemClass.eIsProxy()) {
 			InternalEObject oldSubSystemClass = (InternalEObject)subSystemClass;
@@ -99,6 +100,7 @@ public class WiredSubSystemClassImpl extends WiredStructureClassImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setSubSystemClass(SubSystemClass newSubSystemClass) {
 		SubSystemClass oldSubSystemClass = subSystemClass;
 		subSystemClass = newSubSystemClass;
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenAdapterFactory.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenAdapterFactory.java
index 658df1813..1fb2c3ced 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenAdapterFactory.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenAdapterFactory.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 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.genmodel.etricegen.AbstractInstance;
 import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
 import org.eclipse.etrice.core.genmodel.etricegen.ActorInterfaceInstance;
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java
index 7a23a5d05..9dc44123c 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java
@@ -17,6 +17,7 @@ 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.genmodel.etricegen.AbstractInstance;
 import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
 import org.eclipse.etrice.core.genmodel.etricegen.ActorInterfaceInstance;
author	Juergen Haug	2020-11-26 08:35:51 +0000
committer	Juergen Haug	2020-11-26 08:39:08 +0000
commit	1bbc3434b313ccd62994586bd4efaa4560fe5e7d (patch)
tree	8b3135429d42a3bb9614717aaeddd2fa93e5acea /plugins
parent	35e8fb0e6be46e55fbc66540c8b15ee57b27c5bd (diff)
download	org.eclipse.etrice-1bbc3434b313ccd62994586bd4efaa4560fe5e7d.tar.gz org.eclipse.etrice-1bbc3434b313ccd62994586bd4efaa4560fe5e7d.tar.xz org.eclipse.etrice-1bbc3434b313ccd62994586bd4efaa4560fe5e7d.zip