Possibility to add Configuration items from the Specification diagram. (

#197)
eclipse · Sep 3, 2021 · 01f0f53 · 01f0f53
1 parent c7b3f41
commit 01f0f53
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/org.eclipse.lyo.tools.toolchain.design/description/ToolChainModel.odesign b/org.eclipse.lyo.tools.toolchain.design/description/ToolChainModel.odesign
@@ -21,6 +21,10 @@
           <subContainerMappings xsi:type="description_1:ContainerMappingImport" name="Specification.DomainSpecification.PropertiesList" semanticCandidatesExpression="aql:self" domainClass="adaptorinterface.DomainSpecification" dropDescriptions="//@ownedViewpoints[name='ToolchainViewpoint']/@ownedRepresentations[name='SpecificationDiagram']/@defaultLayer/@toolSections.1/@ownedTools[name='Specification.MoveProperty']" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='ToolchainViewpoint']/@ownedRepresentations[name='DomainSpecificationDiagram']/@defaultLayer/@containerMappings[name='DomainSpecification.PropertiesList']">
             <subNodeMappings xsi:type="description_1:NodeMappingImport" name="Specification.DomainSpecification.PropertiesList.Property" semanticCandidatesExpression="aql:self.resourceProperties" domainClass="adaptorinterface.ResourceProperty" importedMapping="//@ownedViewpoints[name='ToolchainViewpoint']/@ownedRepresentations[name='DomainSpecificationDiagram']/@defaultLayer/@containerMappings[name='DomainSpecification.PropertiesList']/@subNodeMappings[name='DomainSpecification.PropertiesList.Property']"/>
           </subContainerMappings>
+          <subContainerMappings xsi:type="description_1:ContainerMappingImport" name="Specification.DomainSpecification.SpecificationConfiguration" semanticCandidatesExpression="[self.configuration/]" domainClass="adaptorinterface.SpecificationConfiguration" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='ToolchainViewpoint']/@ownedRepresentations[name='DomainSpecificationDiagram']/@defaultLayer/@containerMappings[name='DomainSpecification.SpecificationConfiguration']">
+            <subNodeMappings xsi:type="description_1:NodeMappingImport" name="Specification.DomainSpecification.SpecificationConfiguration.GeneralConfiguration" semanticCandidatesExpression="aql:self.generalConfiguration" domainClass="adaptorinterface.GeneralConfiguration" importedMapping="//@ownedViewpoints[name='ToolchainViewpoint']/@ownedRepresentations[name='DomainSpecificationDiagram']/@defaultLayer/@containerMappings[name='DomainSpecification.SpecificationConfiguration']/@subNodeMappings[name='SpecificationConfiguration.GeneralConfiguration']"/>
+            <subNodeMappings xsi:type="description_1:NodeMappingImport" name="Specification.DomainSpecification.SpecificationConfiguration.ProjectConfiguration" semanticCandidatesExpression="aql:self.projectConfiguration" domainClass="adaptorinterface.ProjectConfiguration" importedMapping="//@ownedViewpoints[name='ToolchainViewpoint']/@ownedRepresentations[name='DomainSpecificationDiagram']/@defaultLayer/@containerMappings[name='DomainSpecification.SpecificationConfiguration']/@subNodeMappings[name='SpecificationConfiguration.ProjectConfiguration']"/>
+          </subContainerMappings>
           <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="2" labelSize="9" labelExpression="[self.name + ' (' + self.namespacePrefix.name + ')'/]" iconPath="/org.eclipse.lyo.tools.toolchain.design/images/IconAdaptor.png" widthComputationExpression="40" heightComputationExpression="30">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -1876,7 +1880,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Config">
-          <ownedTools xsi:type="tool:ContainerCreationDescription" name="DomainSpecification.CreateSpecificationConfiguration" label="Specification Configuration" precondition="[self.configuration.oclIsUndefined()/]" containerMappings="//@ownedViewpoints[name='ToolchainViewpoint']/@ownedRepresentations[name='DomainSpecificationDiagram']/@defaultLayer/@containerMappings[name='DomainSpecification.SpecificationConfiguration'] //@ownedViewpoints[name='ToolchainViewpoint']/@ownedRepresentations[name='SpecificationDiagram']/@defaultLayer/@containerMappings[name='Specification.SpecificationConfiguration']">
+          <ownedTools xsi:type="tool:ContainerCreationDescription" name="DomainSpecification.CreateSpecificationConfiguration" label="Specification Configuration" precondition="[self.configuration.oclIsUndefined()/]" containerMappings="//@ownedViewpoints[name='ToolchainViewpoint']/@ownedRepresentations[name='DomainSpecificationDiagram']/@defaultLayer/@containerMappings[name='DomainSpecification.SpecificationConfiguration'] //@ownedViewpoints[name='ToolchainViewpoint']/@ownedRepresentations[name='SpecificationDiagram']/@defaultLayer/@containerMappings[name='Specification.DomainSpecification']/@subContainerMappings[name='Specification.DomainSpecification.SpecificationConfiguration']">
             <variable name="container">
               <subVariables xsi:type="tool_1:AcceleoVariable" name="javaBasePackageName" computationExpression="[if (not container.generationSetting.oclIsUndefined()) then container.generationSetting.javaClassPackageName else (if (container.oclIsTypeOf(Specification)) then 'your.basepackage.name' else '' endif) endif/]"/>
               <subVariables xsi:type="tool_1:AcceleoVariable" name="filesBasePath" computationExpression="[if (not container.generationSetting.oclIsUndefined()) then container.generationSetting.javaFilesPath.substitute('/src/main/java', '') else (if (container.oclIsTypeOf(Specification)) then '.' else '' endif) endif/]"/>