Let ISashWindocContainer use a delegate for ContentProvider

Update the di model to Papyrus Eclipse Regenerate di classes
author: cdumoulin 2013-02-01 17:13:16 +0000
committer: cdumoulin 2013-02-01 17:13:16 +0000
commit: bf63d161b4152e21630063e77ada22823a858918 (patch)
tree: 9e4e102e6091f89adf25f0eb430c064ef7a8487c
parent: c6ab69342f4cbf5a46e637251fe31569bd5f2df0 (diff)
download: org.eclipse.papyrus-bf63d161b4152e21630063e77ada22823a858918.tar.gz
org.eclipse.papyrus-bf63d161b4152e21630063e77ada22823a858918.tar.xz
org.eclipse.papyrus-bf63d161b4152e21630063e77ada22823a858918.zip
39 files changed, 1767 insertions, 821 deletions
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF b/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
index 30ebf4dcf09..27e5d32097f 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.swt;bundle-version="3.5.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="0.10.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.sasheditor;visibility:=reexport;bundle-version="0.10.0",
  org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.emf.ecore,
@@ -20,7 +20,6 @@ Bundle-Version: 0.10.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di;sing
- leton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/model/di.ecore b/org.eclipse.papyrus.infra.core.sasheditor.di/model/di.ecore
index d05922ba9dd..f33d86a1d20 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/model/di.ecore
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/model/di.ecore
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="di"
-    nsURI="http://www.eclipse.org/papyrus/0.7.0/sashdi" nsPrefix="di">
+<ecore:EPackage 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" name="di" nsURI="http://www.eclipse.org/papyrus/0.7.0/sashdi" nsPrefix="di">
   <eAnnotations source="resource=XMI"/>
   <eClassifiers xsi:type="ecore:EClass" name="SashModel">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -24,12 +22,12 @@
       <eParameters name="srcParentFolder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
       <eParameters name="srcIndex" ordered="false" lowerBound="1" eType="#//int"/>
       <eParameters name="targetParentFolder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
-      <eParameters name="targetIndex" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+      <eParameters name="targetIndex" ordered="false" lowerBound="1" eType="#//int"/>
     </eOperations>
     <eOperations name="insertFolder" ordered="false" lowerBound="1">
       <eParameters name="folderToInsert" ordered="false" lowerBound="1" eType="#//TabFolder"/>
       <eParameters name="refFolder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
-      <eParameters name="refFolderSide" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+      <eParameters name="refFolderSide" ordered="false" lowerBound="1" eType="#//int"/>
     </eOperations>
     <eOperations name="movePage" ordered="false" lowerBound="1">
       <eParameters name="srcParentFolder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
@@ -60,6 +58,9 @@
         <details key="documentation" value="Lookup the first available folder."/>
       </eAnnotations>
     </eOperations>
+    <eOperations name="removePageAndEmptyFolder" ordered="false" lowerBound="1">
+      <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
+    </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="windows" ordered="false"
         upperBound="-1" eType="#//Window" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="currentSelection" ordered="false"
@@ -96,7 +97,7 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Position">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" ordered="false" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+        lowerBound="1" eType="#//int"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" ordered="false" unique="false"
         lowerBound="1" eType="#//int"/>
   </eClassifiers>
@@ -109,7 +110,7 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="TabFolder" eSuperTypes="#//AbstractPanel">
     <eOperations name="movePage" ordered="false" lowerBound="1">
-      <eParameters name="oldIndex" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+      <eParameters name="oldIndex" ordered="false" lowerBound="1" eType="#//int"/>
       <eParameters name="newIndex" ordered="false" lowerBound="1" eType="#//int"/>
     </eOperations>
     <eOperations name="addPage" ordered="false" lowerBound="1">
@@ -122,7 +123,7 @@
         upperBound="-1" eType="#//PageRef" containment="true" eOpposite="#//PageRef/parent"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PageRef">
-    <eOperations name="isForIdentifier" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+    <eOperations name="isForIdentifier" ordered="false" lowerBound="1" eType="#//boolean">
       <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="emfPageIdentifier" ordered="false"
@@ -141,9 +142,10 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="parent" ordered="false"
-        unique="false" lowerBound="1" eType="#//TabFolder" eOpposite="#//TabFolder/children"/>
+        unique="false" eType="#//TabFolder" eOpposite="#//TabFolder/children"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EDataType" name="JavaObject" instanceClassName="java.lang.Object"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="boolean" instanceClassName="boolean"/>
   <eClassifiers xsi:type="ecore:EClass" name="SashPanel" eSuperTypes="#//AbstractPanel #//PanelParent">
     <eOperations name="setChildren" ordered="false" lowerBound="1">
       <eParameters name="leftChild" ordered="false" lowerBound="1" eType="#//AbstractPanel"/>
@@ -160,7 +162,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" ordered="false"
-        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+        unique="false" lowerBound="1" eType="#//int"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EDataType" name="Float" instanceClassName="float"/>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractPage">
@@ -183,5 +185,4 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="sashModel" ordered="false"
         unique="false" lowerBound="1" eType="#//SashModel" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="boolean" instanceClassName="boolean"/>
 </ecore:EPackage>
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.di b/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.di
new file mode 100644
index 00000000000..c9abaa9d598
--- /dev/null
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.di
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ASCII"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <pageList>
+    <availablePage>
+      <emfPageIdentifier href="sashwindowsdi.notation#_xRNpEGyFEeKx9Kegn5X27A"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="sashwindowsdi.notation#_CCrlsGyHEeKx9Kegn5X27A"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="sashwindowsdi.notation#_0m_xwGyIEeKx9Kegn5X27A"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="sashwindowsdi.notation#_xRNpEGyFEeKx9Kegn5X27A"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="sashwindowsdi.notation#_CCrlsGyHEeKx9Kegn5X27A"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="sashwindowsdi.notation#_0m_xwGyIEeKx9Kegn5X27A"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.genmodel b/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.genmodel
index a77210feaf8..1ee00858c50 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.genmodel
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.genmodel
@@ -1,9 +1,10 @@
 <?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/uml2/2.2.0/GenModel" modelDirectory="/org.eclipse.papyrus.infra.core.sasheditor.di/src"
-    modelPluginID="org.eclipse.papyrus.infra.core.sasheditor.di" modelName="Sashwindowsdi" importerID="org.eclipse.uml2.uml.ecore.importer"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+<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/uml2/2.2.0/GenModel"
+    modelDirectory="/org.eclipse.papyrus.infra.core.sasheditor.di/src"
+    modelPluginID="org.eclipse.papyrus.infra.core.sasheditor.di" modelName="Sashwindowsdi"
+    importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="5.0" copyrightFields="false"
+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
     <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
     <details key="UNION_PROPERTIES" value="REPORT"/>
@@ -23,12 +24,12 @@
     <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
   </genAnnotations>
   <foreignModel>sashwindowsdi.uml</foreignModel>
-  <genPackages xsi:type="genmodel:GenPackage" prefix="Di" basePackage="org.eclipse.papyrus.sashwindows"
+  <genPackages xsi:type="genmodel:GenPackage" prefix="Di" basePackage="org.eclipse.papyrus.infra.core.sashwindows"
       resource="XMI" disposableProviderFactory="true" ecorePackage="di.ecore#/">
     <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="di.ecore#//int"/>
     <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="di.ecore#//JavaObject"/>
-    <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="di.ecore#//Float"/>
     <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="di.ecore#//boolean"/>
+    <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="di.ecore#//Float"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//SashModel">
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
           createChild="true" ecoreFeature="ecore:EReference di.ecore#//SashModel/windows"/>
@@ -68,6 +69,9 @@
       </genOperations>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/lookupFirstWindow"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/lookupFirstFolder"/>
