[508171] Improve tutorial solutionsv4.1.3rc3

Bug: 508171
Change-Id: Iea3a0e47337f838a0fabdbca5c54e93e4e2a4d81
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

4 files changed, 44 insertions, 19 deletions

diff --git a/plugins/org.eclipse.sirius.samples.family/plugin.xml b/plugins/org.eclipse.sirius.samples.family/plugin.xml
index e9856f593f..483963a443 100644
--- a/plugins/org.eclipse.sirius.samples.family/plugin.xml
+++ b/plugins/org.eclipse.sirius.samples.family/plugin.xml
@@ -38,6 +38,7 @@
 
     </wizard>
 
+<!--
     <wizard category="org.eclipse.ui.Examples/org.eclipse.sirius.samples.category"
             class="org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard"
             icon="icons/Family.gif"
@@ -46,7 +47,7 @@
             project="true">
       <description>A sample graphical modeler to view an edit family models (requires the Basic Family Metamodel Definition to be installed).</description>
     </wizard>
-    
+-->    
     <wizard category="org.eclipse.ui.Examples/org.eclipse.sirius.samples.category"
             class="org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard"
             icon="icons/Family.gif"
@@ -100,12 +101,13 @@
                          description="A sample model representing a family."/>
   	</example>
 
-	<!-- Brings down VSP with the basic family modeler definition described in the tutorial -->
+	<!-- Brings down VSP with the basic family modeler definition described in the tutorial
   	<example wizardID="org.eclipse.sirius.samples.family.NewBasicFamilyVSM">
       <projectDescriptor name="org.eclipse.sirius.sample.basicfamily.design"
                          contentURI="samples/org.eclipse.sirius.sample.basicfamily.design/"
                          description="A sample graphical modeler to view and edit family models."/>
   	</example>
+  	 -->
 
     <!-- Brings down VSP with the starter tutorial solution -->
     <example wizardID="org.eclipse.sirius.samples.family.NewBasicFamilyStarterTutorialSolution">
diff --git a/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.advanced.design/description/basicfamily.odesign b/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.advanced.design/description/basicfamily.odesign
index 2c5faf52e8..9abe2166f5 100644
--- a/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.advanced.design/description/basicfamily.odesign
+++ b/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.advanced.design/description/basicfamily.odesign
@@ -49,7 +49,7 @@
       </defaultLayer>
       <additionalLayers name="Men" activeByDefault="true">
         <nodeMappings name="ManNode" labelDirectEdit="//@ownedViewpoints[name='persons%20(Basic%20Family%20Advanced%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='editName']" doubleClickDescription="//@ownedViewpoints[name='persons%20(Basic%20Family%20Advanced%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='PersonDoubleClick']" domainClass="basicfamily.Man">
-          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" sizeComputationExpression="4" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.basicfamily.design/icons/man.svg">
+          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" sizeComputationExpression="4" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.basicfamily.advanced.design/icons/man.svg">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -63,7 +63,7 @@
           </style>
         </edgeMappings>
         <toolSections name="Tools">
-          <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createMan" nodeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Advanced%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@additionalLayers[name='Men']/@nodeMappings[name='ManNode']">
+          <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createMan" label="Man" nodeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Advanced%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@additionalLayers[name='Men']/@nodeMappings[name='ManNode']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
@@ -74,7 +74,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:EdgeCreationDescription" name="setFather" precondition="aql:preTarget.differs(preSource) and preSource.oclAsType(basicfamily::Person).children->excludes(preTarget)" edgeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Advanced%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@additionalLayers[name='Men']/@edgeMappings[name='fatherEdge']" iconPath="/org.eclipse.sirius.sample.basicfamily.design/icons/father.png">
+          <ownedTools xsi:type="tool_1:EdgeCreationDescription" name="setFather" label="Father" precondition="aql:preTarget.differs(preSource) and preSource.oclAsType(basicfamily::Person).children->excludes(preTarget)" edgeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Advanced%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@additionalLayers[name='Men']/@edgeMappings[name='fatherEdge']" iconPath="/org.eclipse.sirius.sample.basicfamily.advanced.design/icons/father.png">
             <sourceVariable name="source"/>
             <targetVariable name="target"/>
             <sourceViewVariable name="sourceView"/>
@@ -110,7 +110,7 @@
       </additionalLayers>
       <additionalLayers name="Women" activeByDefault="true">
         <nodeMappings name="WomanNode" labelDirectEdit="//@ownedViewpoints[name='persons%20(Basic%20Family%20Advanced%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='editName']" semanticCandidatesExpression="feature:members" doubleClickDescription="//@ownedViewpoints[name='persons%20(Basic%20Family%20Advanced%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='PersonDoubleClick']" domainClass="basicfamily.Woman">
