Commit ee33dd23 authored by Simon Barner's avatar Simon Barner
Browse files

- Use canonical name for hierarchical platform's allocation package prefix

- Register package in "org.eclipse.emf.ecore.generated_package" extension point
refs 2658
parent e5921a03
......@@ -4,7 +4,7 @@
modelDirectory="/org.fortiss.af3.platform.hierarchic/generated-src" editDirectory="/org.fortiss.af3.platform.hierarchic.edit/generated-src"
editorDirectory="/org.fortiss.af3.platform.hierarchic.editor/generated-src" modelPluginID="org.fortiss.af3.platform.hierarchic"
modelName="HierarchicPlatform" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true"
complianceLevel="6.0" copyrightFields="false" usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/resource/org.fortiss.af3.platform/model/platform.genmodel#//model platform:/resource/org.fortiss.af3.timing/model/timing.genmodel#//model platform:/resource/org.fortiss.af3.allocation/model/allocation.genmodel#//model platform:/resource/org.fortiss.af3.component/model/component.genmodel#//model platform:/resource/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model platform:/resource/org.fortiss.af3.partition/model/partition.genmodel#//model">
complianceLevel="6.0" copyrightFields="false" usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/resource/org.fortiss.af3.platform/model/platform.genmodel#//model platform:/resource/org.fortiss.af3.timing/model/timing.genmodel#//model platform:/resource/org.fortiss.af3.allocation/model/allocation.genmodel#//model platform:/resource/org.fortiss.af3.component/model/component.genmodel#//model platform:/resource/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model platform:/resource/org.fortiss.af3.partition/model/partition.genmodel#//model platform:/resource/org.fortiss.af3.task/model/task.genmodel#//model">
<foreignModel>hierarchic.ecore</foreignModel>
<genPackages prefix="HierarchicPlatform" basePackage="org.fortiss.af3.platform.hierarchic"
disposableProviderFactory="true" ecorePackage="hierarchic.ecore#/">
......@@ -133,7 +133,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute hierarchic.ecore#//annotation/MediaType/mediaType"/>
</genClasses>
</nestedGenPackages>
<nestedGenPackages prefix="Pa2HwAllocation" basePackage="org.fortiss.af3.platform.hierarchic.model"
<nestedGenPackages prefix="HierarchicPlatformAllocation" basePackage="org.fortiss.af3.platform.hierarchic.model"
disposableProviderFactory="true" ecorePackage="hierarchic.ecore#//allocation">
<genClasses ecoreClass="hierarchic.ecore#//allocation/PartitionToHardwareAllocationTable">
<genOperations ecoreOperation="hierarchic.ecore#//allocation/PartitionToHardwareAllocationTable/getCores">
......
......@@ -44,6 +44,11 @@
uri="http://www.fortiss.org/af3/platform/hierarchic/annotation"
class="org.fortiss.af3.platform.hierarchic.model.annotation.HierarchicPlatformAnnotationPackage"
genModel="model/hierarchic.genmodel"/>
<!-- @generated hierarchic -->
<package
uri="http://www.fortiss.org/af3/platform/hierarchic/allocation"
class="org.fortiss.af3.platform.hierarchic.model.allocation.HierarchicPlatformAllocationPackage"
genModel="model/hierarchic.genmodel"/>
</extension>
<!--===========================-->
......
......@@ -20,7 +20,7 @@ import static org.fortiss.tooling.base.utils.LayoutModelElementFactory.createCon
import static org.fortiss.tooling.base.utils.LayoutModelElementFactory.createNodeElementLayout;
import org.fortiss.af3.platform.hierarchic.compose.HierarchicalCompositionRules;
import org.fortiss.af3.platform.hierarchic.model.allocation.Pa2HwAllocationFactory;
import org.fortiss.af3.platform.hierarchic.model.allocation.HierarchicPlatformAllocationFactory;
import org.fortiss.af3.platform.hierarchic.model.allocation.PartitionToHardwareAllocationTable;
import org.fortiss.af3.platform.hierarchic.model.cluster.Cluster;
import org.fortiss.af3.platform.hierarchic.model.cluster.ClusterFactory;
......@@ -411,7 +411,8 @@ public class HierarchicPlatformModelElementFactory {
String name) {
PartitionToHardwareAllocationTable pa2hw =
Pa2HwAllocationFactory.eINSTANCE.createPartitionToHardwareAllocationTable();
HierarchicPlatformAllocationFactory.eINSTANCE
.createPartitionToHardwareAllocationTable();
pa2hw.setName(name);
return pa2hw;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment