Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add fixes for simulink and autosar #24

Merged
merged 2 commits into from
Sep 7, 2023
Merged

Add fixes for simulink and autosar #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a716e4
Add fixes for simulink
TomWerm Sep 7, 2023
31452c1
Autosar fixes
TomWerm Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions bundles/edu.kit.ipd.sdq.metamodels.autosar/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
28 changes: 28 additions & 0 deletions bundles/edu.kit.ipd.sdq.metamodels.autosar/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 2 additions & 0 deletions bundles/edu.kit.ipd.sdq.metamodels.autosar/.settings/org.eclipse.core.resources.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
6 changes: 3 additions & 3 deletions bundles/edu.kit.ipd.sdq.metamodels.autosar/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
49 changes: 0 additions & 49 deletions bundles/edu.kit.ipd.sdq.metamodels.autosar/model/autoSAR.genmodel
View file
Open in desktop

This file was deleted.

0 ...dq.metamodels.autosar/model/autoSAR.ecore → ...dq.metamodels.autosar/model/autosar.ecore
100755 → 100644
View file
Open in desktop
File renamed without changes.
49 changes: 49 additions & 0 deletions bundles/edu.kit.ipd.sdq.metamodels.autosar/model/autosar.genmodel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
3 changes: 1 addition & 2 deletions bundles/edu.kit.ipd.sdq.metamodels.autosar/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 7 additions & 0 deletions bundles/edu.kit.ipd.sdq.metamodels.simulink/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
28 changes: 28 additions & 0 deletions bundles/edu.kit.ipd.sdq.metamodels.simulink/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 2 additions & 0 deletions bundles/edu.kit.ipd.sdq.metamodels.simulink/.settings/org.eclipse.core.resources.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
6 changes: 3 additions & 3 deletions bundles/edu.kit.ipd.sdq.metamodels.simulink/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading