From 2a716e4edf716d59633d3b14f6e59c6213bdebff Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@kit.edu>
Date: Thu, 7 Sep 2023 10:44:55 +0200
Subject: [PATCH 1/2] Add fixes for simulink

---
 .../.classpath                                |   6 +
 .../.project                                  |  28 ++++
 .../.classpath                                |   7 +
 .../.project                                  |  28 ++++
 .../META-INF/MANIFEST.MF                      |   6 +-
 .../model/simuLink.genmodel                   | 138 -----------------
 .../model/{simuLink.ecore => simulink.ecore}  |   0
 .../model/simulink.genmodel                   | 140 ++++++++++++++++++
 .../plugin.xml                                |   5 +-
 9 files changed, 214 insertions(+), 144 deletions(-)
 create mode 100644 bundles/edu.kit.ipd.sdq.metamodels.autosar/.classpath
 create mode 100644 bundles/edu.kit.ipd.sdq.metamodels.autosar/.project
 create mode 100644 bundles/edu.kit.ipd.sdq.metamodels.simulink/.classpath
 create mode 100644 bundles/edu.kit.ipd.sdq.metamodels.simulink/.project
 delete mode 100755 bundles/edu.kit.ipd.sdq.metamodels.simulink/model/simuLink.genmodel
 rename bundles/edu.kit.ipd.sdq.metamodels.simulink/model/{simuLink.ecore => simulink.ecore} (100%)
 mode change 100755 => 100644
 create mode 100644 bundles/edu.kit.ipd.sdq.metamodels.simulink/model/simulink.genmodel

diff --git a/bundles/edu.kit.ipd.sdq.metamodels.autosar/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.autosar/.classpath
new file mode 100644
index 0000000..a9f4be7
--- /dev/null
+++ b/bundles/edu.kit.ipd.sdq.metamodels.autosar/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.autosar/.project b/bundles/edu.kit.ipd.sdq.metamodels.autosar/.project
new file mode 100644
index 0000000..97c935a
--- /dev/null
+++ b/bundles/edu.kit.ipd.sdq.metamodels.autosar/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>edu.kit.ipd.sdq.metamodels.autosar</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.simulink/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.simulink/.classpath
new file mode 100644
index 0000000..98640b3
--- /dev/null
+++ b/bundles/edu.kit.ipd.sdq.metamodels.simulink/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.simulink/.project b/bundles/edu.kit.ipd.sdq.metamodels.simulink/.project
new file mode 100644
index 0000000..0a4a023
--- /dev/null
+++ b/bundles/edu.kit.ipd.sdq.metamodels.simulink/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>edu.kit.ipd.sdq.metamodels.simulink</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.simulink/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.simulink/META-INF/MANIFEST.MF
index fb8baed..22ebd4b 100755
--- a/bundles/edu.kit.ipd.sdq.metamodels.simulink/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.simulink/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Export-Package: simulink,
- simulink.impl,
- simulink.util
+Export-Package: edu.kit.ipd.sdq.metamodels.simulink,
+ edu.kit.ipd.sdq.metamodels.simulink.impl,
+ edu.kit.ipd.sdq.metamodels.simulink.util
 Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.simulink/model/simuLink.genmodel b/bundles/edu.kit.ipd.sdq.metamodels.simulink/model/simuLink.genmodel