+      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/removePageAndEmptyFolder">
+        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/removePageAndEmptyFolder/pageIdentifier"/>
+      </genOperations>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//Window">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.notation b/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.notation
new file mode 100644
index 00000000000..844f199c3fe
--- /dev/null
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.notation
@@ -0,0 +1,998 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+  <notation:Diagram xmi:id="_xRNpEGyFEeKx9Kegn5X27A" type="PapyrusUMLClassDiagram" name="overview" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_z0HqsGyFEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z0RbsGyFEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z0RbsWyFEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z0RbsmyFEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z0Rbs2yFEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z0RbtGyFEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z0RbtWyFEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_z0RbtmyFEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_z0Rbt2yFEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_z0RbuGyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_z0RbuWyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_z0RbumyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z0Rbu2yFEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_z0RbvGyFEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_z0RbvWyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_z0RbvmyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_z0Rbv2yFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z0RbwGyFEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_z0RbwWyFEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_z0RbwmyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_z0Rbw2yFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_z0RbxGyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z0RbxWyFEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="sashwindowsdi.uml#_Xa5wIEJVEd6kIY39uis5Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z0HqsWyFEeKx9Kegn5X27A" x="498" y="216"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_z1T9gGyFEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z1T9gmyFEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z1T9g2yFEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z1T9hGyFEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z1T9hWyFEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z1T9hmyFEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z1T9h2yFEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_z1T9iGyFEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_z1T9iWyFEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_z1T9imyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_z1T9i2yFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_z1T9jGyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z1T9jWyFEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_z1T9jmyFEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_z1T9j2yFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_z1T9kGyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_z1T9kWyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z1T9kmyFEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_z1T9k2yFEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_z1T9lGyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_z1T9lWyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_z1T9lmyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z1T9l2yFEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="sashwindowsdi.uml#_UiIMMEJVEd6kIY39uis5Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z1T9gWyFEeKx9Kegn5X27A" x="276" y="216"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_4bTRMGyFEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4bTRMmyFEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4bTRM2yFEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4bcbIGyFEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4bcbIWyFEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4bcbImyFEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4bcbI2yFEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4bcbJGyFEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4bcbJWyFEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4bcbJmyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_4bcbJ2yFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_4bcbKGyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4bcbKWyFEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4bcbKmyFEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4bcbK2yFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_4bcbLGyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_4bcbLWyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4bcbLmyFEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4bcbL2yFEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4bcbMGyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_4bcbMWyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_4bcbMmyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4bcbM2yFEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="sashwindowsdi.uml#_fbWYgEJVEd6kIY39uis5Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4bTRMWyFEeKx9Kegn5X27A" x="936" y="222"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_6BzU8GyFEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6BzU8myFEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6BzU82yFEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6BzU9GyFEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6BzU9WyFEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6BzU9myFEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6BzU92yFEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6BzU-GyFEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6BzU-WyFEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6BzU-myFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6BzU-2yFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6BzU_GyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6BzU_WyFEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6BzU_myFEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6BzU_2yFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6BzVAGyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6BzVAWyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6BzVAmyFEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6BzVA2yFEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6BzVBGyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6BzVBWyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6BzVBmyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6BzVB2yFEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="sashwindowsdi.uml#_Zx2ZYEJVEd6kIY39uis5Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6BzU8WyFEeKx9Kegn5X27A" x="936" y="48"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_6Ci70GyFEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Ci70myFEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Ci702yFEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Ci71GyFEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Ci71WyFEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Ci71myFEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Ci712yFEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6Ci72GyFEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6Ci72WyFEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6Ci72myFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6Ci722yFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6Ci73GyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6Ci73WyFEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6Ci73myFEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6Ci732yFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6Ci74GyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6Ci74WyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6Ci74myFEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6Ci742yFEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6Ci75GyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6Ci75WyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6Ci75myFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6Ci752yFEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="sashwindowsdi.uml#_86BAgEJWEd6kIY39uis5Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6Ci70WyFEeKx9Kegn5X27A" x="726" y="48"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_6knuIGyFEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6knuImyFEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6knuI2yFEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6knuJGyFEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6knuJWyFEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6knuJmyFEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6knuJ2yFEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6knuKGyFEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6knuKWyFEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6knuKmyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6knuK2yFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6knuLGyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6knuLWyFEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6knuLmyFEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6knuL2yFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6knuMGyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6knuMWyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6knuMmyFEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6knuM2yFEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6knuNGyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6knuNWyFEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6knuNmyFEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6knuN2yFEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="sashwindowsdi.uml#_h_HVwEJVEd6kIY39uis5Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6knuIWyFEeKx9Kegn5X27A" x="936" y="522"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_CZQIEGyGEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CZQIEmyGEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CZQIE2yGEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CZQIFGyGEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CZQIFWyGEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CZQIFmyGEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CZQIF2yGEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CZQIGGyGEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CZQIGWyGEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CZQIGmyGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CZQIG2yGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CZQIHGyGEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CZQIHWyGEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CZQIHmyGEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CZQIH2yGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CZQIIGyGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CZQIIWyGEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CZQIImyGEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CZQII2yGEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CZQIJGyGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CZQIJWyGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CZQIJmyGEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CZQIJ2yGEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="sashwindowsdi.uml#_eE7YIEJVEd6kIY39uis5Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CZQIEWyGEeKx9Kegn5X27A" x="732" y="216"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_QHBfoGyGEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QHBfomyGEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QHBfo2yGEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QHBfpGyGEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QHBfpWyGEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QHBfpmyGEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QHBfp2yGEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QHKpkGyGEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QHKpkWyGEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QHKpkmyGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QHKpk2yGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QHKplGyGEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QHKplWyGEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QHKplmyGEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QHKpl2yGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QHKpmGyGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QHKpmWyGEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QHKpmmyGEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QHKpm2yGEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QHKpnGyGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QHKpnWyGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QHKpnmyGEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QHKpn2yGEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="sashwindowsdi.uml#_b7a4cEMaEd6kIY39uis5Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QHBfoWyGEeKx9Kegn5X27A" x="294" y="516"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_eHZDEGyGEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eHZDEmyGEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eHZDE2yGEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eHZDFGyGEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eHZDFWyGEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eHZDFmyGEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eHZDF2yGEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_eHZDGGyGEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_eHZDGWyGEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_eHZDGmyGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_eHZDG2yGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_eHZDHGyGEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eHZDHWyGEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_eHZDHmyGEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_eHZDH2yGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_eHZDIGyGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_eHZDIWyGEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eHZDImyGEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_eHZDI2yGEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_eHZDJGyGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_eHZDJWyGEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_eHZDJmyGEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eHZDJ2yGEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="sashwindowsdi.uml#_-9vywEMaEd6kIY39uis5Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eHZDEWyGEeKx9Kegn5X27A" x="24" y="222"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__nlxYGyIEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__nlxYmyIEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__nlxY2yIEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__nlxZGyIEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__nlxZWyIEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__nlxZmyIEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__nlxZ2yIEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="__nlxaGyIEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__nlxaWyIEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__nlxamyIEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__nlxa2yIEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__nlxbGyIEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__nlxbWyIEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__nlxbmyIEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__nlxb2yIEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__nlxcGyIEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__nlxcWyIEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__nlxcmyIEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__nlxc2yIEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__nlxdGyIEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__nlxdWyIEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__nlxdmyIEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__nlxd2yIEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EObject"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__nlxYWyIEeKx9Kegn5X27A" x="1134" y="522"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_xRNpEWyFEeKx9Kegn5X27A"/>
+    <element xmi:type="uml:Model" href="sashwindowsdi.uml#_NuHhwEJVEd6kIY39uis5Uw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_z3ZoMGyFEeKx9Kegn5X27A" type="4001" source="_z0HqsGyFEeKx9Kegn5X27A" target="_z1T9gGyFEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_z3iyIGyFEeKx9Kegn5X27A" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z3iyIWyFEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_z3iyImyFEeKx9Kegn5X27A" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z3iyI2yFEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_z3iyJGyFEeKx9Kegn5X27A" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z3iyJWyFEeKx9Kegn5X27A" x="22" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_z3iyJmyFEeKx9Kegn5X27A" visible="false" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z3iyJ2yFEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_z3iyKGyFEeKx9Kegn5X27A" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z3iyKWyFEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_z3iyKmyFEeKx9Kegn5X27A" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z3iyK2yFEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_z3ZoMWyFEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="sashwindowsdi.uml#_9JomUEJVEd6kIY39uis5Uw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z3ZoMmyFEeKx9Kegn5X27A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_4cfkAGyFEeKx9Kegn5X27A" type="4001" source="_4bTRMGyFEeKx9Kegn5X27A" target="_z1T9gGyFEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_4cfkA2yFEeKx9Kegn5X27A" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4cfkBGyFEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4cfkBWyFEeKx9Kegn5X27A" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4cfkBmyFEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4cfkB2yFEeKx9Kegn5X27A" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4cfkCGyFEeKx9Kegn5X27A" x="-28" y="-48"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4cfkCWyFEeKx9Kegn5X27A" visible="false" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4cfkCmyFEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4cfkC2yFEeKx9Kegn5X27A" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4cfkDGyFEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4cfkDWyFEeKx9Kegn5X27A" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4cfkDmyFEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_4cfkAWyFEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="sashwindowsdi.uml#_mT2jkEJkEd6kIY39uis5Uw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4cfkAmyFEeKx9Kegn5X27A" points="[-50, 34, 610, 40]$[-194, 133, 466, 139]$[-655, 133, 5, 139]$[-655, 44, 5, 50]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_6DldoGyFEeKx9Kegn5X27A" type="4001" source="_6BzU8GyFEeKx9Kegn5X27A" target="_6Ci70GyFEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_6DvOoGyFEeKx9Kegn5X27A" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6DvOoWyFEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6DvOomyFEeKx9Kegn5X27A" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6DvOo2yFEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6DvOpGyFEeKx9Kegn5X27A" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6DvOpWyFEeKx9Kegn5X27A" x="25" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6DvOpmyFEeKx9Kegn5X27A" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6DvOp2yFEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6DvOqGyFEeKx9Kegn5X27A" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6DvOqWyFEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6DvOqmyFEeKx9Kegn5X27A" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6DvOq2yFEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_6DldoWyFEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="sashwindowsdi.uml#__CVNUEJVEd6kIY39uis5Uw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6DldomyFEeKx9Kegn5X27A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_6lXVAGyFEeKx9Kegn5X27A" type="4001" source="_6knuIGyFEeKx9Kegn5X27A" target="_4bTRMGyFEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_6lXVA2yFEeKx9Kegn5X27A" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6lXVBGyFEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6lXVBWyFEeKx9Kegn5X27A" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6lXVBmyFEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6lXVB2yFEeKx9Kegn5X27A" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6lXVCGyFEeKx9Kegn5X27A" x="-16" y="-50"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6lXVCWyFEeKx9Kegn5X27A" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6lXVCmyFEeKx9Kegn5X27A" x="12" y="47"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6lXVC2yFEeKx9Kegn5X27A" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6lXVDGyFEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6lXVDWyFEeKx9Kegn5X27A" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6lXVDmyFEeKx9Kegn5X27A" x="6" y="-30"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_6lXVAWyFEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="sashwindowsdi.uml#_AM_CkEJWEd6kIY39uis5Uw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6lXVAmyFEeKx9Kegn5X27A" points="[4, -50, -20, 250]$[20, -250, -4, 50]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_-YK4QGyFEeKx9Kegn5X27A" type="4002" source="_z0HqsGyFEeKx9Kegn5X27A" target="_6Ci70GyFEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-YK4Q2yFEeKx9Kegn5X27A" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-YK4RGyFEeKx9Kegn5X27A" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_-YK4QWyFEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Generalization" href="sashwindowsdi.uml#_95DboEJWEd6kIY39uis5Uw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-YK4QmyFEeKx9Kegn5X27A" points="[50, 12, -365, -90]$[365, 89, -50, -13]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_CaI44GyGEeKx9Kegn5X27A" type="4002" source="_CZQIEGyGEeKx9Kegn5X27A" target="_6BzU8GyFEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_CaI442yGEeKx9Kegn5X27A" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CaI45GyGEeKx9Kegn5X27A" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_CaI44WyGEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Generalization" href="sashwindowsdi.uml#_7VZokEJVEd6kIY39uis5Uw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CaI44myGEeKx9Kegn5X27A" points="[0, 0, -753, -562]$[703, 524, -50, -38]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_C8qXIGyGEeKx9Kegn5X27A" type="4002" source="_CZQIEGyGEeKx9Kegn5X27A" target="_6Ci70GyFEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_C8qXI2yGEeKx9Kegn5X27A" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_C8qXJGyGEeKx9Kegn5X27A" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_C8qXIWyGEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Generalization" href="sashwindowsdi.uml#_UH6OsEsDEd6MxdnlcgT3eA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_C8qXImyGEeKx9Kegn5X27A" points="[36, -50, -315, 432]$[314, -432, -37, 50]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_HSH7gGyGEeKx9Kegn5X27A" type="4002" source="_4bTRMGyFEeKx9Kegn5X27A" target="_6BzU8GyFEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HSRFcGyGEeKx9Kegn5X27A" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HSRFcWyGEeKx9Kegn5X27A" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_HSH7gWyGEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Generalization" href="sashwindowsdi.uml#_71vVgEJVEd6kIY39uis5Uw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HSH7gmyGEeKx9Kegn5X27A" points="[26, -50, -166, 310]$[165, -310, -27, 50]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_QH6QcGyGEeKx9Kegn5X27A" type="4001" source="_6knuIGyFEeKx9Kegn5X27A" target="_QHBfoGyGEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QH6Qc2yGEeKx9Kegn5X27A" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QH6QdGyGEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QH6QdWyGEeKx9Kegn5X27A" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QH6QdmyGEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QH6Qd2yGEeKx9Kegn5X27A" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QH6QeGyGEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QH6QeWyGEeKx9Kegn5X27A" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QH6QemyGEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QH6Qe2yGEeKx9Kegn5X27A" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QH6QfGyGEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QH6QfWyGEeKx9Kegn5X27A" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QH6QfmyGEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_QH6QcWyGEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="sashwindowsdi.uml#_viyZUEJZEd6kIY39uis5Uw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QH6QcmyGEeKx9Kegn5X27A" points="[-50, -45, 600, 533]$[-650, -578, 0, 0]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_eIIp8GyGEeKx9Kegn5X27A" type="4001" source="_QHBfoGyGEeKx9Kegn5X27A" target="_eHZDEGyGEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_eIIp82yGEeKx9Kegn5X27A" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_eIIp9GyGEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_eIIp9WyGEeKx9Kegn5X27A" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_eIIp9myGEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_eIIp92yGEeKx9Kegn5X27A" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_eIIp-GyGEeKx9Kegn5X27A" x="-33" y="-26"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_eIIp-WyGEeKx9Kegn5X27A" visible="false" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_eIIp-myGEeKx9Kegn5X27A" x="56" y="72"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_eIIp-2yGEeKx9Kegn5X27A" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_eIIp_GyGEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_eIIp_WyGEeKx9Kegn5X27A" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_eIIp_myGEeKx9Kegn5X27A" x="56" y="-31"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_eIIp8WyGEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="sashwindowsdi.uml#_9k0bgEMbEd6kIY39uis5Uw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eIIp8myGEeKx9Kegn5X27A" points="[-50, 0, 207, 294]$[-248, 0, 9, 294]$[-248, -244, 9, 50]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_fLY2sGyGEeKx9Kegn5X27A" type="4001" source="_z1T9gGyFEeKx9Kegn5X27A" target="_eHZDEGyGEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_fLY2s2yGEeKx9Kegn5X27A" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fLY2tGyGEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fLY2tWyGEeKx9Kegn5X27A" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fLY2tmyGEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fLY2t2yGEeKx9Kegn5X27A" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fLY2uGyGEeKx9Kegn5X27A" x="33" y="22"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fLY2uWyGEeKx9Kegn5X27A" visible="false" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fLY2umyGEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fLY2u2yGEeKx9Kegn5X27A" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fLY2vGyGEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fLiAoGyGEeKx9Kegn5X27A" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fLiAoWyGEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_fLY2sWyGEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="sashwindowsdi.uml#_-EQwkEMbEd6kIY39uis5Uw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fLY2smyGEeKx9Kegn5X27A" points="[-21, 50, 92, -220]$[-92, 220, 21, -50]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__ofJQGyIEeKx9Kegn5X27A" type="4001" source="__nlxYGyIEeKx9Kegn5X27A" target="_6knuIGyFEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="__ooTMGyIEeKx9Kegn5X27A" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__ooTMWyIEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__ooTMmyIEeKx9Kegn5X27A" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__ooTM2yIEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__ooTNGyIEeKx9Kegn5X27A" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__ooTNWyIEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__ooTNmyIEeKx9Kegn5X27A" visible="false" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__ooTN2yIEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__ooTOGyIEeKx9Kegn5X27A" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__ooTOWyIEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__ooTOmyIEeKx9Kegn5X27A" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__ooTO2yIEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__ofJQWyIEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="sashwindowsdi.uml#_b3enUEnjEd6ussMWxXGeXg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__ofJQmyIEeKx9Kegn5X27A" points="[0, 0, -986, -572]$[936, 542, -50, -30]"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_CCrlsGyHEeKx9Kegn5X27A" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_CnIWkGyHEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CnIWkWyHEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CnIWkmyHEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CnIWk2yHEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CnIWlGyHEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CnIWlWyHEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CnIWlmyHEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnIWl2yHEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CnIWmGyHEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CnIWmWyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CnIWmmyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CnIWm2yHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnIWnGyHEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CnIWnWyHEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CnIWnmyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CnIWn2yHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CnIWoGyHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnIWoWyHEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CnIWomyHEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CnIWo2yHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CnIWpGyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CnIWpWyHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnIWpmyHEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="sashwindowsdi.uml#_-9vywEMaEd6kIY39uis5Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnIWp2yHEeKx9Kegn5X27A" x="34" y="232"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_CnSHmGyHEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CnSHmWyHEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CnSHmmyHEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CnSHm2yHEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CnSHnGyHEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CnSHnWyHEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CnSHnmyHEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnSHn2yHEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CnSHoGyHEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CnSHoWyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CnSHomyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CnSHo2yHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnSHpGyHEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CnSHpWyHEeKx9Kegn5X27A" type="7018">
+        <children xmi:type="notation:Shape" xmi:id="_F9OIoGyHEeKx9Kegn5X27A" type="3013" fontName="Segoe UI" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RjPwkGyHEeKx9Kegn5X27A" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TjMPEGyHEeKx9Kegn5X27A" key="CustomAppearance_MaskValue" value="21258"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="sashwindowsdi.uml#_wdFgUEV4Ed6g-YgfS2DHrA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_F9OIoWyHEeKx9Kegn5X27A" x="32" y="15"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_F-G5cGyHEeKx9Kegn5X27A" type="3013" fontName="Segoe UI" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RjZhkWyHEeKx9Kegn5X27A" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TjMPEWyHEeKx9Kegn5X27A" key="CustomAppearance_MaskValue" value="21258"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="sashwindowsdi.uml#_m7xPsEa4Ed6g-YgfS2DHrA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_F-G5cWyHEeKx9Kegn5X27A" x="32" y="15"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_F-2gUGyHEeKx9Kegn5X27A" type="3013" fontName="Segoe UI" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WgzPsGyHEeKx9Kegn5X27A" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xvt54GyHEeKx9Kegn5X27A" key="CustomAppearance_MaskValue" value="21258"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="sashwindowsdi.uml#_e9ojYEbXEd6g-YgfS2DHrA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_F-2gUWyHEeKx9Kegn5X27A" x="32" y="15"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_F_mHMGyHEeKx9Kegn5X27A" type="3013" fontName="Segoe UI" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WgzPsmyHEeKx9Kegn5X27A" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xvt54WyHEeKx9Kegn5X27A" key="CustomAppearance_MaskValue" value="21258"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="sashwindowsdi.uml#_q8zekEbsEd6g-YgfS2DHrA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_F_mHMWyHEeKx9Kegn5X27A" x="32" y="15"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_GAffEGyHEeKx9Kegn5X27A" type="3013" fontName="Segoe UI" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WgzPtGyHEeKx9Kegn5X27A" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xvt54myHEeKx9Kegn5X27A" key="CustomAppearance_MaskValue" value="21258"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="sashwindowsdi.uml#_vnqNcEoIEd6ussMWxXGeXg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_GAffEWyHEeKx9Kegn5X27A" x="32" y="15"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_GBYP4GyHEeKx9Kegn5X27A" type="3013" fontName="Segoe UI" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WgzPtmyHEeKx9Kegn5X27A" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xvt542yHEeKx9Kegn5X27A" key="CustomAppearance_MaskValue" value="21258"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="sashwindowsdi.uml#_Kvf9cEoJEd6ussMWxXGeXg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_GBYP4WyHEeKx9Kegn5X27A" x="32" y="15"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_GCRnwGyHEeKx9Kegn5X27A" type="3013" fontName="Segoe UI" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WgzPuGyHEeKx9Kegn5X27A" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xvt55GyHEeKx9Kegn5X27A" key="CustomAppearance_MaskValue" value="21258"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="sashwindowsdi.uml#_OoMtUEoJEd6ussMWxXGeXg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_GCRnwWyHEeKx9Kegn5X27A" x="32" y="15"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_GDBOoGyHEeKx9Kegn5X27A" type="3013" fontName="Segoe UI" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WgzPumyHEeKx9Kegn5X27A" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xvt55WyHEeKx9Kegn5X27A" key="CustomAppearance_MaskValue" value="21258"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="sashwindowsdi.uml#_vaMqoE4OEd-B2uXHu4qMXg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_GDBOoWyHEeKx9Kegn5X27A" x="32" y="15"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_GDw1gGyHEeKx9Kegn5X27A" type="3013" fontName="Segoe UI" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WgzPvGyHEeKx9Kegn5X27A" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xv3q4GyHEeKx9Kegn5X27A" key="CustomAppearance_MaskValue" value="21258"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="sashwindowsdi.uml#_-TkSoE4OEd-B2uXHu4qMXg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_GDw1gWyHEeKx9Kegn5X27A" x="32" y="15"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_GEgcYGyHEeKx9Kegn5X27A" type="3013" fontName="Segoe UI" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WgzPvmyHEeKx9Kegn5X27A" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xv3q4WyHEeKx9Kegn5X27A" key="CustomAppearance_MaskValue" value="21258"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="sashwindowsdi.uml#_1jUIgE4PEd-B2uXHu4qMXg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_GEgcYWyHEeKx9Kegn5X27A" x="32" y="15"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_GFQDQGyHEeKx9Kegn5X27A" type="3013" fontName="Segoe UI" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WgzPwGyHEeKx9Kegn5X27A" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xv3q4myHEeKx9Kegn5X27A" key="CustomAppearance_MaskValue" value="21258"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="sashwindowsdi.uml#_4qi_ME4PEd-B2uXHu4qMXg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_GFQDQWyHEeKx9Kegn5X27A" x="32" y="15"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_GGJbIGyHEeKx9Kegn5X27A" type="3013" fontName="Segoe UI" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WgzPwmyHEeKx9Kegn5X27A" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xv3q42yHEeKx9Kegn5X27A" key="CustomAppearance_MaskValue" value="21258"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="sashwindowsdi.uml#_fPvj8FgxEeGNKLzLkykmJw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_GGJbIWyHEeKx9Kegn5X27A" x="32" y="15"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CnSHpmyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CnSHp2yHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CnSHqGyHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnSHqWyHEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CnSHqmyHEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CnSHq2yHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CnSHrGyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CnSHrWyHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnSHrmyHEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="sashwindowsdi.uml#_UiIMMEJVEd6kIY39uis5Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnSHr2yHEeKx9Kegn5X27A" x="288" y="150"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_CnSH4WyHEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CnSH4myHEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CnSH42yHEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CnSH5GyHEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CnSH5WyHEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CnSH5myHEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CnSH52yHEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnSH6GyHEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CnSH6WyHEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CnSH6myHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CnSH62yHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CnSH7GyHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnSH7WyHEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CnSH7myHEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CnSH72yHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CnSH8GyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CnSH8WyHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnSH8myHEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CnSH82yHEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CnSH9GyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CnSH9WyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CnSH9myHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnSH92yHEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="sashwindowsdi.uml#_h_HVwEJVEd6kIY39uis5Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnSH-GyHEeKx9Kegn5X27A" x="948" y="654"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_CnbRv2yHEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CnbRwGyHEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CnbRwWyHEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CnbRwmyHEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CnbRw2yHEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CnbRxGyHEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CnbRxWyHEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnbRxmyHEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CnbRx2yHEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CnbRyGyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CnbRyWyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CnbRymyHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnbRy2yHEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CnbRzGyHEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CnbRzWyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CnbRzmyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CnbRz2yHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnbR0GyHEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CnbR0WyHEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CnbR0myHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CnbR02yHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CnbR1GyHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnbR1WyHEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="sashwindowsdi.uml#_b7a4cEMaEd6kIY39uis5Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnbR1myHEeKx9Kegn5X27A" x="306" y="648"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_rFD98GyHEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rFD98myHEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rFD982yHEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rFD99GyHEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rFD99WyHEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rFD99myHEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rFD992yHEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rFD9-GyHEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rFD9-WyHEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rFD9-myHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rFD9-2yHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rFD9_GyHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rFD9_WyHEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rFD9_myHEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rFD9_2yHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rFD-AGyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rFD-AWyHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rFD-AmyHEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rFD-A2yHEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rFD-BGyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rFD-BWyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rFD-BmyHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rFD-B2yHEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EObject"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rFD98WyHEeKx9Kegn5X27A" x="740" y="794"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_0mKgwGyHEeKx9Kegn5X27A" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0mKgwmyHEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0mKgw2yHEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0mKgxGyHEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0mKgxWyHEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0mKgxmyHEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0mKgx2yHEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0mKgyGyHEeKx9Kegn5X27A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0mKgyWyHEeKx9Kegn5X27A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0mKgymyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0mKgy2yHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0mKgzGyHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0mKgzWyHEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0mKgzmyHEeKx9Kegn5X27A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0mKgz2yHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0mKg0GyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0mKg0WyHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0mKg0myHEeKx9Kegn5X27A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0mKg02yHEeKx9Kegn5X27A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0mKg1GyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0mKg1WyHEeKx9Kegn5X27A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0mKg1myHEeKx9Kegn5X27A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0mKg12yHEeKx9Kegn5X27A"/>
+      </children>
+      <element xmi:type="uml:Class" href="sashwindowsdi.uml#_fbWYgEJVEd6kIY39uis5Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0mKgwWyHEeKx9Kegn5X27A" x="780" y="534"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_CCrlsWyHEeKx9Kegn5X27A"/>
+    <element xmi:type="uml:Model" href="sashwindowsdi.uml#_NuHhwEJVEd6kIY39uis5Uw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_CnIWt2yHEeKx9Kegn5X27A" type="4001" source="_CnSHmGyHEeKx9Kegn5X27A" target="_CnIWkGyHEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnIWuGyHEeKx9Kegn5X27A" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnIWuWyHEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnIWumyHEeKx9Kegn5X27A" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnIWu2yHEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnIWvGyHEeKx9Kegn5X27A" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnIWvWyHEeKx9Kegn5X27A" x="33" y="22"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnIWvmyHEeKx9Kegn5X27A" visible="false" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnIWv2yHEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnIWwGyHEeKx9Kegn5X27A" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnIWwWyHEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnIWwmyHEeKx9Kegn5X27A" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnIWw2yHEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_CnIWxGyHEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="sashwindowsdi.uml#_-EQwkEMbEd6kIY39uis5Uw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CnIWxWyHEeKx9Kegn5X27A" points="[-21, 50, 92, -220]$[-92, 220, 21, -50]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_CnIWxmyHEeKx9Kegn5X27A" type="4001" source="_CnbRv2yHEeKx9Kegn5X27A" target="_CnIWkGyHEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnIWx2yHEeKx9Kegn5X27A" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnIWyGyHEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnIWyWyHEeKx9Kegn5X27A" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnIWymyHEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnIWy2yHEeKx9Kegn5X27A" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnIWzGyHEeKx9Kegn5X27A" x="-33" y="-26"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnIWzWyHEeKx9Kegn5X27A" visible="false" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnIWzmyHEeKx9Kegn5X27A" x="56" y="72"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnIWz2yHEeKx9Kegn5X27A" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnIW0GyHEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnIW0WyHEeKx9Kegn5X27A" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnIW0myHEeKx9Kegn5X27A" x="56" y="-31"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_CnIW02yHEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="sashwindowsdi.uml#_9k0bgEMbEd6kIY39uis5Uw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CnIW1GyHEeKx9Kegn5X27A" points="[-50, 0, 207, 294]$[-248, 0, 9, 294]$[-248, -244, 9, 50]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_CnSIDWyHEeKx9Kegn5X27A" type="4001" source="_CnSH4WyHEeKx9Kegn5X27A" target="_CnbRv2yHEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnSIDmyHEeKx9Kegn5X27A" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnSID2yHEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnSIEGyHEeKx9Kegn5X27A" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnSIEWyHEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnSIEmyHEeKx9Kegn5X27A" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnSIE2yHEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnSIFGyHEeKx9Kegn5X27A" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnSIFWyHEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnSIFmyHEeKx9Kegn5X27A" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnSIF2yHEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CnSIGGyHEeKx9Kegn5X27A" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CnSIGWyHEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_CnSIGmyHEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="sashwindowsdi.uml#_viyZUEJZEd6kIY39uis5Uw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CnSIG2yHEeKx9Kegn5X27A" points="[-50, -45, 600, 533]$[-650, -578, 0, 0]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_rGHG0GyHEeKx9Kegn5X27A" type="4001" source="_rFD98GyHEeKx9Kegn5X27A" target="_CnSH4WyHEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_rGHG02yHEeKx9Kegn5X27A" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rGHG1GyHEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rGHG1WyHEeKx9Kegn5X27A" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rGHG1myHEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rGHG12yHEeKx9Kegn5X27A" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rGHG2GyHEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rGHG2WyHEeKx9Kegn5X27A" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rGHG2myHEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rGHG22yHEeKx9Kegn5X27A" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rGHG3GyHEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rGHG3WyHEeKx9Kegn5X27A" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rGHG3myHEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_rGHG0WyHEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="sashwindowsdi.uml#_b3enUEnjEd6ussMWxXGeXg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rGHG0myHEeKx9Kegn5X27A" points="[0, 0, -996, -582]$[946, 552, -50, -30]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_0mwWoGyHEeKx9Kegn5X27A" type="4001" source="_0mKgwGyHEeKx9Kegn5X27A" target="_CnSHmGyHEeKx9Kegn5X27A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_0mwWo2yHEeKx9Kegn5X27A" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0mwWpGyHEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0mwWpWyHEeKx9Kegn5X27A" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0mwWpmyHEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0mwWp2yHEeKx9Kegn5X27A" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0mwWqGyHEeKx9Kegn5X27A" x="-30" y="70"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0mwWqWyHEeKx9Kegn5X27A" visible="false" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0mwWqmyHEeKx9Kegn5X27A" x="26" y="-82"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0mwWq2yHEeKx9Kegn5X27A" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0mwWrGyHEeKx9Kegn5X27A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0mwWrWyHEeKx9Kegn5X27A" visible="false" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0mwWrmyHEeKx9Kegn5X27A" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_0mwWoWyHEeKx9Kegn5X27A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="sashwindowsdi.uml#_mT2jkEJkEd6kIY39uis5Uw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0mwWomyHEeKx9Kegn5X27A" points="[0, 0, -694, -312]$[333, 150, -361, -162]"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_0m_xwGyIEeKx9Kegn5X27A" type="PapyrusUMLClassDiagram" name="datatypes" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_2JyaMGyIEeKx9Kegn5X27A" type="2009" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2JyaMmyIEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2JyaM2yIEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2JyaNGyIEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2JyaNWyIEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2JyaNmyIEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2JyaN2yIEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_2JyaOGyIEeKx9Kegn5X27A" type="5032"/>
+      <element xmi:type="uml:PrimitiveType" href="sashwindowsdi.uml#_Hkk78EVbEd6g-YgfS2DHrA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2JyaMWyIEeKx9Kegn5X27A" x="120" y="196"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_2ldCgGyIEeKx9Kegn5X27A" type="2009" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2ldCgmyIEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2ldCg2yIEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2ldChGyIEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2ldChWyIEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2ldChmyIEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2ldCh2yIEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_2ldCiGyIEeKx9Kegn5X27A" type="5032"/>
+      <element xmi:type="uml:PrimitiveType" href="sashwindowsdi.uml#_A-BP8EVhEd6g-YgfS2DHrA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2ldCgWyIEeKx9Kegn5X27A" x="342" y="192"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_28g3oGyIEeKx9Kegn5X27A" type="2009" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_28g3omyIEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_28g3o2yIEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_28g3pGyIEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_28g3pWyIEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_28g3pmyIEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_28g3p2yIEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_28g3qGyIEeKx9Kegn5X27A" type="5032"/>
+      <element xmi:type="uml:PrimitiveType" href="sashwindowsdi.uml#_IEBx4EV4Ed6g-YgfS2DHrA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_28g3oWyIEeKx9Kegn5X27A" x="120" y="324"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_3hRKgGyIEeKx9Kegn5X27A" type="2009" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3hRKgmyIEeKx9Kegn5X27A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3hRKg2yIEeKx9Kegn5X27A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3hRKhGyIEeKx9Kegn5X27A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3hRKhWyIEeKx9Kegn5X27A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3hRKhmyIEeKx9Kegn5X27A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3hRKh2yIEeKx9Kegn5X27A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_3hRKiGyIEeKx9Kegn5X27A" type="5032"/>
+      <element xmi:type="uml:PrimitiveType" href="sashwindowsdi.uml#_SNSWAEbaEd6g-YgfS2DHrA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3hRKgWyIEeKx9Kegn5X27A" x="344" y="328"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_0m_xwWyIEeKx9Kegn5X27A"/>
+    <element xmi:type="uml:Model" href="sashwindowsdi.uml#_NuHhwEJVEd6kIY39uis5Uw"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.uml b/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.uml
index dade747e4a3..ee47aab52fc 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.uml
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.uml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/4" xmlns:Ecore_1="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/4 pathmap://UML_PROFILES/Ecore.profile.uml#_B7dOIMEREduRdatXodjBjA http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
   <uml:Model xmi:id="_NuHhwEJVEd6kIY39uis5Uw" name="di" URI="http://www.eclipse.org/papyrus/0.7.0/sashdi">