-          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" sizeComputationExpression="4" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.basicfamily.design/icons/woman.svg">
+          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" sizeComputationExpression="4" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.basicfamily.advanced.design/icons/woman.svg">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -124,7 +124,7 @@
           </style>
         </edgeMappings>
         <toolSections name="Tools">
-          <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createWoman" nodeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Advanced%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@additionalLayers[name='Women']/@nodeMappings[name='WomanNode']">
+          <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createWoman" label="Woman" nodeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Advanced%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@additionalLayers[name='Women']/@nodeMappings[name='WomanNode']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
@@ -135,7 +135,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:EdgeCreationDescription" name="setMother" precondition="aql:preTarget.differs(preSource) and preSource.oclAsType(basicfamily::Person).children->excludes(preTarget)" edgeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Advanced%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@additionalLayers[name='Women']/@edgeMappings[name='motherEdge']" iconPath="/org.eclipse.sirius.sample.basicfamily.design/icons/mother.png">
+          <ownedTools xsi:type="tool_1:EdgeCreationDescription" name="setMother" label="Mother" precondition="aql:preTarget.differs(preSource) and preSource.oclAsType(basicfamily::Person).children->excludes(preTarget)" edgeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Advanced%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@additionalLayers[name='Women']/@edgeMappings[name='motherEdge']" iconPath="/org.eclipse.sirius.sample.basicfamily.advanced.design/icons/mother.png">
             <sourceVariable name="source"/>
             <targetVariable name="target"/>
             <sourceViewVariable name="sourceView"/>
@@ -225,6 +225,26 @@
     <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="Persons table" domainClass="basicfamily.Family">
       <metamodel href="http://www.eclipse.org/sirius/sample/basicfamily#/"/>
       <ownedLineMappings name="PersonLine" domainClass="basicfamily.Person" semanticCandidatesExpression="feature:members" headerLabelExpression="feature:name"/>
+      <ownedCreateLine name="createManLine" label="New Man" mapping="//@ownedViewpoints[name='persons%20(Basic%20Family%20Advanced%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20table']/@ownedLineMappings[name='PersonLine']">
+        <variables name="root" documentation="The semantic root element of the table."/>
+        <variables name="element" documentation="The semantic currently edited element."/>
+        <variables name="container" documentation="The semantic element corresponding to the view container."/>
+        <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:container">
+          <subModelOperations xsi:type="tool:CreateInstance" typeName="basicfamily.Man" referenceName="members">
+            <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'man'+container.members->filter(basicfamily::Man)->size()"/>
+          </subModelOperations>
+        </firstModelOperation>
+      </ownedCreateLine>
+      <ownedCreateLine name="createWomanLine" label="New Woman" mapping="//@ownedViewpoints[name='persons%20(Basic%20Family%20Advanced%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20table']/@ownedLineMappings[name='PersonLine']">
+        <variables name="root" documentation="The semantic root element of the table."/>
+        <variables name="element" documentation="The semantic currently edited element."/>
+        <variables name="container" documentation="The semantic element corresponding to the view container."/>
+        <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:container">
+          <subModelOperations xsi:type="tool:CreateInstance" typeName="basicfamily.Woman" referenceName="members">
+            <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'woman'+container.members->filter(basicfamily::Woman)->size()"/>
+          </subModelOperations>
+        </firstModelOperation>
+      </ownedCreateLine>
       <ownedColumnMappings name="fatherCol" headerLabelExpression="Father" featureName="father" labelExpression="aql:self.father.name"/>
       <ownedColumnMappings name="motherCol" headerLabelExpression="Mother" featureName="mother" labelExpression="aql:self.mother.name"/>
       <ownedColumnMappings name="childrenCol" headerLabelExpression="Children" featureName="children" labelExpression="aql:self.children->size()"/>
diff --git a/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.compartments.design/description/basicfamily.odesign b/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.compartments.design/description/basicfamily.odesign
index 862d0e71dd..acbef96d32 100644
--- a/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.compartments.design/description/basicfamily.odesign
+++ b/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.compartments.design/description/basicfamily.odesign
@@ -2,15 +2,16 @@
 <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="basicfamily" version="11.1.1.201610211630">
   <ownedViewpoints name="persons (Basic Family Compartments Tutorial Solution)" modelFileExtension="basicfamily">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Persons diagram" domainClass="basicfamily.Family">
+      <metamodel href="http://www.eclipse.org/sirius/sample/basicfamily#/"/>
       <defaultLayer name="Default">
         <nodeMappings name="ManNode" semanticCandidatesExpression="feature:members" domainClass="basicfamily.Man">
-          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" sizeComputationExpression="4" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.basicfamily.design/icons/man.svg">
+          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" sizeComputationExpression="4" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.basicfamily.compartments.design/icons/man.svg">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
         <nodeMappings name="WomanNode" semanticCandidatesExpression="feature:members" domainClass="basicfamily.Woman">