deleted file mode 100755
index b9b713f..0000000
--- a/bundles/edu.kit.ipd.sdq.metamodels.simulink/model/simuLink.genmodel
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel 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" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
-    modelDirectory="/SimuLink/src-gen" creationIcons="false" editDirectory="/SimuLink.edit/src-gen"
-    editorDirectory="/SimuLink.editor/src-gen" modelPluginID="SimuLink" modelName="SimuLink"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    operationReflection="true" importOrganizing="true">
-  <foreignModel>simuLink.ecore</foreignModel>
-  <testsDirectory xsi:nil="true"/>
-  <genPackages prefix="SimuLink" disposableProviderFactory="true" ecorePackage="simuLink.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="simuLink.ecore#//EnableStates">
-      <genEnumLiterals ecoreEnumLiteral="simuLink.ecore#//EnableStates/Held"/>
-      <genEnumLiterals ecoreEnumLiteral="simuLink.ecore#//EnableStates/Reset"/>
-      <genEnumLiterals ecoreEnumLiteral="simuLink.ecore#//EnableStates/Inherit"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="simuLink.ecore#//TriggerType">
-      <genEnumLiterals ecoreEnumLiteral="simuLink.ecore#//TriggerType/Rising"/>
-      <genEnumLiterals ecoreEnumLiteral="simuLink.ecore#//TriggerType/Falling"/>
-      <genEnumLiterals ecoreEnumLiteral="simuLink.ecore#//TriggerType/Either"/>
-      <genEnumLiterals ecoreEnumLiteral="simuLink.ecore#//TriggerType/FunctionCall"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="simuLink.ecore#//TagVisibility">
-      <genEnumLiterals ecoreEnumLiteral="simuLink.ecore#//TagVisibility/Local"/>
-      <genEnumLiterals ecoreEnumLiteral="simuLink.ecore#//TagVisibility/Scoped"/>
-      <genEnumLiterals ecoreEnumLiteral="simuLink.ecore#//TagVisibility/Global"/>
-    </genEnums>
-    <genClasses image="false" ecoreClass="simuLink.ecore#//SimulinkElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simuLink.ecore#//SimulinkElement/simulinkRef"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//SimulinkElement/name"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//Block">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simuLink.ecore#//Block/parameters"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simuLink.ecore#//Block/ports"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference simuLink.ecore#//Block/trigger"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference simuLink.ecore#//Block/enabler"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference simuLink.ecore#//Block/contains"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference simuLink.ecore#//Block/outports"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference simuLink.ecore#//Block/parent"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference simuLink.ecore#//Block/sourceBlock"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simuLink.ecore#//Block/sourceBlockRef"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="simuLink.ecore#//Port">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference simuLink.ecore#//Port/container"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simuLink.ecore#//Port/portBlock"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simuLink.ecore#//Port/parameters"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//Parameter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//Parameter/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//Parameter/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//Parameter/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//Parameter/readOnly"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//InPort">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simuLink.ecore#//InPort/connection"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//OutPort">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simuLink.ecore#//OutPort/connection"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="simuLink.ecore#//Connection">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//Connection/lineName"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simuLink.ecore#//Connection/outport"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//Trigger">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//Trigger/triggerType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//Trigger/statesWhenEnabling"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//Enable">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//Enable/statesWhenEnabling"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//BusSelector">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simuLink.ecore#//BusSelector/mappings"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//BusSelector/outputAsBus"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simuLink.ecore#//BusSelector/busCreator"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//BusCreator"/>
-    <genClasses ecoreClass="simuLink.ecore#//Goto">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simuLink.ecore#//Goto/fromBlocks"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//Goto/tagVisibility"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//Goto/gotoTag"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="simuLink.ecore#//VirtualBlock"/>
-    <genClasses ecoreClass="simuLink.ecore#//From">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simuLink.ecore#//From/gotoBlock"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//SimulinkModel">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//SimulinkModel/version"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simuLink.ecore#//SimulinkModel/contains"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//SimulinkModel/file"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//SimulinkModel/library"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simuLink.ecore#//SimulinkModel/connection"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//MultiConnection">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simuLink.ecore#//MultiConnection/connections"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//SingleConnection">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference simuLink.ecore#//SingleConnection/parent"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simuLink.ecore#//SingleConnection/inport"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="simuLink.ecore#//PortBlock">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simuLink.ecore#//PortBlock/port"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//OutPortBlock"/>
-    <genClasses ecoreClass="simuLink.ecore#//InPortBlock"/>
-    <genClasses ecoreClass="simuLink.ecore#//TriggerBlock"/>
-    <genClasses ecoreClass="simuLink.ecore#//EnableBlock"/>
-    <genClasses image="false" ecoreClass="simuLink.ecore#//SimulinkReference">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simuLink.ecore#//SimulinkReference/element"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//SimulinkReference/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//SimulinkReference/qualifier"/>
-      <genOperations ecoreOperation="simuLink.ecore#//SimulinkReference/getFQN" body="if(qualifier != null)&#xD;&#xA;&#x9;return qualifier+&quot;/&quot;+name;&#xD;&#xA;else &#xD;&#xA;&#x9;return name;"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//GotoTagVisibility">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simuLink.ecore#//GotoTagVisibility/gotoBlock"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//SubSystem">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simuLink.ecore#//SubSystem/subBlocks"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//SubSystem/tag"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//ModelReference">
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference simuLink.ecore#//ModelReference/referencedModel"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simuLink.ecore#//ModelReference/modelRef"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="simuLink.ecore#//BusSpecification"/>
-    <genClasses ecoreClass="simuLink.ecore#//BusSignalMapping">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference simuLink.ecore#//BusSignalMapping/selector"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simuLink.ecore#//BusSignalMapping/mappingFrom"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simuLink.ecore#//BusSignalMapping/mappingTo"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//BusSignalMapping/mappingPath"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//BusSignalMapping/incomplete"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//LibraryLinkReference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simuLink.ecore#//LibraryLinkReference/disabled"/>
-    </genClasses>
-    <genClasses ecoreClass="simuLink.ecore#//IdentifierReference"/>
-    <genClasses ecoreClass="simuLink.ecore#//State"/>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.simulink/model/simuLink.ecore b/bundles/edu.kit.ipd.sdq.metamodels.simulink/model/simulink.ecore
old mode 100755
new mode 100644
similarity index 100%
rename from bundles/edu.kit.ipd.sdq.metamodels.simulink/model/simuLink.ecore
rename to bundles/edu.kit.ipd.sdq.metamodels.simulink/model/simulink.ecore
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.simulink/model/simulink.genmodel b/bundles/edu.kit.ipd.sdq.metamodels.simulink/model/simulink.genmodel
new file mode 100644
index 0000000..8c6452e
--- /dev/null
+++ b/bundles/edu.kit.ipd.sdq.metamodels.simulink/model/simulink.genmodel
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/edu.kit.ipd.sdq.metamodels.simulink/src-gen" editDirectory="/edu.kit.ipd.sdq.metamodels.simulink.edit/src-gen"
+    editorDirectory="/edu.kit.ipd.sdq.metamodels.simulink.editor/src-gen" modelPluginID="edu.kit.ipd.sdq.metamodels.simulink"
+    modelName="SimuLink" editPluginClass="edu.kit.ipd.sdq.metamodels.simulink.provider.SimuLinkEditPlugin"
+    editorPluginClass="edu.kit.ipd.sdq.metamodels.simulink.presentation.SimuLinkEditorPlugin"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/edu.kit.ipd.sdq.metamodels.simulink.tests/src-gen"
+    testSuiteClass="edu.kit.ipd.sdq.metamodels.simulink.tests.SimuLinkAllTests" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="8.0" copyrightFields="false" editPluginID="edu.kit.ipd.sdq.metamodels.simulink.edit"
+    editorPluginID="edu.kit.ipd.sdq.metamodels.simulink.editor" operationReflection="true"
+    importOrganizing="true" pluginKey="simulink">
+  <foreignModel>simulink.ecore</foreignModel>
+  <genPackages prefix="SimuLink" basePackage="edu.kit.ipd.sdq.metamodels" disposableProviderFactory="true" ecorePackage="simulink.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="simulink.ecore#//EnableStates">
+      <genEnumLiterals ecoreEnumLiteral="simulink.ecore#//EnableStates/Held"/>
+      <genEnumLiterals ecoreEnumLiteral="simulink.ecore#//EnableStates/Reset"/>
+      <genEnumLiterals ecoreEnumLiteral="simulink.ecore#//EnableStates/Inherit"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="simulink.ecore#//TriggerType">
+      <genEnumLiterals ecoreEnumLiteral="simulink.ecore#//TriggerType/Rising"/>
+      <genEnumLiterals ecoreEnumLiteral="simulink.ecore#//TriggerType/Falling"/>
+      <genEnumLiterals ecoreEnumLiteral="simulink.ecore#//TriggerType/Either"/>
+      <genEnumLiterals ecoreEnumLiteral="simulink.ecore#//TriggerType/FunctionCall"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="simulink.ecore#//TagVisibility">
+      <genEnumLiterals ecoreEnumLiteral="simulink.ecore#//TagVisibility/Local"/>
+      <genEnumLiterals ecoreEnumLiteral="simulink.ecore#//TagVisibility/Scoped"/>
+      <genEnumLiterals ecoreEnumLiteral="simulink.ecore#//TagVisibility/Global"/>
+    </genEnums>
+    <genClasses image="false" ecoreClass="simulink.ecore#//SimulinkElement">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simulink.ecore#//SimulinkElement/simulinkRef"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//SimulinkElement/name"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//Block">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simulink.ecore#//Block/parameters"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simulink.ecore#//Block/ports"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference simulink.ecore#//Block/trigger"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference simulink.ecore#//Block/enabler"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference simulink.ecore#//Block/contains"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference simulink.ecore#//Block/outports"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference simulink.ecore#//Block/parent"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference simulink.ecore#//Block/sourceBlock"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simulink.ecore#//Block/sourceBlockRef"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="simulink.ecore#//Port">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference simulink.ecore#//Port/container"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simulink.ecore#//Port/portBlock"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simulink.ecore#//Port/parameters"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//Parameter">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//Parameter/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//Parameter/type"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//Parameter/value"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//Parameter/readOnly"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//InPort">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simulink.ecore#//InPort/connection"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//OutPort">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simulink.ecore#//OutPort/connection"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="simulink.ecore#//Connection">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//Connection/lineName"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simulink.ecore#//Connection/outport"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//Trigger">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//Trigger/triggerType"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//Trigger/statesWhenEnabling"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//Enable">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//Enable/statesWhenEnabling"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//BusSelector">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simulink.ecore#//BusSelector/mappings"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//BusSelector/outputAsBus"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simulink.ecore#//BusSelector/busCreator"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//BusCreator"/>
+    <genClasses ecoreClass="simulink.ecore#//Goto">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simulink.ecore#//Goto/fromBlocks"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//Goto/tagVisibility"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//Goto/gotoTag"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="simulink.ecore#//VirtualBlock"/>
+    <genClasses ecoreClass="simulink.ecore#//From">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simulink.ecore#//From/gotoBlock"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//SimulinkModel">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//SimulinkModel/version"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simulink.ecore#//SimulinkModel/contains"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//SimulinkModel/file"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//SimulinkModel/library"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simulink.ecore#//SimulinkModel/connection"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//MultiConnection">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simulink.ecore#//MultiConnection/connections"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//SingleConnection">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference simulink.ecore#//SingleConnection/parent"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simulink.ecore#//SingleConnection/inport"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="simulink.ecore#//PortBlock">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simulink.ecore#//PortBlock/port"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//OutPortBlock"/>
+    <genClasses ecoreClass="simulink.ecore#//InPortBlock"/>
+    <genClasses ecoreClass="simulink.ecore#//TriggerBlock"/>
+    <genClasses ecoreClass="simulink.ecore#//EnableBlock"/>
+    <genClasses image="false" ecoreClass="simulink.ecore#//SimulinkReference">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simulink.ecore#//SimulinkReference/element"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//SimulinkReference/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//SimulinkReference/qualifier"/>
+      <genOperations ecoreOperation="simulink.ecore#//SimulinkReference/getFQN" body="if(qualifier != null)&#xD;&#xA;&#x9;return qualifier+&quot;/&quot;+name;&#xD;&#xA;else &#xD;&#xA;&#x9;return name;"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//GotoTagVisibility">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simulink.ecore#//GotoTagVisibility/gotoBlock"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//SubSystem">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simulink.ecore#//SubSystem/subBlocks"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//SubSystem/tag"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//ModelReference">
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference simulink.ecore#//ModelReference/referencedModel"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simulink.ecore#//ModelReference/modelRef"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="simulink.ecore#//BusSpecification"/>
+    <genClasses ecoreClass="simulink.ecore#//BusSignalMapping">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference simulink.ecore#//BusSignalMapping/selector"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simulink.ecore#//BusSignalMapping/mappingFrom"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simulink.ecore#//BusSignalMapping/mappingTo"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//BusSignalMapping/mappingPath"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//BusSignalMapping/incomplete"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//LibraryLinkReference">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simulink.ecore#//LibraryLinkReference/disabled"/>
+    </genClasses>
+    <genClasses ecoreClass="simulink.ecore#//IdentifierReference"/>
+    <genClasses ecoreClass="simulink.ecore#//State"/>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.simulink/plugin.xml b/bundles/edu.kit.ipd.sdq.metamodels.simulink/plugin.xml
index a101668..ebf1e44 100755
--- a/bundles/edu.kit.ipd.sdq.metamodels.simulink/plugin.xml
+++ b/bundles/edu.kit.ipd.sdq.metamodels.simulink/plugin.xml
@@ -8,12 +8,11 @@
 
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated simuLink -->
+      <!-- source uri="http://hu.bme.mit.massif/simulink/1.0" adapted for usage in Vitruvius (vitruv.tools) context -->
       <package