-    <packageImport xmi:id="_NuHhwUJVEd6kIY39uis5Uw">
-      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
-    </packageImport>
     <packageImport xmi:id="_F0PskN5qEd2dfviKlv9PXw">
       <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#_0"/>
     </packageImport>
@@ -52,7 +49,7 @@ Lookup in the entire SashModel structure.</body>
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedParameter>
-        <ownedParameter xmi:id="_UTCMcEbYEd6g-YgfS2DHrA" name="null" type="_h_HVwEJVEd6kIY39uis5Uw" direction="return">
+        <ownedParameter xmi:id="_UTCMcEbYEd6g-YgfS2DHrA" name="return" type="_h_HVwEJVEd6kIY39uis5Uw" direction="return">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WgwBMEbYEd6g-YgfS2DHrA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Wg5LIEbYEd6g-YgfS2DHrA" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_Wg5LIUbYEd6g-YgfS2DHrA">
@@ -82,8 +79,7 @@ Lookup in the entire SashModel structure.</body>
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedParameter>
-        <ownedParameter xmi:id="_q8zelUbsEd6g-YgfS2DHrA" name="targetIndex">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        <ownedParameter xmi:id="_q8zelUbsEd6g-YgfS2DHrA" name="targetIndex" type="_Hkk78EVbEd6g-YgfS2DHrA">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_q8zel0bsEd6g-YgfS2DHrA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q8zelkbsEd6g-YgfS2DHrA" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_q8zemEbsEd6g-YgfS2DHrA">
@@ -106,8 +102,7 @@ Lookup in the entire SashModel structure.</body>
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedParameter>
-        <ownedParameter xmi:id="_vnqNfUoIEd6ussMWxXGeXg" name="refFolderSide">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        <ownedParameter xmi:id="_vnqNfUoIEd6ussMWxXGeXg" name="refFolderSide" type="_Hkk78EVbEd6g-YgfS2DHrA">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vnqNf0oIEd6ussMWxXGeXg" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vnqNfkoIEd6ussMWxXGeXg" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_vnqNgEoIEd6ussMWxXGeXg">
@@ -241,8 +236,7 @@ Lookup in the entire SashModel structure.</body>
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_1nx64EbpEd6g-YgfS2DHrA" name="direction" visibility="public" isUnique="false">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+      <ownedAttribute xmi:id="_1nx64EbpEd6g-YgfS2DHrA" name="direction" visibility="public" type="_Hkk78EVbEd6g-YgfS2DHrA" isUnique="false">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4GxF0EbpEd6g-YgfS2DHrA" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4G620EbpEd6g-YgfS2DHrA" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_4G620UbpEd6g-YgfS2DHrA">
@@ -289,8 +283,7 @@ Lookup in the entire SashModel structure.</body>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ANIzkkJWEd6kIY39uis5Uw" value="*"/>
       </ownedAttribute>
       <ownedOperation xmi:id="_Cqh_oEViEd6g-YgfS2DHrA" name="movePage">
-        <ownedParameter xmi:id="_ETI8MEViEd6g-YgfS2DHrA" name="oldIndex">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        <ownedParameter xmi:id="_ETI8MEViEd6g-YgfS2DHrA" name="oldIndex" type="_Hkk78EVbEd6g-YgfS2DHrA">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G2wIcEViEd6g-YgfS2DHrA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G2wIcUViEd6g-YgfS2DHrA" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_G2wIckViEd6g-YgfS2DHrA">
@@ -326,7 +319,7 @@ Lookup in the entire SashModel structure.</body>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_h_HVwEJVEd6kIY39uis5Uw" name="PageRef">
       <ownedAttribute xmi:id="_ANIzk0JWEd6kIY39uis5Uw" name="parent" type="_fbWYgEJVEd6kIY39uis5Uw" isUnique="false" association="_AM_CkEJWEd6kIY39uis5Uw">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ANIzlUJWEd6kIY39uis5Uw" value="1"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ANIzlUJWEd6kIY39uis5Uw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ANIzlEJWEd6kIY39uis5Uw" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:id="_b94xUEnjEd6ussMWxXGeXg" name="emfPageIdentifier" visibility="private" isUnique="false" association="_b3enUEnjEd6ussMWxXGeXg">
@@ -363,8 +356,7 @@ They are not stored in the same place.</body>
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedParameter>
-        <ownedParameter xmi:id="_D0_awEbaEd6g-YgfS2DHrA" name="null" direction="return">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+        <ownedParameter xmi:id="_D0_awEbaEd6g-YgfS2DHrA" name="return" type="_SNSWAEbaEd6g-YgfS2DHrA" direction="return">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GFO_EEbaEd6g-YgfS2DHrA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GFO_EUbaEd6g-YgfS2DHrA" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_GFO_EkbaEd6g-YgfS2DHrA">
@@ -476,8 +468,7 @@ Used to insert a new SashPanel.</body>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_jc9vQESDEd6kIY39uis5Uw" name="Position">
-      <ownedAttribute xmi:id="_m9q14ESDEd6kIY39uis5Uw" name="x" visibility="public" isUnique="false">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+      <ownedAttribute xmi:id="_m9q14ESDEd6kIY39uis5Uw" name="x" visibility="public" type="_Hkk78EVbEd6g-YgfS2DHrA" isUnique="false">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pZ1WUESDEd6kIY39uis5Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pZ1WUUSDEd6kIY39uis5Uw" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_paIRQESDEd6kIY39uis5Uw">
@@ -543,17 +534,13 @@ Used to insert a new SashPanel.</body>
       <appliedProfile href="pathmap://UML_PROFILES/StandardL3.profile.uml#_0"/>
     </profileApplication>
   </uml:Model>
-  <Ecore:EPackage xmi:id="_zLIxUEJfEd6kIY39uis5Uw" nsPrefix="di2" nsURI="http://www.eclipse.org/papyrus/0.7.0/sashdi" basePackage="org.eclipse.papyrus.infra.core.sashwindows.di"/>
-  <Ecore_1:EPackage xmi:id="_mo48QEJgEd6kIY39uis5Uw" base_Package="_NuHhwEJVEd6kIY39uis5Uw" nsPrefix="di" nsURI="http://www.eclipse.org/papyrus/0.7.0/sashdi" basePackage="org.eclipse.papyrus.sashwindows" prefix="Di">
+  <Ecore:EPackage xmi:id="_mo48QEJgEd6kIY39uis5Uw" base_Package="_NuHhwEJVEd6kIY39uis5Uw" nsPrefix="di" nsURI="http://www.eclipse.org/papyrus/0.7.0/sashdi" basePackage="org.eclipse.papyrus.infra.core.sashwindows" prefix="Di">
     <annotation>resource=XMI</annotation>
-  </Ecore_1:EPackage>
-  <Ecore:EClass xmi:id="_XL4scES1Ed6g-YgfS2DHrA" instanceClassName="java.lang.Integer"/>
-  <Ecore:EAttribute xmi:id="_7fEJYEVfEd6g-YgfS2DHrA"/>
-  <Ecore:EClass xmi:id="_NUMKIEVbEd6g-YgfS2DHrA" instanceClassName="java.lang.Object"/>
-  <Ecore_1:EDataType xmi:id="_6EWpcEVgEd6g-YgfS2DHrA" instanceClassName="int" base_PrimitiveType="_Hkk78EVbEd6g-YgfS2DHrA" dataTypeName="int"/>
-  <Ecore_1:EDataType xmi:id="_DLSYwEVhEd6g-YgfS2DHrA" instanceClassName="java.lang.Object" base_PrimitiveType="_A-BP8EVhEd6g-YgfS2DHrA"/>
-  <Ecore_1:EDataType xmi:id="_MeaSgEV4Ed6g-YgfS2DHrA" instanceClassName="float" base_PrimitiveType="_IEBx4EV4Ed6g-YgfS2DHrA"/>
-  <Ecore_1:EDataType xmi:id="_UtLf4EbaEd6g-YgfS2DHrA" instanceClassName="boolean" base_PrimitiveType="_SNSWAEbaEd6g-YgfS2DHrA"/>
-  <Ecore_1:EAttribute xmi:id="_UVaAMEnnEd6ussMWxXGeXg" isTransient="true" base_Property="_GrqUYEnkEd6ussMWxXGeXg"/>
-  <Ecore_1:EReference xmi:id="_uX7T8EsFEd6MxdnlcgT3eA" isTransient="true" isVolatile="true" base_Property="_lnNFMEsFEd6MxdnlcgT3eA"/>
+  </Ecore:EPackage>
+  <Ecore:EDataType xmi:id="_6EWpcEVgEd6g-YgfS2DHrA" instanceClassName="int" base_PrimitiveType="_Hkk78EVbEd6g-YgfS2DHrA" dataTypeName="int"/>
+  <Ecore:EDataType xmi:id="_DLSYwEVhEd6g-YgfS2DHrA" instanceClassName="java.lang.Object" base_PrimitiveType="_A-BP8EVhEd6g-YgfS2DHrA"/>
+  <Ecore:EDataType xmi:id="_MeaSgEV4Ed6g-YgfS2DHrA" instanceClassName="float" base_PrimitiveType="_IEBx4EV4Ed6g-YgfS2DHrA"/>
+  <Ecore:EDataType xmi:id="_UtLf4EbaEd6g-YgfS2DHrA" instanceClassName="boolean" base_PrimitiveType="_SNSWAEbaEd6g-YgfS2DHrA"/>
+  <Ecore:EAttribute xmi:id="_UVaAMEnnEd6ussMWxXGeXg" isTransient="true" base_Property="_GrqUYEnkEd6ussMWxXGeXg"/>
+  <Ecore:EReference xmi:id="_uX7T8EsFEd6MxdnlcgT3eA" isTransient="true" isVolatile="true" base_Property="_lnNFMEsFEd6MxdnlcgT3eA"/>
 </xmi:XMI>
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml b/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml
index 392840484d8..bf5e305d70c 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml
@@ -17,4 +17,11 @@
             genModel="model/sashwindowsdi.genmodel"/>
    </extension>
 
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated sashwindowsdi -->
+      <parser
+            type="di"
+            class="org.eclipse.papyrus.infra.core.sashwindows.di.util.DiResourceFactoryImpl"/>
+   </extension>
+
 </plugin>
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPage.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPage.java
index 0acfa7dc176..a23c4ad3e4c 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPage.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPage.java
@@ -12,14 +12,14 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Abstract Page</b></em>'.
  * <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage#getPageIdentifier <em>Page Identifier</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage#getPageIdentifier <em>Page Identifier</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPage()
  * @model
  * @generated