-          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" sizeComputationExpression="4" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.basicfamily.design/icons/woman.svg">
+          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" sizeComputationExpression="4" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.basicfamily.compartments.design/icons/woman.svg">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -32,7 +33,7 @@
           </style>
         </edgeMappings>
         <toolSections name="Tools">
-          <ownedTools xsi:type="tool:NodeCreationDescription" name="createMan" nodeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Compartments%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@defaultLayer/@nodeMappings[name='ManNode']">
+          <ownedTools xsi:type="tool:NodeCreationDescription" name="createMan" label="Man" nodeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Compartments%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@defaultLayer/@nodeMappings[name='ManNode']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
@@ -43,7 +44,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:NodeCreationDescription" name="createWoman" nodeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Compartments%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@defaultLayer/@nodeMappings[name='WomanNode']">
+          <ownedTools xsi:type="tool:NodeCreationDescription" name="createWoman" label="Woman" nodeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Compartments%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@defaultLayer/@nodeMappings[name='WomanNode']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
@@ -58,6 +59,7 @@
       </defaultLayer>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Person details diagram" titleExpression="aql:'Relations of '+self.name" domainClass="basicfamily.Person">
+      <metamodel href="http://www.eclipse.org/sirius/sample/basicfamily#/"/>
       <defaultLayer name="Default">
         <containerMappings name="PersonContainer" semanticCandidatesExpression="var:self" domainClass="basicfamily.Person" childrenPresentation="HorizontalStack">
           <subContainerMappings name="ParentsContainer" semanticCandidatesExpression="var:self" domainClass="basicfamily.Person" childrenPresentation="List">
@@ -110,13 +112,13 @@
           </subContainerMappings>
           <subContainerMappings name="GrandchildrenContainer" semanticCandidatesExpression="aql:self.children->select(c|c.children->size()>0)" domainClass="basicfamily.Person">
             <subNodeMappings name="GrandSonNode2" semanticCandidatesExpression="feature:children" domainClass="basicfamily.Man">
-              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.sample.basicfamily.design/icons/man.svg">
+              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.sample.basicfamily.compartments.design/icons/man.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
             <subNodeMappings name="GrandDaughterNode2" semanticCandidatesExpression="feature:children" domainClass="basicfamily.Woman">
-              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.sample.basicfamily.design/icons/woman.svg">
+              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.sample.basicfamily.compartments.design/icons/woman.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
diff --git a/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.starter.design/description/basicfamily.odesign b/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.starter.design/description/basicfamily.odesign
index 264dd48cd1..ddb1cb44a0 100644
--- a/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.starter.design/description/basicfamily.odesign
+++ b/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.starter.design/description/basicfamily.odesign
@@ -2,15 +2,16 @@
 <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="basicfamily" version="11.1.1.201610211630">
   <ownedViewpoints name="persons (Basic Family Starter Tutorial Solution)" modelFileExtension="basicfamily">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Persons diagram" domainClass="basicfamily.Family">
+      <metamodel href="http://www.eclipse.org/sirius/sample/basicfamily#/"/>
       <defaultLayer name="Default">
         <nodeMappings name="ManNode" semanticCandidatesExpression="feature:members" domainClass="basicfamily.Man">
-          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" sizeComputationExpression="4" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.basicfamily.design/icons/man.svg">
+          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" sizeComputationExpression="4" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.basicfamily.starter.design/icons/man.svg">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
         <nodeMappings name="WomanNode" semanticCandidatesExpression="feature:members" domainClass="basicfamily.Woman">
-          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" sizeComputationExpression="4" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.basicfamily.design/icons/woman.svg">
+          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" sizeComputationExpression="4" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.basicfamily.starter.design/icons/woman.svg">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -31,8 +32,8 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <toolSections>
-          <ownedTools xsi:type="tool:NodeCreationDescription" name="createMan" nodeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Starter%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@defaultLayer/@nodeMappings[name='ManNode']">
+        <toolSections name="Tools">
+          <ownedTools xsi:type="tool:NodeCreationDescription" name="createMan" label="Man" nodeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Starter%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@defaultLayer/@nodeMappings[name='ManNode']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
@@ -43,7 +44,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:NodeCreationDescription" name="createWoman" nodeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Starter%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@defaultLayer/@nodeMappings[name='WomanNode']">
+          <ownedTools xsi:type="tool:NodeCreationDescription" name="createWoman" label="Woman" nodeMappings="//@ownedViewpoints[name='persons%20(Basic%20Family%20Starter%20Tutorial%20Solution)']/@ownedRepresentations[name='Persons%20diagram']/@defaultLayer/@nodeMappings[name='WomanNode']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>