-            <!-- source uri="http://hu.bme.mit.massif/simulink/1.0" adapted for usage in Vitruvius (vitruv.tools) context -->
             uri="edu.kit.ipd.sdq.metamodels.simulink"
             class="edu.kit.ipd.sdq.metamodels.simulink.SimuLinkPackage"
-
-            genModel="model/simuLink.genmodel"/>
+            genModel="model/simulink.genmodel"/>
    </extension>
 
 </plugin>

From 31452c1abe1bb70d5c2d56a4d9d1c63c61eb629c Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@kit.edu>
Date: Thu, 7 Sep 2023 10:49:13 +0200
Subject: [PATCH 2/2] Autosar fixes

---
 .../.classpath                                |  1 +
 .../org.eclipse.core.resources.prefs          |  2 +
 .../META-INF/MANIFEST.MF                      |  6 +--
 .../model/autoSAR.genmodel                    | 49 -------------------
 .../model/{autoSAR.ecore => autosar.ecore}    |  0
 .../model/autosar.genmodel                    | 49 +++++++++++++++++++
 .../plugin.xml                                |  3 +-
 .../org.eclipse.core.resources.prefs          |  2 +
 8 files changed, 58 insertions(+), 54 deletions(-)
 create mode 100644 bundles/edu.kit.ipd.sdq.metamodels.autosar/.settings/org.eclipse.core.resources.prefs
 delete mode 100755 bundles/edu.kit.ipd.sdq.metamodels.autosar/model/autoSAR.genmodel
 rename bundles/edu.kit.ipd.sdq.metamodels.autosar/model/{autoSAR.ecore => autosar.ecore} (100%)
 mode change 100755 => 100644
 create mode 100644 bundles/edu.kit.ipd.sdq.metamodels.autosar/model/autosar.genmodel
 create mode 100644 bundles/edu.kit.ipd.sdq.metamodels.simulink/.settings/org.eclipse.core.resources.prefs