@@ -33,7 +33,6 @@ public interface AbstractPage extends EObject {
 	 * If the meaning of the '<em>Page Identifier</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Page Identifier</em>' attribute.
 	 * @see #setPageIdentifier(Object)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPage_PageIdentifier()
@@ -46,9 +45,7 @@ public interface AbstractPage extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage#getPageIdentifier <em>Page Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Page Identifier</em>' attribute.
+	 * @param value the new value of the '<em>Page Identifier</em>' attribute.
 	 * @see #getPageIdentifier()
 	 * @generated
 	 */
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPanel.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPanel.java
index 0a23f60b240..0147259ae2e 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPanel.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPanel.java
@@ -12,14 +12,14 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Abstract Panel</b></em>'.
  * <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPanel()
  * @model abstract="true"
  * @generated
@@ -34,7 +34,6 @@ public interface AbstractPanel extends EObject {
 	 * If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Parent</em>' container reference.
 	 * @see #setParent(PanelParent)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPanel_Parent()
@@ -48,9 +47,7 @@ public interface AbstractPanel extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent <em>Parent</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Parent</em>' container reference.
+	 * @param value the new value of the '<em>Parent</em>' container reference.
 	 * @see #getParent()
 	 * @generated
 	 */
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java
index c9bc1bc2491..8b4363125ef 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java
@@ -549,7 +549,7 @@ public interface DiPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getFloat()
 	 * @generated
 	 */
-	int FLOAT = 14;
+	int FLOAT = 15;
 
 	/**
 	 * The meta object id for the '<em>boolean</em>' data type.
@@ -558,7 +558,7 @@ public interface DiPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getboolean()
 	 * @generated
 	 */
-	int BOOLEAN = 15;
+	int BOOLEAN = 14;
 
 
 	/**
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageList.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageList.java
index b735ade6eb5..e0badfc16f4 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageList.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageList.java
@@ -13,14 +13,14 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Page List</b></em>'.
  * <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageList#getAvailablePage <em>Available Page</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageList#getAvailablePage <em>Available Page</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageList()
  * @model
  * @generated
@@ -35,7 +35,6 @@ public interface PageList extends EObject {
 	 * If the meaning of the '<em>Available Page</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Available Page</em>' containment reference list.
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageList_AvailablePage()
 	 * @model containment="true" ordered="false"
@@ -46,7 +45,6 @@ public interface PageList extends EObject {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @model pageIdentifierDataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject" pageIdentifierRequired="true" pageIdentifierOrdered="false"
 	 * @generated
 	 */
@@ -55,7 +53,6 @@ public interface PageList extends EObject {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @model pageIdentifierDataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject" pageIdentifierRequired="true" pageIdentifierOrdered="false"
 	 * @generated
 	 */
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageRef.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageRef.java
index 37b49911d92..ec1fec813a0 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageRef.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageRef.java
@@ -12,17 +12,17 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Page Ref</b></em>'.
  * <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getEmfPageIdentifier <em>Emf Page Identifier</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getPageIdentifier <em>Page Identifier</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getObjectPageIdentifier <em>Object Page Identifier</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getEmfPageIdentifier <em>Emf Page Identifier</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getPageIdentifier <em>Page Identifier</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getObjectPageIdentifier <em>Object Page Identifier</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageRef()
  * @model
  * @generated
@@ -36,7 +36,6 @@ public interface PageRef extends EObject {
 	 * If the meaning of the '<em>Emf Page Identifier</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Emf Page Identifier</em>' reference.
 	 * @see #setEmfPageIdentifier(EObject)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageRef_EmfPageIdentifier()
@@ -49,9 +48,7 @@ public interface PageRef extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getEmfPageIdentifier <em>Emf Page Identifier</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Emf Page Identifier</em>' reference.
+	 * @param value the new value of the '<em>Emf Page Identifier</em>' reference.
 	 * @see #getEmfPageIdentifier()
 	 * @generated
 	 */
@@ -65,12 +62,10 @@ public interface PageRef extends EObject {
 	 * pageIdentifier can be a plain JavaObject or an EObject.
 	 * They are not stored in the same place.
 	 * <!-- end-model-doc -->
-	 * 
 	 * @return the value of the '<em>Page Identifier</em>' attribute.
 	 * @see #setPageIdentifier(Object)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageRef_PageIdentifier()
-	 * @model unique="false" dataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject" required="true" transient="true" volatile="true" derived="true"
-	 *        ordered="false"
+	 * @model unique="false" dataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject" required="true" transient="true" volatile="true" derived="true" ordered="false"
 	 * @generated
 	 */
 	Object getPageIdentifier();
@@ -79,9 +74,7 @@ public interface PageRef extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getPageIdentifier <em>Page Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Page Identifier</em>' attribute.
+	 * @param value the new value of the '<em>Page Identifier</em>' attribute.
 	 * @see #getPageIdentifier()
 	 * @generated
 	 */
@@ -94,7 +87,6 @@ public interface PageRef extends EObject {
 	 * <!-- begin-model-doc -->
 	 * Storage to store Identifier that are not EObject.
 	 * <!-- end-model-doc -->
-	 * 
 	 * @return the value of the '<em>Object Page Identifier</em>' attribute.
 	 * @see #setObjectPageIdentifier(Object)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageRef_ObjectPageIdentifier()
@@ -107,9 +99,7 @@ public interface PageRef extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getObjectPageIdentifier <em>Object Page Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Object Page Identifier</em>' attribute.
+	 * @param value the new value of the '<em>Object Page Identifier</em>' attribute.
 	 * @see #getObjectPageIdentifier()
 	 * @generated
 	 */
@@ -123,12 +113,11 @@ public interface PageRef extends EObject {
 	 * If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Parent</em>' container reference.
 	 * @see #setParent(TabFolder)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageRef_Parent()
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#getChildren
-	 * @model opposite="children" required="true" transient="false" ordered="false"
+	 * @model opposite="children" transient="false" ordered="false"
 	 * @generated
 	 */
 	TabFolder getParent();
@@ -137,9 +126,7 @@ public interface PageRef extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getParent <em>Parent</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Parent</em>' container reference.
+	 * @param value the new value of the '<em>Parent</em>' container reference.
 	 * @see #getParent()
 	 * @generated
 	 */
@@ -148,9 +135,7 @@ public interface PageRef extends EObject {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @model required="true" ordered="false" pageIdentifierDataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject" pageIdentifierRequired="true"
-	 *        pageIdentifierOrdered="false"
+	 * @model dataType="org.eclipse.papyrus.infra.core.sashwindows.di.boolean" required="true" ordered="false" pageIdentifierDataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject" pageIdentifierRequired="true" pageIdentifierOrdered="false"
 	 * @generated
 	 */
 	boolean isForIdentifier(Object pageIdentifier);
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PanelParent.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PanelParent.java
index 8ce04747846..27f6b1d4c18 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PanelParent.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PanelParent.java
@@ -13,14 +13,14 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Panel Parent</b></em>'.
  * <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent#getChildren <em>Children</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent#getChildren <em>Children</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPanelParent()
  * @model abstract="true"
  * @generated
@@ -36,7 +36,6 @@ public interface PanelParent extends EObject {
 	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Children</em>' containment reference list.
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPanelParent_Children()
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent
@@ -53,7 +52,6 @@ public interface PanelParent extends EObject {
 	 * Don't need to be implemented in TabFolder.
 	 * Used to insert a new SashPanel.
 	 * <!-- end-model-doc -->
-	 * 
 	 * @model oldChildRequired="true" oldChildOrdered="false" newChildRequired="true" newChildOrdered="false"
 	 * @generated
 	 */
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Position.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Position.java
index 8148b3f862a..7198c9b8aa2 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Position.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Position.java
@@ -12,15 +12,15 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Position</b></em>'.
  * <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Position#getX <em>X</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Position#getY <em>Y</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Position#getX <em>X</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Position#getY <em>Y</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPosition()
  * @model
  * @generated
@@ -34,11 +34,10 @@ public interface Position extends EObject {
 	 * If the meaning of the '<em>X</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>X</em>' attribute.
 	 * @see #setX(int)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPosition_X()
-	 * @model unique="false" required="true" ordered="false"
+	 * @model unique="false" dataType="org.eclipse.papyrus.infra.core.sashwindows.di.int" required="true" ordered="false"
 	 * @generated
 	 */
 	int getX();
@@ -47,9 +46,7 @@ public interface Position extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Position#getX <em>X</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>X</em>' attribute.
+	 * @param value the new value of the '<em>X</em>' attribute.
 	 * @see #getX()
 	 * @generated
 	 */
@@ -62,7 +59,6 @@ public interface Position extends EObject {
 	 * If the meaning of the '<em>Y</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Y</em>' attribute.
 	 * @see #setY(int)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPosition_Y()
@@ -75,9 +71,7 @@ public interface Position extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Position#getY <em>Y</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Y</em>' attribute.
+	 * @param value the new value of the '<em>Y</em>' attribute.
 	 * @see #getY()
 	 * @generated
 	 */
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashModel.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashModel.java
index e7197bf24fb..c2eeae9d2e8 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashModel.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashModel.java
@@ -96,7 +96,7 @@ public interface SashModel extends EObject {
 	 * @model pageIdentifierDataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject" pageIdentifierRequired="true" pageIdentifierOrdered="false"
 	 * @generated
 	 */
-	public void removePageAndEmptyFolder(Object pageIdentifier);
+	void removePageAndEmptyFolder(Object pageIdentifier);
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -114,7 +114,7 @@ public interface SashModel extends EObject {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @model srcParentFolderRequired="true" srcParentFolderOrdered="false" srcIndexDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int" srcIndexRequired="true" srcIndexOrdered="false" targetParentFolderRequired="true" targetParentFolderOrdered="false" targetIndexRequired="true" targetIndexOrdered="false"
+	 * @model srcParentFolderRequired="true" srcParentFolderOrdered="false" srcIndexDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int" srcIndexRequired="true" srcIndexOrdered="false" targetParentFolderRequired="true" targetParentFolderOrdered="false" targetIndexDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int" targetIndexRequired="true" targetIndexOrdered="false"
 	 * @generated
 	 */
 	void movePage(TabFolder srcParentFolder, int srcIndex, TabFolder targetParentFolder, int targetIndex);
@@ -122,7 +122,7 @@ public interface SashModel extends EObject {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @model folderToInsertRequired="true" folderToInsertOrdered="false" refFolderRequired="true" refFolderOrdered="false" refFolderSideRequired="true" refFolderSideOrdered="false"
+	 * @model folderToInsertRequired="true" folderToInsertOrdered="false" refFolderRequired="true" refFolderOrdered="false" refFolderSideDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int" refFolderSideRequired="true" refFolderSideOrdered="false"
 	 * @generated
 	 */
 	void insertFolder(TabFolder folderToInsert, TabFolder refFolder, int refFolderSide);
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashPanel.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashPanel.java
index fcb37f58e54..07220ca7d94 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashPanel.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashPanel.java
@@ -11,15 +11,15 @@ package org.eclipse.papyrus.infra.core.sashwindows.di;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Sash Panel</b></em>'.
  * <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getSashPosition <em>Sash Position</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getDirection <em>Direction</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getSashPosition <em>Sash Position</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getDirection <em>Direction</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashPanel()
  * @model
  * @generated
@@ -33,7 +33,6 @@ public interface SashPanel extends AbstractPanel, PanelParent {
 	 * <!-- begin-model-doc -->
 	 * Position of the sash in the panel. The position is in percent. The value should be between 0 and 100.
 	 * <!-- end-model-doc -->
-	 * 
 	 * @return the value of the '<em>Sash Position</em>' attribute.
 	 * @see #setSashPosition(float)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashPanel_SashPosition()
@@ -46,9 +45,7 @@ public interface SashPanel extends AbstractPanel, PanelParent {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getSashPosition <em>Sash Position</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Sash Position</em>' attribute.
+	 * @param value the new value of the '<em>Sash Position</em>' attribute.
 	 * @see #getSashPosition()
 	 * @generated
 	 */
@@ -61,11 +58,10 @@ public interface SashPanel extends AbstractPanel, PanelParent {
 	 * If the meaning of the '<em>Direction</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Direction</em>' attribute.
 	 * @see #setDirection(int)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashPanel_Direction()
-	 * @model unique="false" required="true" ordered="false"
+	 * @model unique="false" dataType="org.eclipse.papyrus.infra.core.sashwindows.di.int" required="true" ordered="false"
 	 * @generated
 	 */
 	int getDirection();
@@ -74,9 +70,7 @@ public interface SashPanel extends AbstractPanel, PanelParent {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getDirection <em>Direction</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Direction</em>' attribute.
+	 * @param value the new value of the '<em>Direction</em>' attribute.
 	 * @see #getDirection()
 	 * @generated
 	 */
@@ -85,9 +79,7 @@ public interface SashPanel extends AbstractPanel, PanelParent {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @model leftChildRequired="true" leftChildOrdered="false" rightChildRequired="true" rightChildOrdered="false"
-	 *        directionDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int" directionRequired="true" directionOrdered="false"
+	 * @model leftChildRequired="true" leftChildOrdered="false" rightChildRequired="true" rightChildOrdered="false" directionDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int" directionRequired="true" directionOrdered="false"
 	 * @generated
 	 */
 	void setChildren(AbstractPanel leftChild, AbstractPanel rightChild, int direction);
@@ -95,7 +87,6 @@ public interface SashPanel extends AbstractPanel, PanelParent {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @model childToDeleteRequired="true" childToDeleteOrdered="false"
 	 * @generated
 	 */
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashWindowsMngr.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashWindowsMngr.java
index b4bc44a6e49..6ae1be2b259 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashWindowsMngr.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashWindowsMngr.java
@@ -12,15 +12,15 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Sash Windows Mngr</b></em>'.
  * <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getPageList <em>Page List</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getSashModel <em>Sash Model</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getPageList <em>Page List</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getSashModel <em>Sash Model</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashWindowsMngr()
  * @model
  * @generated
@@ -34,7 +34,6 @@ public interface SashWindowsMngr extends EObject {
 	 * If the meaning of the '<em>Page List</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Page List</em>' containment reference.
 	 * @see #setPageList(PageList)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashWindowsMngr_PageList()
@@ -47,9 +46,7 @@ public interface SashWindowsMngr extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getPageList <em>Page List</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Page List</em>' containment reference.
+	 * @param value the new value of the '<em>Page List</em>' containment reference.
 	 * @see #getPageList()
 	 * @generated
 	 */
@@ -62,7 +59,6 @@ public interface SashWindowsMngr extends EObject {
 	 * If the meaning of the '<em>Sash Model</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Sash Model</em>' containment reference.
 	 * @see #setSashModel(SashModel)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashWindowsMngr_SashModel()
@@ -75,9 +71,7 @@ public interface SashWindowsMngr extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getSashModel <em>Sash Model</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Sash Model</em>' containment reference.
+	 * @param value the new value of the '<em>Sash Model</em>' containment reference.
 	 * @see #getSashModel()
 	 * @generated
 	 */
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Size.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Size.java
index 4bfcc365874..72b26a68fc7 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Size.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Size.java
@@ -12,15 +12,15 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Size</b></em>'.
  * <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Size#getWidth <em>Width</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Size#getLength <em>Length</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Size#getWidth <em>Width</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Size#getLength <em>Length</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSize()
  * @model
  * @generated
@@ -34,7 +34,6 @@ public interface Size extends EObject {
 	 * If the meaning of the '<em>Width</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Width</em>' attribute.
 	 * @see #setWidth(int)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSize_Width()
@@ -47,9 +46,7 @@ public interface Size extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Size#getWidth <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Width</em>' attribute.
+	 * @param value the new value of the '<em>Width</em>' attribute.
 	 * @see #getWidth()
 	 * @generated
 	 */
@@ -62,7 +59,6 @@ public interface Size extends EObject {
 	 * If the meaning of the '<em>Length</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Length</em>' attribute.
 	 * @see #setLength(int)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSize_Length()
@@ -75,9 +71,7 @@ public interface Size extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Size#getLength <em>Length</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Length</em>' attribute.
+	 * @param value the new value of the '<em>Length</em>' attribute.
 	 * @see #getLength()
 	 * @generated
 	 */
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/TabFolder.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/TabFolder.java
index 37f80d7b340..07ff293f8e5 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/TabFolder.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/TabFolder.java
@@ -12,14 +12,14 @@ import org.eclipse.emf.common.util.EList;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Tab Folder</b></em>'.
  * <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#getChildren <em>Children</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#getChildren <em>Children</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getTabFolder()
  * @model
  * @generated
@@ -35,7 +35,6 @@ public interface TabFolder extends AbstractPanel {
 	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Children</em>' containment reference list.
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getTabFolder_Children()
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getParent
@@ -47,9 +46,7 @@ public interface TabFolder extends AbstractPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @model oldIndexRequired="true" oldIndexOrdered="false" newIndexDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int" newIndexRequired="true"
-	 *        newIndexOrdered="false"
+	 * @model oldIndexDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int" oldIndexRequired="true" oldIndexOrdered="false" newIndexDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int" newIndexRequired="true" newIndexOrdered="false"
 	 * @generated
 	 */
 	void movePage(int oldIndex, int newIndex);
@@ -57,7 +54,6 @@ public interface TabFolder extends AbstractPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @model pageIdentifierDataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject" pageIdentifierRequired="true" pageIdentifierOrdered="false"
 	 * @generated
 	 */
@@ -66,7 +62,6 @@ public interface TabFolder extends AbstractPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @model pageIndexDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int" pageIndexRequired="true" pageIndexOrdered="false"
 	 * @generated
 	 */
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Window.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Window.java
index 17d0cec9c0f..8bac5dda3fb 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Window.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Window.java
@@ -11,16 +11,16 @@ package org.eclipse.papyrus.infra.core.sashwindows.di;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Window</b></em>'.
  * <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPosition <em>Position</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getSize <em>Size</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPanel <em>Panel</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPosition <em>Position</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getSize <em>Size</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPanel <em>Panel</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getWindow()
  * @model
  * @generated
@@ -34,7 +34,6 @@ public interface Window extends PanelParent {
 	 * If the meaning of the '<em>Position</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Position</em>' reference.
 	 * @see #setPosition(Position)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getWindow_Position()
@@ -47,9 +46,7 @@ public interface Window extends PanelParent {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPosition <em>Position</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Position</em>' reference.
+	 * @param value the new value of the '<em>Position</em>' reference.
 	 * @see #getPosition()
 	 * @generated
 	 */
@@ -62,7 +59,6 @@ public interface Window extends PanelParent {
 	 * If the meaning of the '<em>Size</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the value of the '<em>Size</em>' reference.
 	 * @see #setSize(Size)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getWindow_Size()
@@ -75,9 +71,7 @@ public interface Window extends PanelParent {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getSize <em>Size</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Size</em>' reference.
+	 * @param value the new value of the '<em>Size</em>' reference.
 	 * @see #getSize()
 	 * @generated
 	 */
@@ -90,7 +84,6 @@ public interface Window extends PanelParent {
 	 * <!-- begin-model-doc -->
 	 * Redefine children.
 	 * <!-- end-model-doc -->
-	 * 
 	 * @return the value of the '<em>Panel</em>' reference.
 	 * @see #setPanel(AbstractPanel)
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getWindow_Panel()
@@ -103,9 +96,7 @@ public interface Window extends PanelParent {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPanel <em>Panel</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *        the new value of the '<em>Panel</em>' reference.
+	 * @param value the new value of the '<em>Panel</em>' reference.
 	 * @see #getPanel()
 	 * @generated
 	 */
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPageImpl.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPageImpl.java
index b1506ee5091..a52ef60f3f3 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPageImpl.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPageImpl.java
@@ -20,10 +20,10 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPageImpl#getPageIdentifier <em>Page Identifier</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPageImpl#getPageIdentifier <em>Page Identifier</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class AbstractPageImpl extends EObjectImpl implements AbstractPage {
@@ -32,7 +32,6 @@ public class AbstractPageImpl extends EObjectImpl implements AbstractPage {
 	 * The default value of the '{@link #getPageIdentifier() <em>Page Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getPageIdentifier()
 	 * @generated
 	 * @ordered
@@ -43,7 +42,6 @@ public class AbstractPageImpl extends EObjectImpl implements AbstractPage {
 	 * The cached value of the '{@link #getPageIdentifier() <em>Page Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getPageIdentifier()
 	 * @generated
 	 * @ordered
@@ -53,7 +51,6 @@ public class AbstractPageImpl extends EObjectImpl implements AbstractPage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected AbstractPageImpl() {
@@ -63,7 +60,6 @@ public class AbstractPageImpl extends EObjectImpl implements AbstractPage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,7 +70,6 @@ public class AbstractPageImpl extends EObjectImpl implements AbstractPage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Object getPageIdentifier() {
@@ -84,27 +79,25 @@ public class AbstractPageImpl extends EObjectImpl implements AbstractPage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setPageIdentifier(Object newPageIdentifier) {
 		Object oldPageIdentifier = pageIdentifier;
 		pageIdentifier = newPageIdentifier;
-		if(eNotificationRequired())
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.ABSTRACT_PAGE__PAGE_IDENTIFIER, oldPageIdentifier, pageIdentifier));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch(featureID) {
-		case DiPackage.ABSTRACT_PAGE__PAGE_IDENTIFIER:
-			return getPageIdentifier();
+		switch (featureID) {
+			case DiPackage.ABSTRACT_PAGE__PAGE_IDENTIFIER:
+				return getPageIdentifier();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -112,15 +105,14 @@ public class AbstractPageImpl extends EObjectImpl implements AbstractPage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch(featureID) {
-		case DiPackage.ABSTRACT_PAGE__PAGE_IDENTIFIER:
-			setPageIdentifier(newValue);
-			return;
+		switch (featureID) {
+			case DiPackage.ABSTRACT_PAGE__PAGE_IDENTIFIER:
+				setPageIdentifier(newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -128,15 +120,14 @@ public class AbstractPageImpl extends EObjectImpl implements AbstractPage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch(featureID) {
-		case DiPackage.ABSTRACT_PAGE__PAGE_IDENTIFIER:
-			setPageIdentifier(PAGE_IDENTIFIER_EDEFAULT);
-			return;
+		switch (featureID) {
+			case DiPackage.ABSTRACT_PAGE__PAGE_IDENTIFIER:
+				setPageIdentifier(PAGE_IDENTIFIER_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -144,14 +135,13 @@ public class AbstractPageImpl extends EObjectImpl implements AbstractPage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch(featureID) {
-		case DiPackage.ABSTRACT_PAGE__PAGE_IDENTIFIER:
-			return PAGE_IDENTIFIER_EDEFAULT == null ? pageIdentifier != null : !PAGE_IDENTIFIER_EDEFAULT.equals(pageIdentifier);
+		switch (featureID) {
+			case DiPackage.ABSTRACT_PAGE__PAGE_IDENTIFIER:
+				return PAGE_IDENTIFIER_EDEFAULT == null ? pageIdentifier != null : !PAGE_IDENTIFIER_EDEFAULT.equals(pageIdentifier);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -159,13 +149,11 @@ public class AbstractPageImpl extends EObjectImpl implements AbstractPage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if(eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (pageIdentifier: ");
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPanelImpl.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPanelImpl.java
index 45955d84f2e..d281ce38fd4 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPanelImpl.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPanelImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPanelImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPanelImpl#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class AbstractPanelImpl extends EObjectImpl implements AbstractPanel {
@@ -35,7 +35,6 @@ public abstract class AbstractPanelImpl extends EObjectImpl implements AbstractP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected AbstractPanelImpl() {
@@ -45,7 +44,6 @@ public abstract class AbstractPanelImpl extends EObjectImpl implements AbstractP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -56,19 +54,16 @@ public abstract class AbstractPanelImpl extends EObjectImpl implements AbstractP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public PanelParent getParent() {
-		if(eContainerFeatureID() != DiPackage.ABSTRACT_PANEL__PARENT)
-			return null;
-		return (PanelParent)eContainer();
+		if (eContainerFeatureID() != DiPackage.ABSTRACT_PANEL__PARENT) return null;
+		return (PanelParent)eInternalContainer();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetParent(PanelParent newParent, NotificationChain msgs) {
@@ -79,38 +74,36 @@ public abstract class AbstractPanelImpl extends EObjectImpl implements AbstractP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setParent(PanelParent newParent) {
-		if(newParent != eInternalContainer() || (eContainerFeatureID() != DiPackage.ABSTRACT_PANEL__PARENT && newParent != null)) {
-			if(EcoreUtil.isAncestor(this, newParent))
+		if (newParent != eInternalContainer() || (eContainerFeatureID() != DiPackage.ABSTRACT_PANEL__PARENT && newParent != null)) {
+			if (EcoreUtil.isAncestor(this, newParent))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if(eInternalContainer() != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
-			if(newParent != null)
+			if (newParent != null)
 				msgs = ((InternalEObject)newParent).eInverseAdd(this, DiPackage.PANEL_PARENT__CHILDREN, PanelParent.class, msgs);
 			msgs = basicSetParent(newParent, msgs);
-			if(msgs != null)
-				msgs.dispatch();
-		} else if(eNotificationRequired())
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.ABSTRACT_PANEL__PARENT, newParent, newParent));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch(featureID) {
-		case DiPackage.ABSTRACT_PANEL__PARENT:
-			if(eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetParent((PanelParent)otherEnd, msgs);
+		switch (featureID) {
+			case DiPackage.ABSTRACT_PANEL__PARENT:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetParent((PanelParent)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -118,14 +111,13 @@ public abstract class AbstractPanelImpl extends EObjectImpl implements AbstractP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch(featureID) {
-		case DiPackage.ABSTRACT_PANEL__PARENT:
-			return basicSetParent(null, msgs);
+		switch (featureID) {
+			case DiPackage.ABSTRACT_PANEL__PARENT:
+				return basicSetParent(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -133,14 +125,13 @@ public abstract class AbstractPanelImpl extends EObjectImpl implements AbstractP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch(eContainerFeatureID()) {
-		case DiPackage.ABSTRACT_PANEL__PARENT:
-			return eInternalContainer().eInverseRemove(this, DiPackage.PANEL_PARENT__CHILDREN, PanelParent.class, msgs);
+		switch (eContainerFeatureID()) {
+			case DiPackage.ABSTRACT_PANEL__PARENT:
+				return eInternalContainer().eInverseRemove(this, DiPackage.PANEL_PARENT__CHILDREN, PanelParent.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
@@ -148,14 +139,13 @@ public abstract class AbstractPanelImpl extends EObjectImpl implements AbstractP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch(featureID) {
-		case DiPackage.ABSTRACT_PANEL__PARENT:
-			return getParent();
+		switch (featureID) {
+			case DiPackage.ABSTRACT_PANEL__PARENT:
+				return getParent();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -163,15 +153,14 @@ public abstract class AbstractPanelImpl extends EObjectImpl implements AbstractP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch(featureID) {
-		case DiPackage.ABSTRACT_PANEL__PARENT:
-			setParent((PanelParent)newValue);
-			return;
+		switch (featureID) {
+			case DiPackage.ABSTRACT_PANEL__PARENT:
+				setParent((PanelParent)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -179,15 +168,14 @@ public abstract class AbstractPanelImpl extends EObjectImpl implements AbstractP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch(featureID) {
-		case DiPackage.ABSTRACT_PANEL__PARENT:
-			setParent((PanelParent)null);
-			return;
+		switch (featureID) {
+			case DiPackage.ABSTRACT_PANEL__PARENT:
+				setParent((PanelParent)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -195,14 +183,13 @@ public abstract class AbstractPanelImpl extends EObjectImpl implements AbstractP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch(featureID) {
-		case DiPackage.ABSTRACT_PANEL__PARENT:
-			return getParent() != null;
+		switch (featureID) {
+			case DiPackage.ABSTRACT_PANEL__PARENT:
+				return getParent() != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiFactoryImpl.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiFactoryImpl.java
index 1e18d0dbeb6..722a16dabd8 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiFactoryImpl.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiFactoryImpl.java
@@ -12,6 +12,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.core.sashwindows.di.*;
 import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage;
 import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;
 import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
@@ -97,10 +98,10 @@ public class DiFactoryImpl extends EFactoryImpl implements DiFactory {
 				return createintFromString(eDataType, initialValue);
 			case DiPackage.JAVA_OBJECT:
 				return createJavaObjectFromString(eDataType, initialValue);
-			case DiPackage.FLOAT:
-				return createFloatFromString(eDataType, initialValue);
 			case DiPackage.BOOLEAN:
 				return createbooleanFromString(eDataType, initialValue);
+			case DiPackage.FLOAT:
+				return createFloatFromString(eDataType, initialValue);
 			default:
 				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
@@ -118,10 +119,10 @@ public class DiFactoryImpl extends EFactoryImpl implements DiFactory {
 				return convertintToString(eDataType, instanceValue);
 			case DiPackage.JAVA_OBJECT:
 				return convertJavaObjectToString(eDataType, instanceValue);
-			case DiPackage.FLOAT:
-				return convertFloatToString(eDataType, instanceValue);
 			case DiPackage.BOOLEAN:
 				return convertbooleanToString(eDataType, instanceValue);
+			case DiPackage.FLOAT:
+				return convertFloatToString(eDataType, instanceValue);
 			default:
 				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java
index f74506c24c1..b2ae54505de 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java
@@ -630,8 +630,8 @@ public class DiPackageImpl extends EPackageImpl implements DiPackage {
 		// Create data types
 		intEDataType = createEDataType(INT);
 		javaObjectEDataType = createEDataType(JAVA_OBJECT);
-		floatEDataType = createEDataType(FLOAT);
 		booleanEDataType = createEDataType(BOOLEAN);
+		floatEDataType = createEDataType(FLOAT);
 	}
 
 	/**
@@ -688,12 +688,12 @@ public class DiPackageImpl extends EPackageImpl implements DiPackage {
 		addEParameter(op, this.getTabFolder(), "srcParentFolder", 1, 1, IS_UNIQUE, !IS_ORDERED);
 		addEParameter(op, this.getint(), "srcIndex", 1, 1, IS_UNIQUE, !IS_ORDERED);
 		addEParameter(op, this.getTabFolder(), "targetParentFolder", 1, 1, IS_UNIQUE, !IS_ORDERED);
-		addEParameter(op, ecorePackage.getEInt(), "targetIndex", 1, 1, IS_UNIQUE, !IS_ORDERED);
+		addEParameter(op, this.getint(), "targetIndex", 1, 1, IS_UNIQUE, !IS_ORDERED);
 
 		op = addEOperation(sashModelEClass, null, "insertFolder", 1, 1, IS_UNIQUE, !IS_ORDERED);
 		addEParameter(op, this.getTabFolder(), "folderToInsert", 1, 1, IS_UNIQUE, !IS_ORDERED);
 		addEParameter(op, this.getTabFolder(), "refFolder", 1, 1, IS_UNIQUE, !IS_ORDERED);
-		addEParameter(op, ecorePackage.getEInt(), "refFolderSide", 1, 1, IS_UNIQUE, !IS_ORDERED);
+		addEParameter(op, this.getint(), "refFolderSide", 1, 1, IS_UNIQUE, !IS_ORDERED);
 
 		op = addEOperation(sashModelEClass, null, "movePage", 1, 1, IS_UNIQUE, !IS_ORDERED);
 		addEParameter(op, this.getTabFolder(), "srcParentFolder", 1, 1, IS_UNIQUE, !IS_ORDERED);
@@ -712,6 +712,9 @@ public class DiPackageImpl extends EPackageImpl implements DiPackage {
 
 		addEOperation(sashModelEClass, this.getTabFolder(), "lookupFirstFolder", 1, 1, IS_UNIQUE, !IS_ORDERED);
 
+		op = addEOperation(sashModelEClass, null, "removePageAndEmptyFolder", 1, 1, IS_UNIQUE, !IS_ORDERED);
+		addEParameter(op, this.getJavaObject(), "pageIdentifier", 1, 1, IS_UNIQUE, !IS_ORDERED);
+
 		initEClass(windowEClass, Window.class, "Window", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getWindow_Position(), this.getPosition(), null, "position", null, 1, 1, Window.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getWindow_Size(), this.getSize(), null, "size", null, 1, 1, Window.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -728,7 +731,7 @@ public class DiPackageImpl extends EPackageImpl implements DiPackage {
 		initEReference(getAbstractPanel_Parent(), this.getPanelParent(), this.getPanelParent_Children(), "parent", null, 1, 1, AbstractPanel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(positionEClass, Position.class, "Position", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPosition_X(), ecorePackage.getEInt(), "x", null, 1, 1, Position.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getPosition_X(), this.getint(), "x", null, 1, 1, Position.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getPosition_Y(), this.getint(), "y", null, 1, 1, Position.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(sizeEClass, Size.class, "Size", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -739,7 +742,7 @@ public class DiPackageImpl extends EPackageImpl implements DiPackage {
 		initEReference(getTabFolder_Children(), this.getPageRef(), this.getPageRef_Parent(), "children", null, 0, -1, TabFolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		op = addEOperation(tabFolderEClass, null, "movePage", 1, 1, IS_UNIQUE, !IS_ORDERED);
-		addEParameter(op, ecorePackage.getEInt(), "oldIndex", 1, 1, IS_UNIQUE, !IS_ORDERED);
+		addEParameter(op, this.getint(), "oldIndex", 1, 1, IS_UNIQUE, !IS_ORDERED);
 		addEParameter(op, this.getint(), "newIndex", 1, 1, IS_UNIQUE, !IS_ORDERED);
 
 		op = addEOperation(tabFolderEClass, null, "addPage", 1, 1, IS_UNIQUE, !IS_ORDERED);
@@ -752,14 +755,14 @@ public class DiPackageImpl extends EPackageImpl implements DiPackage {
 		initEReference(getPageRef_EmfPageIdentifier(), theEcorePackage.getEObject(), null, "emfPageIdentifier", null, 1, 1, PageRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getPageRef_PageIdentifier(), this.getJavaObject(), "pageIdentifier", null, 1, 1, PageRef.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getPageRef_ObjectPageIdentifier(), this.getJavaObject(), "objectPageIdentifier", null, 1, 1, PageRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getPageRef_Parent(), this.getTabFolder(), this.getTabFolder_Children(), "parent", null, 1, 1, PageRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getPageRef_Parent(), this.getTabFolder(), this.getTabFolder_Children(), "parent", null, 0, 1, PageRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
-		op = addEOperation(pageRefEClass, ecorePackage.getEBoolean(), "isForIdentifier", 1, 1, IS_UNIQUE, !IS_ORDERED);
+		op = addEOperation(pageRefEClass, this.getboolean(), "isForIdentifier", 1, 1, IS_UNIQUE, !IS_ORDERED);
 		addEParameter(op, this.getJavaObject(), "pageIdentifier", 1, 1, IS_UNIQUE, !IS_ORDERED);
 
 		initEClass(sashPanelEClass, SashPanel.class, "SashPanel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getSashPanel_SashPosition(), this.getFloat(), "sashPosition", null, 1, 1, SashPanel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getSashPanel_Direction(), ecorePackage.getEInt(), "direction", null, 1, 1, SashPanel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getSashPanel_Direction(), this.getint(), "direction", null, 1, 1, SashPanel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		op = addEOperation(sashPanelEClass, null, "setChildren", 1, 1, IS_UNIQUE, !IS_ORDERED);
 		addEParameter(op, this.getAbstractPanel(), "leftChild", 1, 1, IS_UNIQUE, !IS_ORDERED);
@@ -788,8 +791,8 @@ public class DiPackageImpl extends EPackageImpl implements DiPackage {
 		// Initialize data types
 		initEDataType(intEDataType, int.class, "int", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 		initEDataType(javaObjectEDataType, Object.class, "JavaObject", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(floatEDataType, float.class, "Float", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 		initEDataType(booleanEDataType, boolean.class, "boolean", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(floatEDataType, float.class, "Float", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 
 		// Create resource
 		createResource(eNS_URI);
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageListImpl.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageListImpl.java
index 59ae86c8507..73c33ea8d8d 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageListImpl.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageListImpl.java
@@ -27,10 +27,10 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageListImpl#getAvailablePage <em>Available Page</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageListImpl#getAvailablePage <em>Available Page</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class PageListImpl extends EObjectImpl implements PageList {
@@ -39,7 +39,6 @@ public class PageListImpl extends EObjectImpl implements PageList {
 	 * The cached value of the '{@link #getAvailablePage() <em>Available Page</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getAvailablePage()
 	 * @generated
 	 * @ordered
@@ -49,7 +48,6 @@ public class PageListImpl extends EObjectImpl implements PageList {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected PageListImpl() {
@@ -59,7 +57,6 @@ public class PageListImpl extends EObjectImpl implements PageList {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -70,11 +67,10 @@ public class PageListImpl extends EObjectImpl implements PageList {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<PageRef> getAvailablePage() {
-		if(availablePage == null) {
+		if (availablePage == null) {
 			availablePage = new EObjectContainmentEList<PageRef>(PageRef.class, this, DiPackage.PAGE_LIST__AVAILABLE_PAGE);
 		}
 		return availablePage;
@@ -113,14 +109,13 @@ public class PageListImpl extends EObjectImpl implements PageList {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch(featureID) {
-		case DiPackage.PAGE_LIST__AVAILABLE_PAGE:
-			return ((InternalEList<?>)getAvailablePage()).basicRemove(otherEnd, msgs);
+		switch (featureID) {
+			case DiPackage.PAGE_LIST__AVAILABLE_PAGE:
+				return ((InternalEList<?>)getAvailablePage()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -128,14 +123,13 @@ public class PageListImpl extends EObjectImpl implements PageList {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch(featureID) {
-		case DiPackage.PAGE_LIST__AVAILABLE_PAGE:
-			return getAvailablePage();
+		switch (featureID) {
+			case DiPackage.PAGE_LIST__AVAILABLE_PAGE:
+				return getAvailablePage();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -143,17 +137,16 @@ public class PageListImpl extends EObjectImpl implements PageList {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch(featureID) {
-		case DiPackage.PAGE_LIST__AVAILABLE_PAGE:
-			getAvailablePage().clear();
-			getAvailablePage().addAll((Collection<? extends PageRef>)newValue);
-			return;
+		switch (featureID) {
+			case DiPackage.PAGE_LIST__AVAILABLE_PAGE:
+				getAvailablePage().clear();
+				getAvailablePage().addAll((Collection<? extends PageRef>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -161,15 +154,14 @@ public class PageListImpl extends EObjectImpl implements PageList {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch(featureID) {
-		case DiPackage.PAGE_LIST__AVAILABLE_PAGE:
-			getAvailablePage().clear();
-			return;
+		switch (featureID) {
+			case DiPackage.PAGE_LIST__AVAILABLE_PAGE:
+				getAvailablePage().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -177,14 +169,13 @@ public class PageListImpl extends EObjectImpl implements PageList {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch(featureID) {
-		case DiPackage.PAGE_LIST__AVAILABLE_PAGE:
-			return availablePage != null && !availablePage.isEmpty();
+		switch (featureID) {
+			case DiPackage.PAGE_LIST__AVAILABLE_PAGE:
+				return availablePage != null && !availablePage.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java
index 18e00d10296..fc4530eb71a 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java
@@ -25,13 +25,13 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getEmfPageIdentifier <em>Emf Page Identifier</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getPageIdentifier <em>Page Identifier</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getObjectPageIdentifier <em>Object Page Identifier</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getEmfPageIdentifier <em>Emf Page Identifier</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getPageIdentifier <em>Page Identifier</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getObjectPageIdentifier <em>Object Page Identifier</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class PageRefImpl extends EObjectImpl implements PageRef {
@@ -40,7 +40,6 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	 * The cached value of the '{@link #getEmfPageIdentifier() <em>Emf Page Identifier</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getEmfPageIdentifier()
 	 * @generated
 	 * @ordered
@@ -51,7 +50,6 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	 * The default value of the '{@link #getPageIdentifier() <em>Page Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getPageIdentifier()
 	 * @generated
 	 * @ordered
@@ -62,7 +60,6 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	 * The default value of the '{@link #getObjectPageIdentifier() <em>Object Page Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getObjectPageIdentifier()
 	 * @generated
 	 * @ordered
@@ -73,7 +70,6 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	 * The cached value of the '{@link #getObjectPageIdentifier() <em>Object Page Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getObjectPageIdentifier()
 	 * @generated
 	 * @ordered
@@ -83,7 +79,6 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected PageRefImpl() {
@@ -93,7 +88,6 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -104,15 +98,14 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EObject getEmfPageIdentifier() {
-		if(emfPageIdentifier != null && emfPageIdentifier.eIsProxy()) {
+		if (emfPageIdentifier != null && emfPageIdentifier.eIsProxy()) {
 			InternalEObject oldEmfPageIdentifier = (InternalEObject)emfPageIdentifier;
 			emfPageIdentifier = eResolveProxy(oldEmfPageIdentifier);
-			if(emfPageIdentifier != oldEmfPageIdentifier) {
-				if(eNotificationRequired())
+			if (emfPageIdentifier != oldEmfPageIdentifier) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DiPackage.PAGE_REF__EMF_PAGE_IDENTIFIER, oldEmfPageIdentifier, emfPageIdentifier));
 			}
 		}
@@ -122,7 +115,6 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EObject basicGetEmfPageIdentifier() {
@@ -132,13 +124,12 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setEmfPageIdentifier(EObject newEmfPageIdentifier) {
 		EObject oldEmfPageIdentifier = emfPageIdentifier;
 		emfPageIdentifier = newEmfPageIdentifier;
-		if(eNotificationRequired())
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.PAGE_REF__EMF_PAGE_IDENTIFIER, oldEmfPageIdentifier, emfPageIdentifier));
 	}
 
@@ -170,16 +161,15 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch(featureID) {
-		case DiPackage.PAGE_REF__PARENT:
-			if(eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetParent((TabFolder)otherEnd, msgs);
+		switch (featureID) {
+			case DiPackage.PAGE_REF__PARENT:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetParent((TabFolder)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -187,14 +177,13 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch(featureID) {
-		case DiPackage.PAGE_REF__PARENT:
-			return basicSetParent(null, msgs);
+		switch (featureID) {
+			case DiPackage.PAGE_REF__PARENT:
+				return basicSetParent(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -202,14 +191,13 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch(eContainerFeatureID()) {
-		case DiPackage.PAGE_REF__PARENT:
-			return eInternalContainer().eInverseRemove(this, DiPackage.TAB_FOLDER__CHILDREN, TabFolder.class, msgs);
+		switch (eContainerFeatureID()) {
+			case DiPackage.PAGE_REF__PARENT:
+				return eInternalContainer().eInverseRemove(this, DiPackage.TAB_FOLDER__CHILDREN, TabFolder.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
@@ -217,22 +205,20 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch(featureID) {
-		case DiPackage.PAGE_REF__EMF_PAGE_IDENTIFIER:
-			if(resolve)
-				return getEmfPageIdentifier();
-			return basicGetEmfPageIdentifier();
-		case DiPackage.PAGE_REF__PAGE_IDENTIFIER:
-			return getPageIdentifier();
-		case DiPackage.PAGE_REF__OBJECT_PAGE_IDENTIFIER:
-			return getObjectPageIdentifier();
-		case DiPackage.PAGE_REF__PARENT:
-			return getParent();
+		switch (featureID) {
+			case DiPackage.PAGE_REF__EMF_PAGE_IDENTIFIER:
+				if (resolve) return getEmfPageIdentifier();
+				return basicGetEmfPageIdentifier();
+			case DiPackage.PAGE_REF__PAGE_IDENTIFIER:
+				return getPageIdentifier();
+			case DiPackage.PAGE_REF__OBJECT_PAGE_IDENTIFIER:
+				return getObjectPageIdentifier();
+			case DiPackage.PAGE_REF__PARENT:
+				return getParent();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -240,24 +226,23 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch(featureID) {
-		case DiPackage.PAGE_REF__EMF_PAGE_IDENTIFIER:
-			setEmfPageIdentifier((EObject)newValue);
-			return;
-		case DiPackage.PAGE_REF__PAGE_IDENTIFIER:
-			setPageIdentifier(newValue);
-			return;
-		case DiPackage.PAGE_REF__OBJECT_PAGE_IDENTIFIER:
-			setObjectPageIdentifier(newValue);
-			return;
-		case DiPackage.PAGE_REF__PARENT:
-			setParent((TabFolder)newValue);
-			return;
+		switch (featureID) {
+			case DiPackage.PAGE_REF__EMF_PAGE_IDENTIFIER:
+				setEmfPageIdentifier((EObject)newValue);
+				return;
+			case DiPackage.PAGE_REF__PAGE_IDENTIFIER:
+				setPageIdentifier(newValue);
+				return;
+			case DiPackage.PAGE_REF__OBJECT_PAGE_IDENTIFIER:
+				setObjectPageIdentifier(newValue);
+				return;
+			case DiPackage.PAGE_REF__PARENT:
+				setParent((TabFolder)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -265,24 +250,23 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch(featureID) {
-		case DiPackage.PAGE_REF__EMF_PAGE_IDENTIFIER:
-			setEmfPageIdentifier((EObject)null);
-			return;
-		case DiPackage.PAGE_REF__PAGE_IDENTIFIER:
-			setPageIdentifier(PAGE_IDENTIFIER_EDEFAULT);
-			return;
-		case DiPackage.PAGE_REF__OBJECT_PAGE_IDENTIFIER:
-			setObjectPageIdentifier(OBJECT_PAGE_IDENTIFIER_EDEFAULT);
-			return;
-		case DiPackage.PAGE_REF__PARENT:
-			setParent((TabFolder)null);
-			return;
+		switch (featureID) {
+			case DiPackage.PAGE_REF__EMF_PAGE_IDENTIFIER:
+				setEmfPageIdentifier((EObject)null);
+				return;
+			case DiPackage.PAGE_REF__PAGE_IDENTIFIER:
+				setPageIdentifier(PAGE_IDENTIFIER_EDEFAULT);
+				return;
+			case DiPackage.PAGE_REF__OBJECT_PAGE_IDENTIFIER:
+				setObjectPageIdentifier(OBJECT_PAGE_IDENTIFIER_EDEFAULT);
+				return;
+			case DiPackage.PAGE_REF__PARENT:
+				setParent((TabFolder)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -290,20 +274,19 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch(featureID) {
-		case DiPackage.PAGE_REF__EMF_PAGE_IDENTIFIER:
-			return emfPageIdentifier != null;
-		case DiPackage.PAGE_REF__PAGE_IDENTIFIER:
-			return PAGE_IDENTIFIER_EDEFAULT == null ? getPageIdentifier() != null : !PAGE_IDENTIFIER_EDEFAULT.equals(getPageIdentifier());
-		case DiPackage.PAGE_REF__OBJECT_PAGE_IDENTIFIER:
-			return OBJECT_PAGE_IDENTIFIER_EDEFAULT == null ? objectPageIdentifier != null : !OBJECT_PAGE_IDENTIFIER_EDEFAULT.equals(objectPageIdentifier);
-		case DiPackage.PAGE_REF__PARENT:
-			return getParent() != null;
+		switch (featureID) {
+			case DiPackage.PAGE_REF__EMF_PAGE_IDENTIFIER:
+				return emfPageIdentifier != null;
+			case DiPackage.PAGE_REF__PAGE_IDENTIFIER:
+				return PAGE_IDENTIFIER_EDEFAULT == null ? getPageIdentifier() != null : !PAGE_IDENTIFIER_EDEFAULT.equals(getPageIdentifier());
+			case DiPackage.PAGE_REF__OBJECT_PAGE_IDENTIFIER:
+				return OBJECT_PAGE_IDENTIFIER_EDEFAULT == null ? objectPageIdentifier != null : !OBJECT_PAGE_IDENTIFIER_EDEFAULT.equals(objectPageIdentifier);
+			case DiPackage.PAGE_REF__PARENT:
+				return getParent() != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -311,13 +294,11 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if(eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (objectPageIdentifier: ");
@@ -352,7 +333,6 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Object getObjectPageIdentifier() {
@@ -362,32 +342,28 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setObjectPageIdentifier(Object newObjectPageIdentifier) {
 		Object oldObjectPageIdentifier = objectPageIdentifier;
 		objectPageIdentifier = newObjectPageIdentifier;
-		if(eNotificationRequired())
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.PAGE_REF__OBJECT_PAGE_IDENTIFIER, oldObjectPageIdentifier, objectPageIdentifier));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public TabFolder getParent() {
-		if(eContainerFeatureID() != DiPackage.PAGE_REF__PARENT)
-			return null;
-		return (TabFolder)eContainer();
+		if (eContainerFeatureID() != DiPackage.PAGE_REF__PARENT) return null;
+		return (TabFolder)eInternalContainer();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetParent(TabFolder newParent, NotificationChain msgs) {
@@ -398,22 +374,21 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setParent(TabFolder newParent) {
-		if(newParent != eInternalContainer() || (eContainerFeatureID() != DiPackage.PAGE_REF__PARENT && newParent != null)) {
-			if(EcoreUtil.isAncestor(this, newParent))
+		if (newParent != eInternalContainer() || (eContainerFeatureID() != DiPackage.PAGE_REF__PARENT && newParent != null)) {
+			if (EcoreUtil.isAncestor(this, newParent))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if(eInternalContainer() != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
-			if(newParent != null)
+			if (newParent != null)
 				msgs = ((InternalEObject)newParent).eInverseAdd(this, DiPackage.TAB_FOLDER__CHILDREN, TabFolder.class, msgs);
 			msgs = basicSetParent(newParent, msgs);
-			if(msgs != null)
-				msgs.dispatch();
-		} else if(eNotificationRequired())
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.PAGE_REF__PARENT, newParent, newParent));
 	}
 
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PanelParentImpl.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PanelParentImpl.java
index b1853fd8f40..a5d66528f05 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PanelParentImpl.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PanelParentImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PanelParentImpl#getChildren <em>Children</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PanelParentImpl#getChildren <em>Children</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class PanelParentImpl extends EObjectImpl implements PanelParent {
@@ -38,7 +38,6 @@ public abstract class PanelParentImpl extends EObjectImpl implements PanelParent
 	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getChildren()
 	 * @generated
 	 * @ordered
@@ -48,7 +47,6 @@ public abstract class PanelParentImpl extends EObjectImpl implements PanelParent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected PanelParentImpl() {
@@ -58,7 +56,6 @@ public abstract class PanelParentImpl extends EObjectImpl implements PanelParent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -69,11 +66,10 @@ public abstract class PanelParentImpl extends EObjectImpl implements PanelParent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<AbstractPanel> getChildren() {
-		if(children == null) {
+		if (children == null) {
 			children = new EObjectContainmentWithInverseEList<AbstractPanel>(AbstractPanel.class, this, DiPackage.PANEL_PARENT__CHILDREN, DiPackage.ABSTRACT_PANEL__PARENT);
 		}
 		return children;
@@ -82,7 +78,6 @@ public abstract class PanelParentImpl extends EObjectImpl implements PanelParent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void replaceChild(AbstractPanel oldChild, AbstractPanel newChild) {
@@ -94,15 +89,14 @@ public abstract class PanelParentImpl extends EObjectImpl implements PanelParent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch(featureID) {
-		case DiPackage.PANEL_PARENT__CHILDREN:
-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+		switch (featureID) {
+			case DiPackage.PANEL_PARENT__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -110,14 +104,13 @@ public abstract class PanelParentImpl extends EObjectImpl implements PanelParent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch(featureID) {
-		case DiPackage.PANEL_PARENT__CHILDREN:
-			return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		switch (featureID) {
+			case DiPackage.PANEL_PARENT__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -125,14 +118,13 @@ public abstract class PanelParentImpl extends EObjectImpl implements PanelParent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch(featureID) {
-		case DiPackage.PANEL_PARENT__CHILDREN:
-			return getChildren();
+		switch (featureID) {
+			case DiPackage.PANEL_PARENT__CHILDREN:
+				return getChildren();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -140,17 +132,16 @@ public abstract class PanelParentImpl extends EObjectImpl implements PanelParent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch(featureID) {
-		case DiPackage.PANEL_PARENT__CHILDREN:
-			getChildren().clear();
-			getChildren().addAll((Collection<? extends AbstractPanel>)newValue);
-			return;
+		switch (featureID) {
+			case DiPackage.PANEL_PARENT__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends AbstractPanel>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -158,15 +149,14 @@ public abstract class PanelParentImpl extends EObjectImpl implements PanelParent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch(featureID) {
-		case DiPackage.PANEL_PARENT__CHILDREN:
-			getChildren().clear();
-			return;
+		switch (featureID) {
+			case DiPackage.PANEL_PARENT__CHILDREN:
+				getChildren().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -174,14 +164,13 @@ public abstract class PanelParentImpl extends EObjectImpl implements PanelParent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch(featureID) {
-		case DiPackage.PANEL_PARENT__CHILDREN:
-			return children != null && !children.isEmpty();
+		switch (featureID) {
+			case DiPackage.PANEL_PARENT__CHILDREN:
+				return children != null && !children.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PositionImpl.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PositionImpl.java
index 243e5deb4c0..d4f29d67591 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PositionImpl.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PositionImpl.java
@@ -20,11 +20,11 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.Position;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl#getX <em>X</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl#getY <em>Y</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl#getX <em>X</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl#getY <em>Y</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class PositionImpl extends EObjectImpl implements Position {
@@ -33,7 +33,6 @@ public class PositionImpl extends EObjectImpl implements Position {
 	 * The default value of the '{@link #getX() <em>X</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getX()
 	 * @generated
 	 * @ordered
@@ -44,7 +43,6 @@ public class PositionImpl extends EObjectImpl implements Position {
 	 * The cached value of the '{@link #getX() <em>X</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getX()
 	 * @generated
 	 * @ordered
@@ -55,7 +53,6 @@ public class PositionImpl extends EObjectImpl implements Position {
 	 * The default value of the '{@link #getY() <em>Y</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getY()
 	 * @generated
 	 * @ordered
@@ -66,7 +63,6 @@ public class PositionImpl extends EObjectImpl implements Position {
 	 * The cached value of the '{@link #getY() <em>Y</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getY()
 	 * @generated
 	 * @ordered
@@ -76,7 +72,6 @@ public class PositionImpl extends EObjectImpl implements Position {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected PositionImpl() {
@@ -86,7 +81,6 @@ public class PositionImpl extends EObjectImpl implements Position {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,7 +91,6 @@ public class PositionImpl extends EObjectImpl implements Position {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public int getX() {
@@ -107,20 +100,18 @@ public class PositionImpl extends EObjectImpl implements Position {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setX(int newX) {
 		int oldX = x;
 		x = newX;
-		if(eNotificationRequired())
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.POSITION__X, oldX, x));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public int getY() {
@@ -130,29 +121,27 @@ public class PositionImpl extends EObjectImpl implements Position {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setY(int newY) {
 		int oldY = y;
 		y = newY;
-		if(eNotificationRequired())
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.POSITION__Y, oldY, y));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch(featureID) {
-		case DiPackage.POSITION__X:
-			return getX();
-		case DiPackage.POSITION__Y:
-			return getY();
+		switch (featureID) {
+			case DiPackage.POSITION__X:
+				return getX();
+			case DiPackage.POSITION__Y:
+				return getY();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -160,18 +149,17 @@ public class PositionImpl extends EObjectImpl implements Position {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch(featureID) {
-		case DiPackage.POSITION__X:
-			setX((Integer)newValue);
-			return;
-		case DiPackage.POSITION__Y:
-			setY((Integer)newValue);
-			return;
+		switch (featureID) {
+			case DiPackage.POSITION__X:
+				setX((Integer)newValue);
+				return;
+			case DiPackage.POSITION__Y:
+				setY((Integer)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -179,18 +167,17 @@ public class PositionImpl extends EObjectImpl implements Position {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch(featureID) {
-		case DiPackage.POSITION__X:
-			setX(X_EDEFAULT);
-			return;
-		case DiPackage.POSITION__Y:
-			setY(Y_EDEFAULT);
-			return;
+		switch (featureID) {
+			case DiPackage.POSITION__X:
+				setX(X_EDEFAULT);
+				return;
+			case DiPackage.POSITION__Y:
+				setY(Y_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -198,16 +185,15 @@ public class PositionImpl extends EObjectImpl implements Position {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch(featureID) {
-		case DiPackage.POSITION__X:
-			return x != X_EDEFAULT;
-		case DiPackage.POSITION__Y:
-			return y != Y_EDEFAULT;
+		switch (featureID) {
+			case DiPackage.POSITION__X:
+				return x != X_EDEFAULT;
+			case DiPackage.POSITION__Y:
+				return y != Y_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -215,13 +201,11 @@ public class PositionImpl extends EObjectImpl implements Position {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if(eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (x: ");
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashPanelImpl.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashPanelImpl.java
index ece09ebd6e7..192ce878563 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashPanelImpl.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashPanelImpl.java
@@ -29,12 +29,12 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getChildren <em>Children</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getSashPosition <em>Sash Position</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getDirection <em>Direction</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getChildren <em>Children</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getSashPosition <em>Sash Position</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getDirection <em>Direction</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
@@ -43,7 +43,6 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getChildren()
 	 * @generated
 	 * @ordered
@@ -54,7 +53,6 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	 * The default value of the '{@link #getSashPosition() <em>Sash Position</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getSashPosition()
 	 * @generated
 	 * @ordered
@@ -65,7 +63,6 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	 * The cached value of the '{@link #getSashPosition() <em>Sash Position</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getSashPosition()
 	 * @generated
 	 * @ordered
@@ -76,7 +73,6 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	 * The default value of the '{@link #getDirection() <em>Direction</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getDirection()
 	 * @generated
 	 * @ordered
@@ -87,7 +83,6 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	 * The cached value of the '{@link #getDirection() <em>Direction</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getDirection()
 	 * @generated
 	 * @ordered
@@ -97,7 +92,6 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected SashPanelImpl() {
@@ -107,7 +101,6 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -118,11 +111,10 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<AbstractPanel> getChildren() {
-		if(children == null) {
+		if (children == null) {
 			children = new EObjectContainmentWithInverseEList<AbstractPanel>(AbstractPanel.class, this, DiPackage.SASH_PANEL__CHILDREN, DiPackage.ABSTRACT_PANEL__PARENT);
 		}
 		return children;
@@ -131,7 +123,6 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public float getSashPosition() {
@@ -141,20 +132,18 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setSashPosition(float newSashPosition) {
 		float oldSashPosition = sashPosition;
 		sashPosition = newSashPosition;
-		if(eNotificationRequired())
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.SASH_PANEL__SASH_POSITION, oldSashPosition, sashPosition));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public int getDirection() {
@@ -164,13 +153,12 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setDirection(int newDirection) {
 		int oldDirection = direction;
 		direction = newDirection;
-		if(eNotificationRequired())
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.SASH_PANEL__DIRECTION, oldDirection, direction));
 	}
 
@@ -216,15 +204,14 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch(featureID) {
-		case DiPackage.SASH_PANEL__CHILDREN:
-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+		switch (featureID) {
+			case DiPackage.SASH_PANEL__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -232,14 +219,13 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch(featureID) {
-		case DiPackage.SASH_PANEL__CHILDREN:
-			return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		switch (featureID) {
+			case DiPackage.SASH_PANEL__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -247,18 +233,17 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch(featureID) {
-		case DiPackage.SASH_PANEL__CHILDREN:
-			return getChildren();
-		case DiPackage.SASH_PANEL__SASH_POSITION:
-			return getSashPosition();
-		case DiPackage.SASH_PANEL__DIRECTION:
-			return getDirection();
+		switch (featureID) {
+			case DiPackage.SASH_PANEL__CHILDREN:
+				return getChildren();
+			case DiPackage.SASH_PANEL__SASH_POSITION:
+				return getSashPosition();
+			case DiPackage.SASH_PANEL__DIRECTION:
+				return getDirection();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -266,23 +251,22 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch(featureID) {
-		case DiPackage.SASH_PANEL__CHILDREN:
-			getChildren().clear();
-			getChildren().addAll((Collection<? extends AbstractPanel>)newValue);
-			return;
-		case DiPackage.SASH_PANEL__SASH_POSITION:
-			setSashPosition((Float)newValue);
-			return;
-		case DiPackage.SASH_PANEL__DIRECTION:
-			setDirection((Integer)newValue);
-			return;
+		switch (featureID) {
+			case DiPackage.SASH_PANEL__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends AbstractPanel>)newValue);
+				return;
+			case DiPackage.SASH_PANEL__SASH_POSITION:
+				setSashPosition((Float)newValue);
+				return;
+			case DiPackage.SASH_PANEL__DIRECTION:
+				setDirection((Integer)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -290,21 +274,20 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch(featureID) {
-		case DiPackage.SASH_PANEL__CHILDREN:
-			getChildren().clear();
-			return;
-		case DiPackage.SASH_PANEL__SASH_POSITION:
-			setSashPosition(SASH_POSITION_EDEFAULT);
-			return;
-		case DiPackage.SASH_PANEL__DIRECTION:
-			setDirection(DIRECTION_EDEFAULT);
-			return;
+		switch (featureID) {
+			case DiPackage.SASH_PANEL__CHILDREN:
+				getChildren().clear();
+				return;
+			case DiPackage.SASH_PANEL__SASH_POSITION:
+				setSashPosition(SASH_POSITION_EDEFAULT);
+				return;
+			case DiPackage.SASH_PANEL__DIRECTION:
+				setDirection(DIRECTION_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -312,18 +295,17 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch(featureID) {
-		case DiPackage.SASH_PANEL__CHILDREN:
-			return children != null && !children.isEmpty();
-		case DiPackage.SASH_PANEL__SASH_POSITION:
-			return sashPosition != SASH_POSITION_EDEFAULT;
-		case DiPackage.SASH_PANEL__DIRECTION:
-			return direction != DIRECTION_EDEFAULT;
+		switch (featureID) {
+			case DiPackage.SASH_PANEL__CHILDREN:
+				return children != null && !children.isEmpty();
+			case DiPackage.SASH_PANEL__SASH_POSITION:
+				return sashPosition != SASH_POSITION_EDEFAULT;
+			case DiPackage.SASH_PANEL__DIRECTION:
+				return direction != DIRECTION_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -331,17 +313,14 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if(baseClass == PanelParent.class) {
-			switch(derivedFeatureID) {
-			case DiPackage.SASH_PANEL__CHILDREN:
-				return DiPackage.PANEL_PARENT__CHILDREN;
-			default:
-				return -1;
+		if (baseClass == PanelParent.class) {
+			switch (derivedFeatureID) {
+				case DiPackage.SASH_PANEL__CHILDREN: return DiPackage.PANEL_PARENT__CHILDREN;
+				default: return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -350,17 +329,14 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if(baseClass == PanelParent.class) {
-			switch(baseFeatureID) {
-			case DiPackage.PANEL_PARENT__CHILDREN:
-				return DiPackage.SASH_PANEL__CHILDREN;
-			default:
-				return -1;
+		if (baseClass == PanelParent.class) {
+			switch (baseFeatureID) {
+				case DiPackage.PANEL_PARENT__CHILDREN: return DiPackage.SASH_PANEL__CHILDREN;
+				default: return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
@@ -369,13 +345,11 @@ public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if(eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (sashPosition: ");
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashWindowsMngrImpl.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashWindowsMngrImpl.java
index 2a3c4dfa42d..cdde75af72f 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashWindowsMngrImpl.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashWindowsMngrImpl.java
@@ -24,11 +24,11 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashWindowsMngrImpl#getPageList <em>Page List</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashWindowsMngrImpl#getSashModel <em>Sash Model</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashWindowsMngrImpl#getPageList <em>Page List</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashWindowsMngrImpl#getSashModel <em>Sash Model</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class SashWindowsMngrImpl extends EObjectImpl implements SashWindowsMngr {
@@ -37,7 +37,6 @@ public class SashWindowsMngrImpl extends EObjectImpl implements SashWindowsMngr
 	 * The cached value of the '{@link #getPageList() <em>Page List</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getPageList()
 	 * @generated
 	 * @ordered
@@ -48,7 +47,6 @@ public class SashWindowsMngrImpl extends EObjectImpl implements SashWindowsMngr
 	 * The cached value of the '{@link #getSashModel() <em>Sash Model</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getSashModel()
 	 * @generated
 	 * @ordered
@@ -58,7 +56,6 @@ public class SashWindowsMngrImpl extends EObjectImpl implements SashWindowsMngr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected SashWindowsMngrImpl() {
@@ -68,7 +65,6 @@ public class SashWindowsMngrImpl extends EObjectImpl implements SashWindowsMngr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -79,7 +75,6 @@ public class SashWindowsMngrImpl extends EObjectImpl implements SashWindowsMngr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public PageList getPageList() {
@@ -89,18 +84,14 @@ public class SashWindowsMngrImpl extends EObjectImpl implements SashWindowsMngr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetPageList(PageList newPageList, NotificationChain msgs) {
 		PageList oldPageList = pageList;
 		pageList = newPageList;
-		if(eNotificationRequired()) {
+		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DiPackage.SASH_WINDOWS_MNGR__PAGE_LIST, oldPageList, newPageList);
-			if(msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -108,27 +99,25 @@ public class SashWindowsMngrImpl extends EObjectImpl implements SashWindowsMngr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setPageList(PageList newPageList) {
-		if(newPageList != pageList) {
+		if (newPageList != pageList) {
 			NotificationChain msgs = null;
-			if(pageList != null)
+			if (pageList != null)
 				msgs = ((InternalEObject)pageList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DiPackage.SASH_WINDOWS_MNGR__PAGE_LIST, null, msgs);
-			if(newPageList != null)
+			if (newPageList != null)
 				msgs = ((InternalEObject)newPageList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DiPackage.SASH_WINDOWS_MNGR__PAGE_LIST, null, msgs);
 			msgs = basicSetPageList(newPageList, msgs);
-			if(msgs != null)
-				msgs.dispatch();
-		} else if(eNotificationRequired())
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.SASH_WINDOWS_MNGR__PAGE_LIST, newPageList, newPageList));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public SashModel getSashModel() {
@@ -138,18 +127,14 @@ public class SashWindowsMngrImpl extends EObjectImpl implements SashWindowsMngr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetSashModel(SashModel newSashModel, NotificationChain msgs) {
 		SashModel oldSashModel = sashModel;
 		sashModel = newSashModel;
-		if(eNotificationRequired()) {
+		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DiPackage.SASH_WINDOWS_MNGR__SASH_MODEL, oldSashModel, newSashModel);
-			if(msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -157,36 +142,34 @@ public class SashWindowsMngrImpl extends EObjectImpl implements SashWindowsMngr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setSashModel(SashModel newSashModel) {
-		if(newSashModel != sashModel) {
+		if (newSashModel != sashModel) {
 			NotificationChain msgs = null;
-			if(sashModel != null)
+			if (sashModel != null)
 				msgs = ((InternalEObject)sashModel).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DiPackage.SASH_WINDOWS_MNGR__SASH_MODEL, null, msgs);
-			if(newSashModel != null)
+			if (newSashModel != null)
 				msgs = ((InternalEObject)newSashModel).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DiPackage.SASH_WINDOWS_MNGR__SASH_MODEL, null, msgs);
 			msgs = basicSetSashModel(newSashModel, msgs);
-			if(msgs != null)
-				msgs.dispatch();
-		} else if(eNotificationRequired())
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.SASH_WINDOWS_MNGR__SASH_MODEL, newSashModel, newSashModel));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch(featureID) {
-		case DiPackage.SASH_WINDOWS_MNGR__PAGE_LIST:
-			return basicSetPageList(null, msgs);
-		case DiPackage.SASH_WINDOWS_MNGR__SASH_MODEL:
-			return basicSetSashModel(null, msgs);
+		switch (featureID) {
+			case DiPackage.SASH_WINDOWS_MNGR__PAGE_LIST:
+				return basicSetPageList(null, msgs);
+			case DiPackage.SASH_WINDOWS_MNGR__SASH_MODEL:
+				return basicSetSashModel(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -194,16 +177,15 @@ public class SashWindowsMngrImpl extends EObjectImpl implements SashWindowsMngr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch(featureID) {
-		case DiPackage.SASH_WINDOWS_MNGR__PAGE_LIST:
-			return getPageList();
-		case DiPackage.SASH_WINDOWS_MNGR__SASH_MODEL:
-			return getSashModel();
+		switch (featureID) {
+			case DiPackage.SASH_WINDOWS_MNGR__PAGE_LIST:
+				return getPageList();
+			case DiPackage.SASH_WINDOWS_MNGR__SASH_MODEL:
+				return getSashModel();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -211,18 +193,17 @@ public class SashWindowsMngrImpl extends EObjectImpl implements SashWindowsMngr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch(featureID) {
-		case DiPackage.SASH_WINDOWS_MNGR__PAGE_LIST:
-			setPageList((PageList)newValue);
-			return;
-		case DiPackage.SASH_WINDOWS_MNGR__SASH_MODEL:
-			setSashModel((SashModel)newValue);
-			return;
+		switch (featureID) {
+			case DiPackage.SASH_WINDOWS_MNGR__PAGE_LIST:
+				setPageList((PageList)newValue);
+				return;
+			case DiPackage.SASH_WINDOWS_MNGR__SASH_MODEL:
+				setSashModel((SashModel)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -230,18 +211,17 @@ public class SashWindowsMngrImpl extends EObjectImpl implements SashWindowsMngr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch(featureID) {
-		case DiPackage.SASH_WINDOWS_MNGR__PAGE_LIST:
-			setPageList((PageList)null);
-			return;
-		case DiPackage.SASH_WINDOWS_MNGR__SASH_MODEL:
-			setSashModel((SashModel)null);
-			return;
+		switch (featureID) {
+			case DiPackage.SASH_WINDOWS_MNGR__PAGE_LIST:
+				setPageList((PageList)null);
+				return;
+			case DiPackage.SASH_WINDOWS_MNGR__SASH_MODEL:
+				setSashModel((SashModel)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -249,16 +229,15 @@ public class SashWindowsMngrImpl extends EObjectImpl implements SashWindowsMngr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch(featureID) {
-		case DiPackage.SASH_WINDOWS_MNGR__PAGE_LIST:
-			return pageList != null;
-		case DiPackage.SASH_WINDOWS_MNGR__SASH_MODEL:
-			return sashModel != null;
+		switch (featureID) {
+			case DiPackage.SASH_WINDOWS_MNGR__PAGE_LIST:
+				return pageList != null;
+			case DiPackage.SASH_WINDOWS_MNGR__SASH_MODEL:
+				return sashModel != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SizeImpl.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SizeImpl.java
index 2106739f537..689dcfe7fc3 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SizeImpl.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SizeImpl.java
@@ -20,11 +20,11 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.Size;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl#getWidth <em>Width</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl#getLength <em>Length</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl#getWidth <em>Width</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl#getLength <em>Length</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class SizeImpl extends EObjectImpl implements Size {
@@ -33,7 +33,6 @@ public class SizeImpl extends EObjectImpl implements Size {
 	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -44,7 +43,6 @@ public class SizeImpl extends EObjectImpl implements Size {
 	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -55,7 +53,6 @@ public class SizeImpl extends EObjectImpl implements Size {
 	 * The default value of the '{@link #getLength() <em>Length</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getLength()
 	 * @generated
 	 * @ordered
@@ -66,7 +63,6 @@ public class SizeImpl extends EObjectImpl implements Size {
 	 * The cached value of the '{@link #getLength() <em>Length</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getLength()
 	 * @generated
 	 * @ordered
@@ -76,7 +72,6 @@ public class SizeImpl extends EObjectImpl implements Size {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected SizeImpl() {
@@ -86,7 +81,6 @@ public class SizeImpl extends EObjectImpl implements Size {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,7 +91,6 @@ public class SizeImpl extends EObjectImpl implements Size {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public int getWidth() {
@@ -107,20 +100,18 @@ public class SizeImpl extends EObjectImpl implements Size {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setWidth(int newWidth) {
 		int oldWidth = width;
 		width = newWidth;
-		if(eNotificationRequired())
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.SIZE__WIDTH, oldWidth, width));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public int getLength() {
@@ -130,29 +121,27 @@ public class SizeImpl extends EObjectImpl implements Size {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setLength(int newLength) {
 		int oldLength = length;
 		length = newLength;
-		if(eNotificationRequired())
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.SIZE__LENGTH, oldLength, length));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch(featureID) {
-		case DiPackage.SIZE__WIDTH:
-			return getWidth();
-		case DiPackage.SIZE__LENGTH:
-			return getLength();
+		switch (featureID) {
+			case DiPackage.SIZE__WIDTH:
+				return getWidth();
+			case DiPackage.SIZE__LENGTH:
+				return getLength();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -160,18 +149,17 @@ public class SizeImpl extends EObjectImpl implements Size {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch(featureID) {
-		case DiPackage.SIZE__WIDTH:
-			setWidth((Integer)newValue);
-			return;
-		case DiPackage.SIZE__LENGTH:
-			setLength((Integer)newValue);
-			return;
+		switch (featureID) {
+			case DiPackage.SIZE__WIDTH:
+				setWidth((Integer)newValue);
+				return;
+			case DiPackage.SIZE__LENGTH:
+				setLength((Integer)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -179,18 +167,17 @@ public class SizeImpl extends EObjectImpl implements Size {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch(featureID) {
-		case DiPackage.SIZE__WIDTH:
-			setWidth(WIDTH_EDEFAULT);
-			return;
-		case DiPackage.SIZE__LENGTH:
-			setLength(LENGTH_EDEFAULT);
-			return;
+		switch (featureID) {
+			case DiPackage.SIZE__WIDTH:
+				setWidth(WIDTH_EDEFAULT);
+				return;
+			case DiPackage.SIZE__LENGTH:
+				setLength(LENGTH_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -198,16 +185,15 @@ public class SizeImpl extends EObjectImpl implements Size {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch(featureID) {
-		case DiPackage.SIZE__WIDTH:
-			return width != WIDTH_EDEFAULT;
-		case DiPackage.SIZE__LENGTH:
-			return length != LENGTH_EDEFAULT;
+		switch (featureID) {
+			case DiPackage.SIZE__WIDTH:
+				return width != WIDTH_EDEFAULT;
+			case DiPackage.SIZE__LENGTH:
+				return length != LENGTH_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -215,13 +201,11 @@ public class SizeImpl extends EObjectImpl implements Size {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if(eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (width: ");
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/TabFolderImpl.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/TabFolderImpl.java
index af1d5da403b..75212eb0d83 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/TabFolderImpl.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/TabFolderImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl#getChildren <em>Children</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl#getChildren <em>Children</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {
@@ -38,7 +38,6 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {
 	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getChildren()
 	 * @generated
 	 * @ordered
@@ -48,7 +47,6 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected TabFolderImpl() {
@@ -58,7 +56,6 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -69,11 +66,10 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<PageRef> getChildren() {
-		if(children == null) {
+		if (children == null) {
 			children = new EObjectContainmentWithInverseEList<PageRef>(PageRef.class, this, DiPackage.TAB_FOLDER__CHILDREN, DiPackage.PAGE_REF__PARENT);
 		}
 		return children;
@@ -104,15 +100,14 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch(featureID) {
-		case DiPackage.TAB_FOLDER__CHILDREN:
-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+		switch (featureID) {
+			case DiPackage.TAB_FOLDER__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -120,14 +115,13 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch(featureID) {
-		case DiPackage.TAB_FOLDER__CHILDREN:
-			return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		switch (featureID) {
+			case DiPackage.TAB_FOLDER__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -135,14 +129,13 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch(featureID) {
-		case DiPackage.TAB_FOLDER__CHILDREN:
-			return getChildren();
+		switch (featureID) {
+			case DiPackage.TAB_FOLDER__CHILDREN:
+				return getChildren();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -150,17 +143,16 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch(featureID) {
-		case DiPackage.TAB_FOLDER__CHILDREN:
-			getChildren().clear();
-			getChildren().addAll((Collection<? extends PageRef>)newValue);
-			return;
+		switch (featureID) {
+			case DiPackage.TAB_FOLDER__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends PageRef>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -168,15 +160,14 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch(featureID) {
-		case DiPackage.TAB_FOLDER__CHILDREN:
-			getChildren().clear();
-			return;
+		switch (featureID) {
+			case DiPackage.TAB_FOLDER__CHILDREN:
+				getChildren().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -184,14 +175,13 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch(featureID) {
-		case DiPackage.TAB_FOLDER__CHILDREN:
-			return children != null && !children.isEmpty();
+		switch (featureID) {
+			case DiPackage.TAB_FOLDER__CHILDREN:
+				return children != null && !children.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/WindowImpl.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/WindowImpl.java
index 13a206030ee..dad2f7b5973 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/WindowImpl.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/WindowImpl.java
@@ -24,12 +24,12 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getPosition <em>Position</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getSize <em>Size</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getPanel <em>Panel</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getPosition <em>Position</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getSize <em>Size</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getPanel <em>Panel</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class WindowImpl extends PanelParentImpl implements Window {
@@ -38,7 +38,6 @@ public class WindowImpl extends PanelParentImpl implements Window {
 	 * The cached value of the '{@link #getPosition() <em>Position</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getPosition()
 	 * @generated
 	 * @ordered
@@ -49,7 +48,6 @@ public class WindowImpl extends PanelParentImpl implements Window {
 	 * The cached value of the '{@link #getSize() <em>Size</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getSize()
 	 * @generated
 	 * @ordered
@@ -59,7 +57,6 @@ public class WindowImpl extends PanelParentImpl implements Window {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected WindowImpl() {
@@ -69,7 +66,6 @@ public class WindowImpl extends PanelParentImpl implements Window {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -80,15 +76,14 @@ public class WindowImpl extends PanelParentImpl implements Window {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Position getPosition() {
-		if(position != null && position.eIsProxy()) {
+		if (position != null && position.eIsProxy()) {
 			InternalEObject oldPosition = (InternalEObject)position;
 			position = (Position)eResolveProxy(oldPosition);
-			if(position != oldPosition) {
-				if(eNotificationRequired())
+			if (position != oldPosition) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DiPackage.WINDOW__POSITION, oldPosition, position));
 			}
 		}
@@ -98,7 +93,6 @@ public class WindowImpl extends PanelParentImpl implements Window {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Position basicGetPosition() {
@@ -108,28 +102,26 @@ public class WindowImpl extends PanelParentImpl implements Window {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setPosition(Position newPosition) {
 		Position oldPosition = position;
 		position = newPosition;
-		if(eNotificationRequired())
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.WINDOW__POSITION, oldPosition, position));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Size getSize() {
-		if(size != null && size.eIsProxy()) {
+		if (size != null && size.eIsProxy()) {
 			InternalEObject oldSize = (InternalEObject)size;
 			size = (Size)eResolveProxy(oldSize);
-			if(size != oldSize) {
-				if(eNotificationRequired())
+			if (size != oldSize) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DiPackage.WINDOW__SIZE, oldSize, size));
 			}
 		}
@@ -139,7 +131,6 @@ public class WindowImpl extends PanelParentImpl implements Window {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Size basicGetSize() {
@@ -149,20 +140,18 @@ public class WindowImpl extends PanelParentImpl implements Window {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setSize(Size newSize) {
 		Size oldSize = size;
 		size = newSize;
-		if(eNotificationRequired())
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DiPackage.WINDOW__SIZE, oldSize, size));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public AbstractPanel getPanel() {
@@ -201,24 +190,20 @@ public class WindowImpl extends PanelParentImpl implements Window {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch(featureID) {
-		case DiPackage.WINDOW__POSITION:
-			if(resolve)
-				return getPosition();
-			return basicGetPosition();
-		case DiPackage.WINDOW__SIZE:
-			if(resolve)
-				return getSize();
-			return basicGetSize();
-		case DiPackage.WINDOW__PANEL:
-			if(resolve)
-				return getPanel();
-			return basicGetPanel();
+		switch (featureID) {
+			case DiPackage.WINDOW__POSITION:
+				if (resolve) return getPosition();
+				return basicGetPosition();
+			case DiPackage.WINDOW__SIZE:
+				if (resolve) return getSize();
+				return basicGetSize();
+			case DiPackage.WINDOW__PANEL:
+				if (resolve) return getPanel();
+				return basicGetPanel();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -226,21 +211,20 @@ public class WindowImpl extends PanelParentImpl implements Window {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch(featureID) {
-		case DiPackage.WINDOW__POSITION:
-			setPosition((Position)newValue);
-			return;
-		case DiPackage.WINDOW__SIZE:
-			setSize((Size)newValue);
-			return;
-		case DiPackage.WINDOW__PANEL:
-			setPanel((AbstractPanel)newValue);
-			return;
+		switch (featureID) {
+			case DiPackage.WINDOW__POSITION:
+				setPosition((Position)newValue);
+				return;
+			case DiPackage.WINDOW__SIZE:
+				setSize((Size)newValue);
+				return;
+			case DiPackage.WINDOW__PANEL:
+				setPanel((AbstractPanel)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -248,21 +232,20 @@ public class WindowImpl extends PanelParentImpl implements Window {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch(featureID) {
-		case DiPackage.WINDOW__POSITION:
-			setPosition((Position)null);
-			return;
-		case DiPackage.WINDOW__SIZE:
-			setSize((Size)null);
-			return;
-		case DiPackage.WINDOW__PANEL:
-			setPanel((AbstractPanel)null);
-			return;
+		switch (featureID) {
+			case DiPackage.WINDOW__POSITION:
+				setPosition((Position)null);
+				return;
+			case DiPackage.WINDOW__SIZE:
+				setSize((Size)null);
+				return;
+			case DiPackage.WINDOW__PANEL:
+				setPanel((AbstractPanel)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -270,18 +253,17 @@ public class WindowImpl extends PanelParentImpl implements Window {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch(featureID) {
-		case DiPackage.WINDOW__POSITION:
-			return position != null;
-		case DiPackage.WINDOW__SIZE:
-			return size != null;
-		case DiPackage.WINDOW__PANEL:
-			return basicGetPanel() != null;
+		switch (featureID) {
+			case DiPackage.WINDOW__POSITION:
+				return position != null;
+			case DiPackage.WINDOW__SIZE:
+				return size != null;
+			case DiPackage.WINDOW__PANEL:
+				return basicGetPanel() != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiAdapterFactory.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiAdapterFactory.java
index f3709d938a9..b90d5b98eb5 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiAdapterFactory.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiAdapterFactory.java
@@ -10,6 +10,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.core.sashwindows.di.*;
 import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage;
 import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;
 import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
diff --git a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiSwitch.java b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiSwitch.java
index 707f592db91..ac331e83da4 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiSwitch.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiSwitch.java
@@ -10,6 +10,9 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.core.sashwindows.di.*;
 import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage;
 import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;
 import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
@@ -36,7 +39,7 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
  * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage
  * @generated
  */
-public class DiSwitch<T> {
+public class DiSwitch<T> extends Switch<T> {
 
 	/**
 	 * The cached model package
@@ -59,34 +62,16 @@ public class DiSwitch<T> {
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @parameter ePackage the package in question.
+	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
-	public T doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
-		}
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
 	}
 
 	/**
@@ -96,6 +81,7 @@ public class DiSwitch<T> {
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
+	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
 			case DiPackage.SASH_MODEL: {
@@ -369,6 +355,7 @@ public class DiSwitch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
+	@Override
 	public T defaultCase(EObject object) {
 		return null;
 	}
diff --git a/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF b/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
index 57da21f6e28..203c98eeada 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
@@ -4,7 +4,8 @@ Export-Package: org.eclipse.papyrus.infra.core.sasheditor,
  org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple,
  org.eclipse.papyrus.infra.core.sasheditor.editor,
  org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor,
- org.eclipse.papyrus.infra.core.sasheditor.editor.gef
+ org.eclipse.papyrus.infra.core.sasheditor.editor.gef,
+ org.eclipse.papyrus.infra.core.sasheditor.multipage.editor
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
 Bundle-Name: %pluginName
diff --git a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java
index 72930fe979e..3ac963dc0f0 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java
@@ -36,6 +36,8 @@ public interface ISashWindowsContentProvider {
 	/**
 	 * Add a page to the current TabFolder.
 	 * The Page is added at the end of the tab list.
+	 * <br>
+	 * This method is not used by the {@link ISashWindowsContainer}.
 	 * 
 	 * @param page
 	 *        An object identifying the page to add. The object could be anything. It will be
@@ -45,6 +47,8 @@ public interface ISashWindowsContentProvider {
 
 	/**
 	 * Add a page at the specified index of TabFolder.
+	 * <br>
+	 * This method is not used by the {@link ISashWindowsContainer}.
 	 * 
 	 * @param page
 	 *        An object identifying the page to add. The object could be anything. It will be
diff --git a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/DelegateContentProvider.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/DelegateContentProvider.java
new file mode 100644
index 00000000000..15f96a13b74
--- /dev/null
+++ b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/DelegateContentProvider.java
@@ -0,0 +1,165 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+
+/**
+ * This class is used as a delegate to the external implementation of the 
+ * {@link ISashWindowsContentProvider}.
+ * All methods from the {@link SashWindowsContainer} and its tree of classes call the delegate
+ * which in turn call the external implementation.
+ * <br>
+ * This allows to have a central point performing calls to the external implementation.
+ * 
+ * @author cedric dumoulin
+ *
+ */
+public class DelegateContentProvider implements ISashWindowsContentProvider {
+
+	private ISashWindowsContentProvider contentProvider;
+	
+	/**
+	 * Constructor.
+	 *
+	 * @param contentProvider
+	 */
+	public DelegateContentProvider(ISashWindowsContentProvider contentProvider) {
+		this.contentProvider = contentProvider;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#getRootModel()
+	 *
+	 * @return
+	 */
+	public Object getRootModel() {
+		return contentProvider.getRootModel();
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createChildSashModel(java.lang.Object)
+	 *
+	 * @param root
+	 * @return
+	 */
+	public IAbstractPanelModel createChildSashModel(Object root) {
+		return contentProvider.createChildSashModel(root);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(java.lang.Object)
+	 *
+	 * @param page
+	 */
+	public void addPage(Object page) {
+		contentProvider.addPage(page);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(java.lang.Object, int)
+	 *
+	 * @param page
+	 * @param index
+	 */
+	public void addPage(Object page, int index) {
+		contentProvider.addPage(page, index);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, int)
+	 *
+	 * @param folderModel
+	 * @param oldIndex
+	 * @param newIndex
+	 */
+	public void movePage(ITabFolderModel folderModel, int oldIndex, int newIndex) {
+		contentProvider.movePage(folderModel, oldIndex, newIndex);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)
+	 *
+	 * @param srcFolderModel
+	 * @param sourceIndex
+	 * @param targetFolderModel
+	 * @param targetIndex
+	 */
+	public void movePage(ITabFolderModel srcFolderModel, int sourceIndex, ITabFolderModel targetFolderModel, int targetIndex) {
+		contentProvider.movePage(srcFolderModel, sourceIndex, targetFolderModel, targetIndex);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(int)
+	 *
+	 * @param index
+	 */
+	public void removePage(int index) {
+		contentProvider.removePage(index);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(java.lang.Object)
+	 *
+	 * @param page
+	 */
+	public void removePage(Object page) {
+		contentProvider.removePage(page);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)
+	 *
+	 * @param parentFolder
+	 * @param tabIndex
+	 */
+	public void removePage(ITabFolderModel parentFolder, int tabIndex) {
+		contentProvider.removePage(parentFolder, tabIndex);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)
+	 *
+	 * @param tabFolder
+	 * @param tabIndex
+	 * @param targetFolder
+	 * @param side
+	 */
+	public void createFolder(ITabFolderModel tabFolder, int tabIndex, ITabFolderModel targetFolder, int side) {
+		contentProvider.createFolder(tabFolder, tabIndex, targetFolder, side);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)
+	 *
+	 * @param rawModel
+	 */
+	public void setCurrentFolder(Object rawModel) {
+		contentProvider.setCurrentFolder(rawModel);
+
+	}
+
+}
diff --git a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java
index d81108b4557..fb90290c6c1 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java
+++ b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java
@@ -173,7 +173,10 @@ public class SashWindowsContainer implements ISashWindowsContainer {
 	 *        the contentProvider to set
 	 */
 	public void setContentProvider(ISashWindowsContentProvider contentProvider) {
-		this.contentProvider = contentProvider;
+		// Use a delegate
+		// The delegate is used as a central point performing calls to the 
+		// external implementation.
+		this.contentProvider = new DelegateContentProvider(contentProvider);
 	}
 
 	/**
@@ -300,7 +303,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
 	 * Notifies this page container that a pageChanged event has been fired by one swt Control.
 	 * This method is usually called after the user selects a different tab.
 	 * 
-	 * The method record the new active folder in the ContentProvider, and calls {@link #pageChanged(PagePart)}.
+	 * The method notify the ContentProvider, and calls {@link #pageChanged(PagePart)}.
 	 * 
 	 * @param childPart
 	 */
author	cdumoulin	2013-02-01 17:13:16 +0000
committer	cdumoulin	2013-02-01 17:13:16 +0000
commit	bf63d161b4152e21630063e77ada22823a858918 (patch)
tree	9e4e102e6091f89adf25f0eb430c064ef7a8487c
parent	c6ab69342f4cbf5a46e637251fe31569bd5f2df0 (diff)
download	org.eclipse.papyrus-bf63d161b4152e21630063e77ada22823a858918.tar.gz org.eclipse.papyrus-bf63d161b4152e21630063e77ada22823a858918.tar.xz org.eclipse.papyrus-bf63d161b4152e21630063e77ada22823a858918.zip