diff --git a/bundles/edu.kit.ipd.sdq.metamodels.autosar/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.autosar/.classpath
index a9f4be7..98640b3 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.autosar/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.autosar/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.autosar/.settings/org.eclipse.core.resources.prefs b/bundles/edu.kit.ipd.sdq.metamodels.autosar/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/bundles/edu.kit.ipd.sdq.metamodels.autosar/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.autosar/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.autosar/META-INF/MANIFEST.MF
index 6480698..68e4587 100755
--- a/bundles/edu.kit.ipd.sdq.metamodels.autosar/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.autosar/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Export-Package: autosar,
- autosar.impl,
- autosar.util
+Export-Package: edu.kit.ipd.sdq.metamodels.autosar,
+ edu.kit.ipd.sdq.metamodels.autosar.impl,
+ edu.kit.ipd.sdq.metamodels.autosar.util
 Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.autosar/model/autoSAR.genmodel b/bundles/edu.kit.ipd.sdq.metamodels.autosar/model/autoSAR.genmodel
deleted file mode 100755
index 44ed62e..0000000
--- a/bundles/edu.kit.ipd.sdq.metamodels.autosar/model/autoSAR.genmodel
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel 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" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
-    modelDirectory="/AutoSAR/src-gen" creationIcons="false" editDirectory="/AutoSAR.edit/src-gen"
-    editorDirectory="/AutoSAR.editor/src-gen" modelPluginID="AutoSAR" modelName="AutoSAR"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    operationReflection="true" importOrganizing="true">
-  <foreignModel>autoSAR.ecore</foreignModel>
-  <testsDirectory xsi:nil="true"/>
-  <genPackages prefix="AutoSAR" disposableProviderFactory="true" ecorePackage="autoSAR.ecore#/">
-    <genClasses ecoreClass="autoSAR.ecore#//SwComponent">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference autoSAR.ecore#//SwComponent/port"/>
-    </genClasses>
-    <genClasses ecoreClass="autoSAR.ecore#//CompositeSwComponent">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference autoSAR.ecore#//CompositeSwComponent/atomicswcomponent"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference autoSAR.ecore#//CompositeSwComponent/swconnector"/>
-    </genClasses>
-    <genClasses ecoreClass="autoSAR.ecore#//AtomicSwComponent">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference autoSAR.ecore#//AtomicSwComponent/compositeswcomponent"/>
-    </genClasses>
-    <genClasses ecoreClass="autoSAR.ecore#//SwConnector"/>
-    <genClasses ecoreClass="autoSAR.ecore#//DelegationSwConnector">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference autoSAR.ecore#//DelegationSwConnector/InnerPort"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference autoSAR.ecore#//DelegationSwConnector/OuterPort"/>
-    </genClasses>
-    <genClasses ecoreClass="autoSAR.ecore#//AssemblySwConnector">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference autoSAR.ecore#//AssemblySwConnector/providedport"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference autoSAR.ecore#//AssemblySwConnector/requiredport"/>
-    </genClasses>
-    <genClasses ecoreClass="autoSAR.ecore#//Port"/>
-    <genClasses ecoreClass="autoSAR.ecore#//ProvidedPort">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference autoSAR.ecore#//ProvidedPort/portinterface"/>
-    </genClasses>
-    <genClasses ecoreClass="autoSAR.ecore#//RequiredPort">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference autoSAR.ecore#//RequiredPort/portinterface"/>
-    </genClasses>
-    <genClasses ecoreClass="autoSAR.ecore#//PortInterface"/>
-    <genClasses ecoreClass="autoSAR.ecore#//ClientServerInterface"/>
-    <genClasses ecoreClass="autoSAR.ecore#//SenderReceiverInterface"/>
-    <genClasses ecoreClass="autoSAR.ecore#//DataInterface"/>
-    <genClasses ecoreClass="autoSAR.ecore#//AutoSARModel">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference autoSAR.ecore#//AutoSARModel/swcomponent"/>
-    </genClasses>
-    <genClasses ecoreClass="autoSAR.ecore#//AutoSARElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute autoSAR.ecore#//AutoSARElement/name"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.autosar/model/autoSAR.ecore b/bundles/edu.kit.ipd.sdq.metamodels.autosar/model/autosar.ecore
old mode 100755
new mode 100644
similarity index 100%
rename from bundles/edu.kit.ipd.sdq.metamodels.autosar/model/autoSAR.ecore
rename to bundles/edu.kit.ipd.sdq.metamodels.autosar/model/autosar.ecore
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.autosar/model/autosar.genmodel b/bundles/edu.kit.ipd.sdq.metamodels.autosar/model/autosar.genmodel
new file mode 100644
index 0000000..c833e69
--- /dev/null
+++ b/bundles/edu.kit.ipd.sdq.metamodels.autosar/model/autosar.genmodel
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel 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" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
+    modelDirectory="/edu.kit.ipd.sdq.metamodels.autosar/src-gen" creationIcons="false" editDirectory="/edu.kit.ipd.sdq.metamodels.autosar.edit/src-gen"
+    editorDirectory="/edu.kit.ipd.sdq.metamodels.autosar.editor/src-gen" modelPluginID="edu.kit.ipd.sdq.metamodels.autosar" modelName="AutoSAR"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>autosar.ecore</foreignModel>
+  <testsDirectory xsi:nil="true"/>
+  <genPackages prefix="AutoSAR" basePackage="edu.kit.ipd.sdq.metamodels" disposableProviderFactory="true" ecorePackage="autosar.ecore#/">
+    <genClasses ecoreClass="autosar.ecore#//SwComponent">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference autosar.ecore#//SwComponent/port"/>
+    </genClasses>
+    <genClasses ecoreClass="autosar.ecore#//CompositeSwComponent">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference autosar.ecore#//CompositeSwComponent/atomicswcomponent"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference autosar.ecore#//CompositeSwComponent/swconnector"/>
+    </genClasses>
+    <genClasses ecoreClass="autosar.ecore#//AtomicSwComponent">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference autosar.ecore#//AtomicSwComponent/compositeswcomponent"/>
+    </genClasses>
+    <genClasses ecoreClass="autosar.ecore#//SwConnector"/>
+    <genClasses ecoreClass="autosar.ecore#//DelegationSwConnector">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference autosar.ecore#//DelegationSwConnector/InnerPort"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference autosar.ecore#//DelegationSwConnector/OuterPort"/>
+    </genClasses>
+    <genClasses ecoreClass="autosar.ecore#//AssemblySwConnector">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference autosar.ecore#//AssemblySwConnector/providedport"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference autosar.ecore#//AssemblySwConnector/requiredport"/>
+    </genClasses>
+    <genClasses ecoreClass="autosar.ecore#//Port"/>
+    <genClasses ecoreClass="autosar.ecore#//ProvidedPort">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference autosar.ecore#//ProvidedPort/portinterface"/>
+    </genClasses>
+    <genClasses ecoreClass="autosar.ecore#//RequiredPort">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference autosar.ecore#//RequiredPort/portinterface"/>
+    </genClasses>
+    <genClasses ecoreClass="autosar.ecore#//PortInterface"/>
+    <genClasses ecoreClass="autosar.ecore#//ClientServerInterface"/>
+    <genClasses ecoreClass="autosar.ecore#//SenderReceiverInterface"/>
+    <genClasses ecoreClass="autosar.ecore#//DataInterface"/>
+    <genClasses ecoreClass="autosar.ecore#//AutoSARModel">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference autosar.ecore#//AutoSARModel/swcomponent"/>
+    </genClasses>
+    <genClasses ecoreClass="autosar.ecore#//AutoSARElement">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute autosar.ecore#//AutoSARElement/name"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.autosar/plugin.xml b/bundles/edu.kit.ipd.sdq.metamodels.autosar/plugin.xml
index 75dda08..246a354 100755
--- a/bundles/edu.kit.ipd.sdq.metamodels.autosar/plugin.xml
+++ b/bundles/edu.kit.ipd.sdq.metamodels.autosar/plugin.xml
@@ -11,8 +11,7 @@
       <package
             uri="edu.kit.ipd.sdq.metamodels.autosar"
             class="edu.kit.ipd.sdq.metamodels.autosar.AutoSARPackage"
-
-            genModel="model/autoSAR.genmodel"/>
+            genModel="model/autosar.genmodel"/>
    </extension>
 
 </plugin>
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.simulink/.settings/org.eclipse.core.resources.prefs b/bundles/edu.kit.ipd.sdq.metamodels.simulink/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/bundles/edu.kit.ipd.sdq.metamodels.simulink/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8