370797: [Theme] Papyrus should provide a support for CSS files on its diagrams

https://bugs.eclipse.org/bugs/show_bug.cgi?id=370797

184 files changed, 2616 insertions, 2750 deletions

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
index 69252d4cbc2..68c2ef1722f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
@@ -28,4 +28,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.properties.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.properties;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Export-Package: org.eclipse.papyrus.infra.gmfdiag.properties.databinding.custom,

+ org.eclipse.papyrus.infra.gmfdiag.properties.extension,

  org.eclipse.papyrus.infra.gmfdiag.properties.modelelement

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi
index 89a03a34c7c..b35d2881598 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi
@@ -4,18 +4,24 @@
     xmlns:xmi="http://www.omg.org/XMI"

     xmlns:environment="http://www.eclipse.org/papyrus/properties/environment/0.9">

   <constraintTypes

-      label="GMF Notation Constraint"

-      constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.GMFNotationConstraint"/>

+      label="GMF Appearance Constraint"

+      constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.AppearanceConstraint"/>

   <constraintTypes

       label="HasEditPolicy"

       constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.HasEditPolicy"/>

   <constraintTypes

       label="isGMFEditPart"

       constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.IsEditPartConstraint"/>

+  <constraintTypes

+      label="GMF Notation Constraint"

+      constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.GMFNotationConstraint"/>

   <modelElementFactories

-      name="GMF Notation"

-      factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.NotationModelElementFactory"/>

+      name="GMF Appearance Factory"

+      factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.AppearanceModelElementFactory"/>

   <modelElementFactories

       name="GMF Custom Style"

       factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.CustomStyleModelElementFactory"/>

+  <modelElementFactories

+      name="GMF Notation Factory"

+      factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.NotationModelElementFactory"/>

 </environment:Environment>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation.ctx b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation.ctx
deleted file mode 100644
index 5adef4c4eb0..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation.ctx
+++ /dev/null
@@ -1,2253 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"

-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9"

-	xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9"

-	name="notation">

-	<tabs label="Appearance" id="appearance" category="org.eclipse.papyrus"

-		priority="75">

-		<sections name="Single Edge" sectionFile="ui/SingleEdge.xwt">

-			<widget href="ui/SingleEdge.xwt#/" />

-		</sections>

-		<sections name="Single Node" sectionFile="ui/SingleNode.xwt">

-			<widget href="ui/SingleNode.xwt#/" />

-		</sections>

-		<sections name="Single Style" sectionFile="ui/SingleStyle.xwt">

-			<widget href="ui/SingleStyle.xwt#/" />

-		</sections>

-		<sections name="FillStyle" sectionFile="ui/FillStyle.xwt">

-			<widget href="ui/FillStyle.xwt#/" />

-		</sections>

-		<sections name="Single LineStyle" sectionFile="ui/LineStyle.xwt">

-			<widget href="ui/LineStyle.xwt#/" />

-		</sections>

-		<sections name="Single FontStyle" sectionFile="ui/FontStyle.xwt">

-			<widget href="ui/FontStyle.xwt#/" />

-		</sections>

-		<sections name="Single TitleStyle" sectionFile="ui/SingleTitleStyle.xwt">

-			<widget href="ui/SingleTitleStyle.xwt#/" />

-		</sections>

-		<sections name="Single SortingStyle" sectionFile="ui/SingleSortingStyle.xwt">

-			<widget href="ui/SingleSortingStyle.xwt#/" />

-		</sections>

-		<sections name="Single DescriptionStyle" sectionFile="ui/SingleDescriptionStyle.xwt">

-			<widget href="ui/SingleDescriptionStyle.xwt#/" />

-		</sections>

-		<sections name="Single LayoutConstraint" sectionFile="ui/SingleLayoutConstraint.xwt">

-			<widget href="ui/SingleLayoutConstraint.xwt#/" />

-		</sections>

-		<sections name="Single Size" sectionFile="ui/SingleSize.xwt">

-			<widget href="ui/SingleSize.xwt#/" />

-		</sections>

-		<sections name="Single Location" sectionFile="ui/SingleLocation.xwt">

-			<widget href="ui/SingleLocation.xwt#/" />

-		</sections>

-		<sections name="Single Bounds" sectionFile="ui/SingleBounds.xwt">

-			<widget href="ui/SingleBounds.xwt#/" />

-		</sections>

-		<sections name="Single Ratio" sectionFile="ui/SingleRatio.xwt">

-			<widget href="ui/SingleRatio.xwt#/" />

-		</sections>

-		<sections name="Single Anchor" sectionFile="ui/SingleAnchor.xwt">

-			<widget href="ui/SingleAnchor.xwt#/" />

-		</sections>

-		<sections name="Single Bendpoints" sectionFile="ui/SingleBendpoints.xwt">

-			<widget href="ui/SingleBendpoints.xwt#/" />

-		</sections>

-		<sections name="Single IdentityAnchor" sectionFile="ui/SingleIdentityAnchor.xwt">

-			<widget href="ui/SingleIdentityAnchor.xwt#/" />

-		</sections>

-		<sections name="Single RoutingStyle" sectionFile="ui/SingleRoutingStyle.xwt">

-			<widget href="ui/SingleRoutingStyle.xwt#/" />

-		</sections>

-		<sections name="Single View" sectionFile="ui/SingleView.xwt">

-			<widget href="ui/SingleView.xwt#/" />

-		</sections>

-		<sections name="Single RelativeBendpoints" sectionFile="ui/SingleRelativeBendpoints.xwt">

-			<widget href="ui/SingleRelativeBendpoints.xwt#/" />

-		</sections>

-		<sections name="Single Diagram" sectionFile="ui/SingleDiagram.xwt">

-			<widget href="ui/SingleDiagram.xwt#/" />

-		</sections>

-		<sections name="Single Image" sectionFile="ui/SingleImage.xwt">

-			<widget href="ui/SingleImage.xwt#/" />

-		</sections>

-		<sections name="Single CanonicalStyle" sectionFile="ui/SingleCanonicalStyle.xwt">

-			<widget href="ui/SingleCanonicalStyle.xwt#/" />

-		</sections>

-		<sections name="Single ShapeStyle" sectionFile="ui/ShapeStyle.xwt">

-			<widget href="ui/ShapeStyle.xwt#/" />

-		</sections>

-		<sections name="Single ConnectorStyle" sectionFile="ui/SingleConnectorStyle.xwt">

-			<widget href="ui/SingleConnectorStyle.xwt#/" />

-		</sections>

-		<sections name="Single PageStyle" sectionFile="ui/SinglePageStyle.xwt">

-			<widget href="ui/SinglePageStyle.xwt#/" />

-		</sections>

-		<sections name="Single DrawerStyle" sectionFile="ui/SingleDrawerStyle.xwt">

-			<widget href="ui/SingleDrawerStyle.xwt#/" />

-		</sections>

-		<sections name="Single GuideStyle" sectionFile="ui/SingleGuideStyle.xwt">

-			<widget href="ui/SingleGuideStyle.xwt#/" />

-		</sections>

-		<sections name="Single Guide" sectionFile="ui/SingleGuide.xwt">

-			<widget href="ui/SingleGuide.xwt#/" />

-		</sections>

-		<sections name="Single NodeEntry" sectionFile="ui/SingleNodeEntry.xwt">

-			<widget href="ui/SingleNodeEntry.xwt#/" />

-		</sections>

-		<sections name="Single FilteringStyle" sectionFile="ui/SingleFilteringStyle.xwt">

-			<widget href="ui/SingleFilteringStyle.xwt#/" />

-		</sections>

-		<sections name="Single DiagramStyle" sectionFile="ui/SingleDiagramStyle.xwt">

-			<widget href="ui/SingleDiagramStyle.xwt#/" />

-		</sections>

-		<sections name="Single ImageStyle" sectionFile="ui/SingleImageStyle.xwt">

-			<widget href="ui/SingleImageStyle.xwt#/" />

-		</sections>

-		<sections name="Single ImageBufferStyle" sectionFile="ui/SingleImageBufferStyle.xwt">

-			<widget href="ui/SingleImageBufferStyle.xwt#/" />

-		</sections>

-		<sections name="Single PropertiesSetStyle" sectionFile="ui/SinglePropertiesSetStyle.xwt">

-			<widget href="ui/SinglePropertiesSetStyle.xwt#/" />

-		</sections>

-		<sections name="Single StringToPropertyValueMapEntry"

-			sectionFile="ui/SingleStringToPropertyValueMapEntry.xwt">

-			<widget href="ui/SingleStringToPropertyValueMapEntry.xwt#/" />

-		</sections>

-		<sections name="Single PropertyValue" sectionFile="ui/SinglePropertyValue.xwt">

-			<widget href="ui/SinglePropertyValue.xwt#/" />

-		</sections>

-		<sections name="Single SingleValueStyle" sectionFile="ui/SingleSingleValueStyle.xwt">

-			<widget href="ui/SingleSingleValueStyle.xwt#/" />

-		</sections>

-		<sections name="Single ListValueStyle" sectionFile="ui/SingleListValueStyle.xwt">

-			<widget href="ui/SingleListValueStyle.xwt#/" />

-		</sections>

-		<sections name="Single NamedStyle" sectionFile="ui/SingleNamedStyle.xwt">

-			<widget href="ui/SingleNamedStyle.xwt#/" />

-		</sections>

-		<sections name="Single StringObjectConverter" sectionFile="ui/SingleStringObjectConverter.xwt">

-			<widget href="ui/SingleStringObjectConverter.xwt#/" />

-		</sections>

-		<sections name="Single DataTypeStyle" sectionFile="ui/SingleDataTypeStyle.xwt">

-			<widget href="ui/SingleDataTypeStyle.xwt#/" />

-		</sections>

-		<sections name="Single IntValueStyle" sectionFile="ui/SingleIntValueStyle.xwt">

-			<widget href="ui/SingleIntValueStyle.xwt#/" />

-		</sections>

-		<sections name="Single IntListValueStyle" sectionFile="ui/SingleIntListValueStyle.xwt">

-			<widget href="ui/SingleIntListValueStyle.xwt#/" />

-		</sections>

-		<sections name="Single BooleanValueStyle" sectionFile="ui/SingleBooleanValueStyle.xwt">

-			<widget href="ui/SingleBooleanValueStyle.xwt#/" />

-		</sections>

-		<sections name="Single DoubleValueStyle" sectionFile="ui/SingleDoubleValueStyle.xwt">

-			<widget href="ui/SingleDoubleValueStyle.xwt#/" />

-		</sections>

-		<sections name="Single DoubleListValueStyle" sectionFile="ui/SingleDoubleListValueStyle.xwt">

-			<widget href="ui/SingleDoubleListValueStyle.xwt#/" />

-		</sections>

-		<sections name="Single StringValueStyle" sectionFile="ui/SingleStringValueStyle.xwt">

-			<widget href="ui/SingleStringValueStyle.xwt#/" />

-		</sections>

-		<sections name="Single StringListValueStyle" sectionFile="ui/SingleStringListValueStyle.xwt">

-			<widget href="ui/SingleStringListValueStyle.xwt#/" />

-		</sections>

-		<sections name="Single EObjectValueStyle" sectionFile="ui/SingleEObjectValueStyle.xwt">

-			<widget href="ui/SingleEObjectValueStyle.xwt#/" />

-		</sections>

-		<sections name="Single EObjectListValueStyle" sectionFile="ui/SingleEObjectListValueStyle.xwt">

-			<widget href="ui/SingleEObjectListValueStyle.xwt#/" />

-		</sections>

-		<sections name="Single ByteArrayValueStyle" sectionFile="ui/SingleByteArrayValueStyle.xwt">

-			<widget href="ui/SingleByteArrayValueStyle.xwt#/" />

-		</sections>

-		<sections name="Single BooleanListValueStyle" sectionFile="ui/SingleBooleanListValueStyle.xwt">

-			<widget href="ui/SingleBooleanListValueStyle.xwt#/" />

-		</sections>

-		<sections name="Single HintedDiagramLinkStyle" sectionFile="ui/SingleHintedDiagramLinkStyle.xwt">

-			<widget href="ui/SingleHintedDiagramLinkStyle.xwt#/" />

-		</sections>

-		<sections name="Single DiagramLinkStyle" sectionFile="ui/SingleDiagramLinkStyle.xwt">

-			<widget href="ui/SingleDiagramLinkStyle.xwt#/" />

-		</sections>

-		<sections name="Single MultiDiagramLinkStyle" sectionFile="ui/SingleMultiDiagramLinkStyle.xwt">

-			<widget href="ui/SingleMultiDiagramLinkStyle.xwt#/" />

-		</sections>

-		<sections name="Single TextStyle" sectionFile="ui/SingleTextStyle.xwt">

-			<widget href="ui/SingleTextStyle.xwt#/" />

-		</sections>

-		<sections name="Single LineTypeStyle" sectionFile="ui/SingleLineTypeStyle.xwt">

-			<widget href="ui/SingleLineTypeStyle.xwt#/" />

-		</sections>

-		<sections name="Single ArrowStyle" sectionFile="ui/SingleArrowStyle.xwt">

-			<widget href="ui/SingleArrowStyle.xwt#/" />

-		</sections>

-		<sections name="Single Shape" sectionFile="ui/SingleShape.xwt">

-			<widget href="ui/SingleShape.xwt#/" />

-		</sections>

-		<sections name="Single Compartment" sectionFile="ui/SingleCompartment.xwt">

-			<widget href="ui/SingleCompartment.xwt#/" />

-		</sections>

-		<sections name="Single ListCompartment" sectionFile="ui/SingleListCompartment.xwt">

-			<widget href="ui/SingleListCompartment.xwt#/" />

-		</sections>

-		<sections name="Single Connector" sectionFile="ui/SingleConnector.xwt">

-			<widget href="ui/SingleConnector.xwt#/" />

-		</sections>

-		<sections name="Single StandardDiagram" sectionFile="ui/SingleStandardDiagram.xwt">

-			<widget href="ui/SingleStandardDiagram.xwt#/" />

-		</sections>

-		<sections name="Single DecorationNode" sectionFile="ui/SingleDecorationNode.xwt">

-			<widget href="ui/SingleDecorationNode.xwt#/" />

-		</sections>

-		<sections name="Single BasicDecorationNode" sectionFile="ui/SingleBasicDecorationNode.xwt">

-			<widget href="ui/SingleBasicDecorationNode.xwt#/" />

-		</sections>

-		<sections name="Single BasicCompartment" sectionFile="ui/SingleBasicCompartment.xwt">

-			<widget href="ui/SingleBasicCompartment.xwt#/" />

-		</sections>

-		<sections name="Single BasicSemanticCompartment" sectionFile="ui/SingleBasicSemanticCompartment.xwt">

-			<widget href="ui/SingleBasicSemanticCompartment.xwt#/" />

-		</sections>

-		<sections name="Single SemanticListCompartment" sectionFile="ui/SingleSemanticListCompartment.xwt">

-			<widget href="ui/SingleSemanticListCompartment.xwt#/" />

-		</sections>

-		<sections name="Single RoundedCornersStyle" sectionFile="ui/RoundedCornersStyle.xwt">

-			<widget href="ui/RoundedCornersStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple Edge" sectionFile="ui/MultipleEdge.xwt">

-			<widget href="ui/MultipleEdge.xwt#/" />

-		</sections>

-		<sections name="Multiple Node" sectionFile="ui/MultipleNode.xwt">

-			<widget href="ui/MultipleNode.xwt#/" />

-		</sections>

-		<sections name="Multiple Style" sectionFile="ui/MultipleStyle.xwt">

-			<widget href="ui/MultipleStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple TitleStyle" sectionFile="ui/MultipleTitleStyle.xwt">

-			<widget href="ui/MultipleTitleStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple SortingStyle" sectionFile="ui/MultipleSortingStyle.xwt">

-			<widget href="ui/MultipleSortingStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple DescriptionStyle" sectionFile="ui/MultipleDescriptionStyle.xwt">

-			<widget href="ui/MultipleDescriptionStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple LayoutConstraint" sectionFile="ui/MultipleLayoutConstraint.xwt">

-			<widget href="ui/MultipleLayoutConstraint.xwt#/" />

-		</sections>

-		<sections name="Multiple Size" sectionFile="ui/MultipleSize.xwt">

-			<widget href="ui/MultipleSize.xwt#/" />

-		</sections>

-		<sections name="Multiple Location" sectionFile="ui/MultipleLocation.xwt">

-			<widget href="ui/MultipleLocation.xwt#/" />

-		</sections>

-		<sections name="Multiple Bounds" sectionFile="ui/MultipleBounds.xwt">

-			<widget href="ui/MultipleBounds.xwt#/" />

-		</sections>

-		<sections name="Multiple Ratio" sectionFile="ui/MultipleRatio.xwt">

-			<widget href="ui/MultipleRatio.xwt#/" />

-		</sections>

-		<sections name="Multiple Anchor" sectionFile="ui/MultipleAnchor.xwt">

-			<widget href="ui/MultipleAnchor.xwt#/" />

-		</sections>

-		<sections name="Multiple Bendpoints" sectionFile="ui/MultipleBendpoints.xwt">

-			<widget href="ui/MultipleBendpoints.xwt#/" />

-		</sections>

-		<sections name="Multiple IdentityAnchor" sectionFile="ui/MultipleIdentityAnchor.xwt">

-			<widget href="ui/MultipleIdentityAnchor.xwt#/" />

-		</sections>

-		<sections name="Multiple RoutingStyle" sectionFile="ui/MultipleRoutingStyle.xwt">

-			<widget href="ui/MultipleRoutingStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple View" sectionFile="ui/MultipleView.xwt">

-			<widget href="ui/MultipleView.xwt#/" />

-		</sections>

-		<sections name="Multiple RelativeBendpoints" sectionFile="ui/MultipleRelativeBendpoints.xwt">

-			<widget href="ui/MultipleRelativeBendpoints.xwt#/" />

-		</sections>

-		<sections name="Multiple Diagram" sectionFile="ui/MultipleDiagram.xwt">

-			<widget href="ui/MultipleDiagram.xwt#/" />

-		</sections>

-		<sections name="Multiple Image" sectionFile="ui/MultipleImage.xwt">

-			<widget href="ui/MultipleImage.xwt#/" />

-		</sections>

-		<sections name="Multiple CanonicalStyle" sectionFile="ui/MultipleCanonicalStyle.xwt">

-			<widget href="ui/MultipleCanonicalStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple ConnectorStyle" sectionFile="ui/MultipleConnectorStyle.xwt">

-			<widget href="ui/MultipleConnectorStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple PageStyle" sectionFile="ui/MultiplePageStyle.xwt">

-			<widget href="ui/MultiplePageStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple DrawerStyle" sectionFile="ui/MultipleDrawerStyle.xwt">

-			<widget href="ui/MultipleDrawerStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple GuideStyle" sectionFile="ui/MultipleGuideStyle.xwt">

-			<widget href="ui/MultipleGuideStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple Guide" sectionFile="ui/MultipleGuide.xwt">

-			<widget href="ui/MultipleGuide.xwt#/" />

-		</sections>

-		<sections name="Multiple NodeEntry" sectionFile="ui/MultipleNodeEntry.xwt">

-			<widget href="ui/MultipleNodeEntry.xwt#/" />

-		</sections>

-		<sections name="Multiple FilteringStyle" sectionFile="ui/MultipleFilteringStyle.xwt">

-			<widget href="ui/MultipleFilteringStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple DiagramStyle" sectionFile="ui/MultipleDiagramStyle.xwt">

-			<widget href="ui/MultipleDiagramStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple ImageStyle" sectionFile="ui/MultipleImageStyle.xwt">

-			<widget href="ui/MultipleImageStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple ImageBufferStyle" sectionFile="ui/MultipleImageBufferStyle.xwt">

-			<widget href="ui/MultipleImageBufferStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple PropertiesSetStyle" sectionFile="ui/MultiplePropertiesSetStyle.xwt">

-			<widget href="ui/MultiplePropertiesSetStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple StringToPropertyValueMapEntry"

-			sectionFile="ui/MultipleStringToPropertyValueMapEntry.xwt">

-			<widget href="ui/MultipleStringToPropertyValueMapEntry.xwt#/" />

-		</sections>

-		<sections name="Multiple PropertyValue" sectionFile="ui/MultiplePropertyValue.xwt">

-			<widget href="ui/MultiplePropertyValue.xwt#/" />

-		</sections>

-		<sections name="Multiple SingleValueStyle" sectionFile="ui/MultipleSingleValueStyle.xwt">

-			<widget href="ui/MultipleSingleValueStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple ListValueStyle" sectionFile="ui/MultipleListValueStyle.xwt">

-			<widget href="ui/MultipleListValueStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple NamedStyle" sectionFile="ui/MultipleNamedStyle.xwt">

-			<widget href="ui/MultipleNamedStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple StringObjectConverter" sectionFile="ui/MultipleStringObjectConverter.xwt">

-			<widget href="ui/MultipleStringObjectConverter.xwt#/" />

-		</sections>

-		<sections name="Multiple DataTypeStyle" sectionFile="ui/MultipleDataTypeStyle.xwt">

-			<widget href="ui/MultipleDataTypeStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple IntValueStyle" sectionFile="ui/MultipleIntValueStyle.xwt">

-			<widget href="ui/MultipleIntValueStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple IntListValueStyle" sectionFile="ui/MultipleIntListValueStyle.xwt">

-			<widget href="ui/MultipleIntListValueStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple BooleanValueStyle" sectionFile="ui/MultipleBooleanValueStyle.xwt">

-			<widget href="ui/MultipleBooleanValueStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple DoubleValueStyle" sectionFile="ui/MultipleDoubleValueStyle.xwt">

-			<widget href="ui/MultipleDoubleValueStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple DoubleListValueStyle" sectionFile="ui/MultipleDoubleListValueStyle.xwt">

-			<widget href="ui/MultipleDoubleListValueStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple StringValueStyle" sectionFile="ui/MultipleStringValueStyle.xwt">

-			<widget href="ui/MultipleStringValueStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple StringListValueStyle" sectionFile="ui/MultipleStringListValueStyle.xwt">

-			<widget href="ui/MultipleStringListValueStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple EObjectValueStyle" sectionFile="ui/MultipleEObjectValueStyle.xwt">

-			<widget href="ui/MultipleEObjectValueStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple EObjectListValueStyle" sectionFile="ui/MultipleEObjectListValueStyle.xwt">

-			<widget href="ui/MultipleEObjectListValueStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple ByteArrayValueStyle" sectionFile="ui/MultipleByteArrayValueStyle.xwt">

-			<widget href="ui/MultipleByteArrayValueStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple BooleanListValueStyle" sectionFile="ui/MultipleBooleanListValueStyle.xwt">

-			<widget href="ui/MultipleBooleanListValueStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple HintedDiagramLinkStyle" sectionFile="ui/MultipleHintedDiagramLinkStyle.xwt">

-			<widget href="ui/MultipleHintedDiagramLinkStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple DiagramLinkStyle" sectionFile="ui/MultipleDiagramLinkStyle.xwt">

-			<widget href="ui/MultipleDiagramLinkStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple MultiDiagramLinkStyle" sectionFile="ui/MultipleMultiDiagramLinkStyle.xwt">

-			<widget href="ui/MultipleMultiDiagramLinkStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple TextStyle" sectionFile="ui/MultipleTextStyle.xwt">

-			<widget href="ui/MultipleTextStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple LineTypeStyle" sectionFile="ui/MultipleLineTypeStyle.xwt">

-			<widget href="ui/MultipleLineTypeStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple ArrowStyle" sectionFile="ui/MultipleArrowStyle.xwt">

-			<widget href="ui/MultipleArrowStyle.xwt#/" />

-		</sections>

-		<sections name="Multiple Shape" sectionFile="ui/MultipleShape.xwt">

-			<widget href="ui/MultipleShape.xwt#/" />

-		</sections>

-		<sections name="Multiple Compartment" sectionFile="ui/MultipleCompartment.xwt">

-			<widget href="ui/MultipleCompartment.xwt#/" />

-		</sections>

-		<sections name="Multiple ListCompartment" sectionFile="ui/MultipleListCompartment.xwt">

-			<widget href="ui/MultipleListCompartment.xwt#/" />

-		</sections>

-		<sections name="Multiple Connector" sectionFile="ui/MultipleConnector.xwt">

-			<widget href="ui/MultipleConnector.xwt#/" />

-		</sections>

-		<sections name="Multiple StandardDiagram" sectionFile="ui/MultipleStandardDiagram.xwt">

-			<widget href="ui/MultipleStandardDiagram.xwt#/" />

-		</sections>

-		<sections name="Multiple DecorationNode" sectionFile="ui/MultipleDecorationNode.xwt">

-			<widget href="ui/MultipleDecorationNode.xwt#/" />

-		</sections>

-		<sections name="Multiple BasicDecorationNode" sectionFile="ui/MultipleBasicDecorationNode.xwt">

-			<widget href="ui/MultipleBasicDecorationNode.xwt#/" />

-		</sections>

-		<sections name="Multiple BasicCompartment" sectionFile="ui/MultipleBasicCompartment.xwt">

-			<widget href="ui/MultipleBasicCompartment.xwt#/" />

-		</sections>

-		<sections name="Multiple BasicSemanticCompartment"

-			sectionFile="ui/MultipleBasicSemanticCompartment.xwt">

-			<widget href="ui/MultipleBasicSemanticCompartment.xwt#/" />

-		</sections>

-		<sections name="Multiple SemanticListCompartment"

-			sectionFile="ui/MultipleSemanticListCompartment.xwt">

-			<widget href="ui/MultipleSemanticListCompartment.xwt#/" />

-		</sections>

-		<sections name="SingleGradientData" sectionFile="ui/SingleGradientData.xwt">

-			<widget href="ui/SingleGradientData.xwt#/" />

-		</sections>

-	</tabs>

-	<views name="Single Diagram" sections="//@tabs.0/@sections.20"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.20">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleDiagram">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Diagram" />

-		</constraints>

-	</views>

-	<views name="Single Edge" sections="//@tabs.0/@sections.0"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleEdge">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Edge" />

-		</constraints>

-	</views>

-	<views name="Single Node" sections="//@tabs.0/@sections.1"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleNode">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Node" />

-		</constraints>

-	</views>

-	<views name="Single Style" sections="//@tabs.0/@sections.2"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Style" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="FillStyle" sections="//@tabs.0/@sections.3"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.3">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isFillStyle"

-			overrideable="false">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="FillStyle" />

-		</constraints>

-	</views>

-	<views name="LineStyle" sections="//@tabs.0/@sections.4"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.4">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isLineStyle"

-			overrideable="false">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="LineStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="FontStyle" sections="//@tabs.0/@sections.5"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.5">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isFontStyle"

-			overrideable="false">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="FontStyle" />

-		</constraints>

-	</views>

-	<views name="Single TitleStyle" sections="//@tabs.0/@sections.6"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleTitleStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="TitleStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single SortingStyle" sections="//@tabs.0/@sections.7"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleSortingStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="SortingStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single DescriptionStyle" sections="//@tabs.0/@sections.8"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleDescriptionStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DescriptionStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single LayoutConstraint" sections="//@tabs.0/@sections.9"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.9">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleLayoutConstraint">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="LayoutConstraint" />

-		</constraints>

-	</views>

-	<views name="Single Size" sections="//@tabs.0/@sections.10"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.10">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleSize">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Size" />

-		</constraints>

-	</views>

-	<views name="Single Location" sections="//@tabs.0/@sections.11"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.11">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleLocation">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Location" />

-		</constraints>

-	</views>

-	<views name="Single Bounds" sections="//@tabs.0/@sections.12"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.12">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleBounds">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Bounds" />

-		</constraints>

-	</views>

-	<views name="Single Ratio" sections="//@tabs.0/@sections.13"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.13">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleRatio">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Ratio" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single Anchor" sections="//@tabs.0/@sections.14"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.14">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleAnchor">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Anchor" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single Bendpoints" sections="//@tabs.0/@sections.15"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.15">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleBendpoints">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Bendpoints" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single IdentityAnchor" sections="//@tabs.0/@sections.16"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.16">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleIdentityAnchor">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="IdentityAnchor" />

-		</constraints>

-	</views>

-	<views name="Single RoutingStyle" sections="//@tabs.0/@sections.17"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.17">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleRoutingStyle"

-			overrideable="false" overriddenConstraints="//@views.84/@constraints.0">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="RoutingStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single View" sections="//@tabs.0/@sections.18"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.18">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleView">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="View" />

-		</constraints>

-	</views>

-	<views name="Single RelativeBendpoints" sections="//@tabs.0/@sections.19"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.19">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleRelativeBendpoints">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="RelativeBendpoints" />

-		</constraints>

-	</views>

-	<views name="Single Image" sections="//@tabs.0/@sections.21"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.21">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleImage">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Image" />

-		</constraints>

-	</views>

-	<views name="Single CanonicalStyle" sections="//@tabs.0/@sections.22"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.22">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleCanonicalStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="CanonicalStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single ShapeStyle" sections="//@tabs.0/@sections.23"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.23">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isShapeStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ShapeStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single ConnectorStyle" sections="//@tabs.0/@sections.24"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.24">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleConnectorStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ConnectorStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single PageStyle" sections="//@tabs.0/@sections.25"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.25">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSinglePageStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="PageStyle" />

-		</constraints>

-	</views>

-	<views name="Single DrawerStyle" sections="//@tabs.0/@sections.26"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.26">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleDrawerStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DrawerStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single GuideStyle" sections="//@tabs.0/@sections.27"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.27">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleGuideStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="GuideStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single Guide" sections="//@tabs.0/@sections.28"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.28">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleGuide">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Guide" />

-		</constraints>

-	</views>

-	<views name="Single NodeEntry" sections="//@tabs.0/@sections.29"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.29">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleNodeEntry">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="NodeEntry" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single FilteringStyle" sections="//@tabs.0/@sections.30"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.30">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleFilteringStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="FilteringStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single DiagramStyle" sections="//@tabs.0/@sections.31"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.31">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleDiagramStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DiagramStyle" />

-		</constraints>

-	</views>

-	<views name="Single ImageStyle" sections="//@tabs.0/@sections.32"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.32">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleImageStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ImageStyle" />

-		</constraints>

-	</views>

-	<views name="Single ImageBufferStyle" sections="//@tabs.0/@sections.33"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.33">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleImageBufferStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ImageBufferStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single PropertiesSetStyle" sections="//@tabs.0/@sections.34"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.34">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSinglePropertiesSetStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="PropertiesSetStyle" />

-		</constraints>

-	</views>

-	<views name="Single StringToPropertyValueMapEntry" sections="//@tabs.0/@sections.35"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.35">

-		<constraints xsi:type="constraints:SimpleConstraint"

-			name="isSingleStringToPropertyValueMapEntry">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="StringToPropertyValueMapEntry" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single PropertyValue" sections="//@tabs.0/@sections.36"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.36">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSinglePropertyValue">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="PropertyValue" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single SingleValueStyle" sections="//@tabs.0/@sections.37"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.37">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleSingleValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="SingleValueStyle" />

-		</constraints>

-	</views>

-	<views name="Single ListValueStyle" sections="//@tabs.0/@sections.38"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.38">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleListValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ListValueStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single NamedStyle" sections="//@tabs.0/@sections.39"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.39">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleNamedStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="NamedStyle" />

-		</constraints>

-	</views>

-	<views name="Single StringObjectConverter" sections="//@tabs.0/@sections.40"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.40">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleStringObjectConverter">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="StringObjectConverter" />

-		</constraints>

-	</views>

-	<views name="Single DataTypeStyle" sections="//@tabs.0/@sections.41"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.41">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleDataTypeStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DataTypeStyle" />

-		</constraints>

-	</views>

-	<views name="Single IntValueStyle" sections="//@tabs.0/@sections.42"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.42">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleIntValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="IntValueStyle" />

-		</constraints>

-	</views>

-	<views name="Single IntListValueStyle" sections="//@tabs.0/@sections.43"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.43">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleIntListValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="IntListValueStyle" />

-		</constraints>

-	</views>

-	<views name="Single BooleanValueStyle" sections="//@tabs.0/@sections.44"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.44">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleBooleanValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="BooleanValueStyle" />

-		</constraints>

-	</views>

-	<views name="Single DoubleValueStyle" sections="//@tabs.0/@sections.45"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.45">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleDoubleValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DoubleValueStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single DoubleListValueStyle" sections="//@tabs.0/@sections.46"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.46">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleDoubleListValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DoubleListValueStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single StringValueStyle" sections="//@tabs.0/@sections.47"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.47">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleStringValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="StringValueStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single StringListValueStyle" sections="//@tabs.0/@sections.48"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.48">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleStringListValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="StringListValueStyle" />

-		</constraints>

-	</views>

-	<views name="Single EObjectValueStyle" sections="//@tabs.0/@sections.49"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.49">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleEObjectValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="EObjectValueStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single EObjectListValueStyle" sections="//@tabs.0/@sections.50"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.50">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleEObjectListValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="EObjectListValueStyle" />

-		</constraints>

-	</views>

-	<views name="Single ByteArrayValueStyle" sections="//@tabs.0/@sections.51"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.51">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleByteArrayValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ByteArrayValueStyle" />

-		</constraints>

-	</views>

-	<views name="Single BooleanListValueStyle" sections="//@tabs.0/@sections.52"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.52">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleBooleanListValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="BooleanListValueStyle" />

-		</constraints>

-	</views>

-	<views name="Single HintedDiagramLinkStyle" sections="//@tabs.0/@sections.53"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.53">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleHintedDiagramLinkStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="HintedDiagramLinkStyle" />

-		</constraints>

-	</views>

-	<views name="Single DiagramLinkStyle" sections="//@tabs.0/@sections.54"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.54">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleDiagramLinkStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DiagramLinkStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single MultiDiagramLinkStyle" sections="//@tabs.0/@sections.55"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.55">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleMultiDiagramLinkStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="MultiDiagramLinkStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single TextStyle" sections="//@tabs.0/@sections.56"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.56">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleTextStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="TextStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single LineTypeStyle" sections="//@tabs.0/@sections.57"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.57">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleLineTypeStyle"

-			overrideable="false">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="LineTypeStyle" />

-		</constraints>

-	</views>

-	<views name="Single ArrowStyle" sections="//@tabs.0/@sections.58"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.58">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleArrowStyle"

-			overrideable="false">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ArrowStyle" />

-		</constraints>

-	</views>

-	<views name="Single Shape" sections="//@tabs.0/@sections.59"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.59">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleShape">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Shape" />

-		</constraints>

-	</views>

-	<views name="Single Compartment" sections="//@tabs.0/@sections.60"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.60">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleCompartment">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Compartment" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single ListCompartment" sections="//@tabs.0/@sections.61"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.61">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleListCompartment">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ListCompartment" />

-		</constraints>

-	</views>

-	<views name="Single Connector" sections="//@tabs.0/@sections.62"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.62">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleConnector">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Connector" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single StandardDiagram" sections="//@tabs.0/@sections.63"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.63">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleStandardDiagram">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="StandardDiagram" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single DecorationNode" sections="//@tabs.0/@sections.64"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.64">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleDecorationNode">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DecorationNode" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single BasicDecorationNode" sections="//@tabs.0/@sections.65"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.65">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleBasicDecorationNode">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="BasicDecorationNode" />

-		</constraints>

-	</views>

-	<views name="Single BasicCompartment" sections="//@tabs.0/@sections.66"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.66">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleBasicCompartment">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="BasicCompartment" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single BasicSemanticCompartment" sections="//@tabs.0/@sections.67"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.67">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleBasicSemanticCompartment">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="BasicSemanticCompartment" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Single SemanticListCompartment" sections="//@tabs.0/@sections.68"

-		automaticContext="true" datacontexts="//@dataContexts.0/@elements.68">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleSemanticListCompartment">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="SemanticListCompartment" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="RoundedCornersStyle" sections="//@tabs.0/@sections.69"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.69">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isRoundedCornersStyle"

-			overrideable="false">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="RoundedCornersStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple Edge" sections="//@tabs.0/@sections.70"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.0">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleEdge">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Edge" />

-		</constraints>

-	</views>

-	<views name="Multiple Node" sections="//@tabs.0/@sections.71"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.1">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleNode">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Node" />

-		</constraints>

-	</views>

-	<views name="Multiple Style" sections="//@tabs.0/@sections.72"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.2">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Style" />

-		</constraints>

-	</views>

-	<views name="Multiple TitleStyle" sections="//@tabs.0/@sections.73"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.6">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleTitleStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="TitleStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple SortingStyle" sections="//@tabs.0/@sections.74"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.7">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleSortingStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="SortingStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple DescriptionStyle" sections="//@tabs.0/@sections.75"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.8">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDescriptionStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DescriptionStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple LayoutConstraint" sections="//@tabs.0/@sections.76"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.9">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleLayoutConstraint">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="LayoutConstraint" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple Size" sections="//@tabs.0/@sections.77"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.10">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleSize">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Size" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple Location" sections="//@tabs.0/@sections.78"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.11">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleLocation">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Location" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple Bounds" sections="//@tabs.0/@sections.79"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.12">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleBounds">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Bounds" />

-		</constraints>

-	</views>

-	<views name="Multiple Ratio" sections="//@tabs.0/@sections.80"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.13">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleRatio">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Ratio" />

-		</constraints>

-	</views>

-	<views name="Multiple Anchor" sections="//@tabs.0/@sections.81"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.14">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleAnchor">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Anchor" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple Bendpoints" sections="//@tabs.0/@sections.82"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.15">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleBendpoints">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Bendpoints" />

-		</constraints>

-	</views>

-	<views name="Multiple IdentityAnchor" sections="//@tabs.0/@sections.83"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.16">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleIdentityAnchor">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="IdentityAnchor" />

-		</constraints>

-	</views>

-	<views name="Multiple RoutingStyle" sections="//@tabs.0/@sections.84"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.17">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleRoutingStyle"

-			overrideable="false">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="RoutingStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple View" sections="//@tabs.0/@sections.85"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.18">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleView">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="View" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple RelativeBendpoints" sections="//@tabs.0/@sections.86"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.19">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleRelativeBendpoints">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="RelativeBendpoints" />

-		</constraints>

-	</views>

-	<views name="Multiple Diagram" sections="//@tabs.0/@sections.87"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.20">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDiagram">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Diagram" />

-		</constraints>

-	</views>

-	<views name="Multiple Image" sections="//@tabs.0/@sections.88"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.21">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleImage">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Image" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple CanonicalStyle" sections="//@tabs.0/@sections.89"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.22">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleCanonicalStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="CanonicalStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple ConnectorStyle" sections="//@tabs.0/@sections.90"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.24">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleConnectorStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ConnectorStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple PageStyle" sections="//@tabs.0/@sections.91"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.25">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultiplePageStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="PageStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple DrawerStyle" sections="//@tabs.0/@sections.92"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.26">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDrawerStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DrawerStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple GuideStyle" sections="//@tabs.0/@sections.93"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.27">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleGuideStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="GuideStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple Guide" sections="//@tabs.0/@sections.94"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.28">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleGuide">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Guide" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple NodeEntry" sections="//@tabs.0/@sections.95"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.29">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleNodeEntry">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="NodeEntry" />

-		</constraints>

-	</views>

-	<views name="Multiple FilteringStyle" sections="//@tabs.0/@sections.96"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.30">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleFilteringStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="FilteringStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple DiagramStyle" sections="//@tabs.0/@sections.97"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.31">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDiagramStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DiagramStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple ImageStyle" sections="//@tabs.0/@sections.98"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.32">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleImageStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ImageStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple ImageBufferStyle" sections="//@tabs.0/@sections.99"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.33">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleImageBufferStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ImageBufferStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple PropertiesSetStyle" sections="//@tabs.0/@sections.100"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.34">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultiplePropertiesSetStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="PropertiesSetStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple StringToPropertyValueMapEntry" sections="//@tabs.0/@sections.101"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.35">

-		<constraints xsi:type="constraints:SimpleConstraint"

-			name="isMultipleStringToPropertyValueMapEntry">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="StringToPropertyValueMapEntry" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple PropertyValue" sections="//@tabs.0/@sections.102"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.36">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultiplePropertyValue">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="PropertyValue" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple SingleValueStyle" sections="//@tabs.0/@sections.103"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.37">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleSingleValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="SingleValueStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple ListValueStyle" sections="//@tabs.0/@sections.104"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.38">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleListValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ListValueStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple NamedStyle" sections="//@tabs.0/@sections.105"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.39">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleNamedStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="NamedStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple StringObjectConverter" sections="//@tabs.0/@sections.106"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.40">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleStringObjectConverter">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="StringObjectConverter" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple DataTypeStyle" sections="//@tabs.0/@sections.107"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.41">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDataTypeStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DataTypeStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple IntValueStyle" sections="//@tabs.0/@sections.108"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.42">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleIntValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="IntValueStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple IntListValueStyle" sections="//@tabs.0/@sections.109"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.43">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleIntListValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="IntListValueStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple BooleanValueStyle" sections="//@tabs.0/@sections.110"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.44">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleBooleanValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="BooleanValueStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple DoubleValueStyle" sections="//@tabs.0/@sections.111"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.45">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDoubleValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DoubleValueStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple DoubleListValueStyle" sections="//@tabs.0/@sections.112"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.46">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDoubleListValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DoubleListValueStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple StringValueStyle" sections="//@tabs.0/@sections.113"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.47">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleStringValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="StringValueStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple StringListValueStyle" sections="//@tabs.0/@sections.114"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.48">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleStringListValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="StringListValueStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple EObjectValueStyle" sections="//@tabs.0/@sections.115"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.49">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleEObjectValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="EObjectValueStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple EObjectListValueStyle" sections="//@tabs.0/@sections.116"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.50">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleEObjectListValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="EObjectListValueStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple ByteArrayValueStyle" sections="//@tabs.0/@sections.117"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.51">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleByteArrayValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ByteArrayValueStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple BooleanListValueStyle" sections="//@tabs.0/@sections.118"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.52">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleBooleanListValueStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="BooleanListValueStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple HintedDiagramLinkStyle" sections="//@tabs.0/@sections.119"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.53">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleHintedDiagramLinkStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="HintedDiagramLinkStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple DiagramLinkStyle" sections="//@tabs.0/@sections.120"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.54">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDiagramLinkStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DiagramLinkStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple MultiDiagramLinkStyle" sections="//@tabs.0/@sections.121"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.55">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleMultiDiagramLinkStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="MultiDiagramLinkStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple TextStyle" sections="//@tabs.0/@sections.122"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.56">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleTextStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="TextStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple LineTypeStyle" sections="//@tabs.0/@sections.123"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.57">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleLineTypeStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="LineTypeStyle" />

-		</constraints>

-	</views>

-	<views name="Multiple ArrowStyle" sections="//@tabs.0/@sections.124"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.58">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleArrowStyle">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ArrowStyle" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple Shape" sections="//@tabs.0/@sections.125"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.59">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleShape">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Shape" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple Compartment" sections="//@tabs.0/@sections.126"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.60">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleCompartment">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Compartment" />

-		</constraints>

-	</views>

-	<views name="Multiple ListCompartment" sections="//@tabs.0/@sections.127"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.61">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleListCompartment">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="ListCompartment" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple Connector" sections="//@tabs.0/@sections.128"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.62">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleConnector">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="Connector" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple StandardDiagram" sections="//@tabs.0/@sections.129"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.63">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleStandardDiagram">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="StandardDiagram" />

-		</constraints>

-	</views>

-	<views name="Multiple DecorationNode" sections="//@tabs.0/@sections.130"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.64">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDecorationNode">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="DecorationNode" />

-		</constraints>

-	</views>

-	<views name="Multiple BasicDecorationNode" sections="//@tabs.0/@sections.131"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.65">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleBasicDecorationNode">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="BasicDecorationNode" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple BasicCompartment" sections="//@tabs.0/@sections.132"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.66">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleBasicCompartment">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="BasicCompartment" />

-		</constraints>

-	</views>

-	<views name="Multiple BasicSemanticCompartment" sections="//@tabs.0/@sections.133"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.67">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleBasicSemanticCompartment">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="BasicSemanticCompartment" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-		</constraints>

-	</views>

-	<views name="Multiple SemanticListCompartment" sections="//@tabs.0/@sections.134"

-		elementMultiplicity="-1" automaticContext="true"

-		datacontexts="//@dataContexts.0/@elements.68">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleSemanticListCompartment">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0" />

-			<properties xsi:type="constraints:ValueProperty" name="nsUri"

-				value="http://www.eclipse.org/gmf/runtime/1.0.2/notation" />

-			<properties xsi:type="constraints:ValueProperty" name="className"

-				value="SemanticListCompartment" />

-		</constraints>

-	</views>

-	<views name="SingleGradientData" sections="//@tabs.0/@sections.135">

-		<constraints xsi:type="constraints:SimpleConstraint" name="isGradientData">

-			<constraintType

-				href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.3" />

-			<properties xsi:type="constraints:ValueProperty" name="class"

-				value="org.eclipse.gmf.runtime.notation.datatype.GradientData" />

-		</constraints>

-	</views>

-	<dataContexts name="notation" label="notation">

-		<elements name="Edge" supertypes="//@dataContexts.0/@elements.18">

-			<properties name="source" type="Reference" />

-			<properties name="target" type="Reference" />

-			<properties name="bendpoints" type="Reference" />

-			<properties name="sourceAnchor" type="Reference" />

-			<properties name="targetAnchor" type="Reference" />

-		</elements>

-		<elements name="Node" supertypes="//@dataContexts.0/@elements.18">

-			<properties name="layoutConstraint" type="Reference" />

-		</elements>

-		<elements name="Style" />

-		<elements name="FillStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="fillColor" type="Integer" />

-			<properties name="transparency" type="Integer" />

-			<properties name="gradient" type="Reference" />

-		</elements>

-		<elements name="LineStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="lineColor" type="Integer" />

-			<properties name="lineWidth" type="Integer" />

-		</elements>

-		<elements name="FontStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="fontColor" type="Integer" />

-			<properties name="fontName" />

-			<properties name="fontHeight" type="Integer" />

-			<properties name="bold" type="Boolean" />

-			<properties name="italic" type="Boolean" />

-			<properties name="underline" type="Boolean" />

-			<properties name="strikeThrough" type="Boolean" />

-		</elements>

-		<elements name="TitleStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="showTitle" type="Boolean" />

-		</elements>

-		<elements name="SortingStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="sorting" type="Enumeration" />

-			<properties name="sortingKeys" />

-			<properties name="sortedObjects" type="Reference"

-				multiplicity="-1" />

-		</elements>

-		<elements name="DescriptionStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="description" />

-		</elements>

-		<elements name="LayoutConstraint" />

-		<elements name="Size" supertypes="//@dataContexts.0/@elements.9">

-			<properties name="width" type="Integer" />

-			<properties name="height" type="Integer" />

-		</elements>

-		<elements name="Location" supertypes="//@dataContexts.0/@elements.9">

-			<properties name="x" type="Integer" />

-			<properties name="y" type="Integer" />

-		</elements>

-		<elements name="Bounds"

-			supertypes="//@dataContexts.0/@elements.11 //@dataContexts.0/@elements.10" />

-		<elements name="Ratio" supertypes="//@dataContexts.0/@elements.9">

-			<properties name="value" />

-		</elements>

-		<elements name="Anchor" />

-		<elements name="Bendpoints" />

-		<elements name="IdentityAnchor" supertypes="//@dataContexts.0/@elements.14">

-			<properties name="id" />

-		</elements>

-		<elements name="RoutingStyle" supertypes="//@dataContexts.0/@elements.69">

-			<properties name="routing" type="Enumeration" />

-			<properties name="smoothness" type="Enumeration" />

-			<properties name="avoidObstructions" type="Boolean" />

-			<properties name="closestDistance" type="Boolean" />

-			<properties name="jumpLinkStatus" type="Enumeration" />

-			<properties name="jumpLinkType" type="Enumeration" />

-			<properties name="jumpLinksReverse" type="Boolean" />

-		</elements>

-		<elements name="View">

-			<properties name="visible" type="Boolean" />

-			<properties name="type" />

-			<properties name="mutable" type="Boolean" />

-			<properties name="sourceEdges" type="Reference"

-				multiplicity="-1" />

-			<properties name="targetEdges" type="Reference"

-				multiplicity="-1" />

-			<properties name="persistedChildren" type="Reference"

-				multiplicity="-1" />

-			<properties name="styles" type="Reference" multiplicity="-1" />

-			<properties name="element" type="Reference" />

-			<properties name="diagram" type="Reference" />

-			<properties name="transientChildren" type="Reference"

-				multiplicity="-1" />

-		</elements>

-		<elements name="RelativeBendpoints" supertypes="//@dataContexts.0/@elements.15">

-			<properties name="points" />

-		</elements>

-		<elements name="Diagram" supertypes="//@dataContexts.0/@elements.18">

-			<properties name="name" label="Name" />

-			<properties name="measurementUnit" type="Enumeration" />

-			<properties name="persistedEdges" type="Reference"

-				multiplicity="-1" />

-			<properties name="TransientEdges" type="Reference"

-				multiplicity="-1" />

-		</elements>

-		<elements name="Image">

-			<properties name="data" />

-		</elements>

-		<elements name="CanonicalStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="canonical" type="Boolean" />

-		</elements>

-		<elements name="ShapeStyle"

-			supertypes="//@dataContexts.0/@elements.5 //@dataContexts.0/@elements.8 //@dataContexts.0/@elements.3 //@dataContexts.0/@elements.4 //@dataContexts.0/@elements.69" />

-		<elements name="ConnectorStyle"

-			supertypes="//@dataContexts.0/@elements.17 //@dataContexts.0/@elements.4" />

-		<elements name="PageStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="pageX" type="Integer" />

-			<properties name="pageY" type="Integer" />

-			<properties name="pageWidth" type="Integer" />

-			<properties name="pageHeight" type="Integer" />

-		</elements>

-		<elements name="DrawerStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="collapsed" type="Boolean" />

-		</elements>

-		<elements name="GuideStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="horizontalGuides" type="Reference"

-				multiplicity="-1" />

-			<properties name="verticalGuides" type="Reference"

-				multiplicity="-1" />

-		</elements>

-		<elements name="Guide">

-			<properties name="position" type="Integer" />

-			<properties name="nodeMap" type="Reference" multiplicity="-1" />

-		</elements>

-		<elements name="NodeEntry">

-			<properties name="value" type="Enumeration" />

-			<properties name="key" type="Reference" />

-		</elements>

-		<elements name="FilteringStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="filtering" type="Enumeration" />

-			<properties name="filteringKeys" />

-			<properties name="filteredObjects" type="Reference"

-				multiplicity="-1" />

-		</elements>

-		<elements name="DiagramStyle"

-			supertypes="//@dataContexts.0/@elements.25 //@dataContexts.0/@elements.27 //@dataContexts.0/@elements.8" />

-		<elements name="ImageStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="antiAlias" />

-			<properties name="maintainAspectRatio" />

-			<properties name="cropBound" type="Reference" />

-		</elements>

-		<elements name="ImageBufferStyle" supertypes="//@dataContexts.0/@elements.32">

-			<properties name="imageBuffer" type="Reference" />

-		</elements>

-		<elements name="PropertiesSetStyle" supertypes="//@dataContexts.0/@elements.39">

-			<properties name="propertiesMap" type="Reference"

-				multiplicity="-1" />

-		</elements>

-		<elements name="StringToPropertyValueMapEntry">

-			<properties name="key" />

-			<properties name="value" type="Reference" />

-		</elements>

-		<elements name="PropertyValue" supertypes="//@dataContexts.0/@elements.40">

-			<properties name="rawValue" />

-			<properties name="instanceType" type="Reference" />

-		</elements>

-		<elements name="SingleValueStyle" supertypes="//@dataContexts.0/@elements.41">

-			<properties name="rawValue" />

-		</elements>

-		<elements name="ListValueStyle" supertypes="//@dataContexts.0/@elements.41">

-			<properties name="rawValuesList" multiplicity="-1" />

-		</elements>

-		<elements name="NamedStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="name" />

-		</elements>

-		<elements name="StringObjectConverter" />

-		<elements name="DataTypeStyle"

-			supertypes="//@dataContexts.0/@elements.39 //@dataContexts.0/@elements.40">

-			<properties name="instanceType" type="Reference" />

-		</elements>

-		<elements name="IntValueStyle" supertypes="//@dataContexts.0/@elements.39">

-			<properties name="intValue" />

-		</elements>

-		<elements name="IntListValueStyle" supertypes="//@dataContexts.0/@elements.39">

-			<properties name="intListValue" multiplicity="-1" />

-		</elements>

-		<elements name="BooleanValueStyle" supertypes="//@dataContexts.0/@elements.39">

-			<properties name="booleanValue" />

-		</elements>

-		<elements name="DoubleValueStyle" supertypes="//@dataContexts.0/@elements.39">

-			<properties name="doubleValue" />

-		</elements>

-		<elements name="DoubleListValueStyle" supertypes="//@dataContexts.0/@elements.39">

-			<properties name="doubleListValue" multiplicity="-1" />

-		</elements>

-		<elements name="StringValueStyle" supertypes="//@dataContexts.0/@elements.39">

-			<properties name="stringValue" />

-		</elements>

-		<elements name="StringListValueStyle" supertypes="//@dataContexts.0/@elements.39">

-			<properties name="stringListValue" multiplicity="-1" />

-		</elements>

-		<elements name="EObjectValueStyle" supertypes="//@dataContexts.0/@elements.39">

-			<properties name="eObjectValue" type="Reference" />

-		</elements>

-		<elements name="EObjectListValueStyle" supertypes="//@dataContexts.0/@elements.39">

-			<properties name="eObjectListValue" type="Reference"

-				multiplicity="-1" />

-		</elements>

-		<elements name="ByteArrayValueStyle" supertypes="//@dataContexts.0/@elements.39">

-			<properties name="byteArrayValue" />

-		</elements>

-		<elements name="BooleanListValueStyle" supertypes="//@dataContexts.0/@elements.39">

-			<properties name="booleanListValue" multiplicity="-1" />

-		</elements>

-		<elements name="HintedDiagramLinkStyle"

-			supertypes="//@dataContexts.0/@elements.54 //@dataContexts.0/@elements.2">

-			<properties name="hint" />

-		</elements>

-		<elements name="DiagramLinkStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="diagramLink" type="Reference" />

-		</elements>

-		<elements name="MultiDiagramLinkStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="diagramLinks" type="Reference"

-				multiplicity="-1" />

-		</elements>

-		<elements name="TextStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="textAlignment" type="Enumeration" />

-		</elements>

-		<elements name="LineTypeStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="lineType" type="Enumeration" />

-		</elements>

-		<elements name="ArrowStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="arrowSource" type="Enumeration" />

-			<properties name="arrowTarget" type="Enumeration" />

-		</elements>

-		<elements name="Shape"

-			supertypes="//@dataContexts.0/@elements.1 //@dataContexts.0/@elements.23" />

-		<elements name="Compartment"

-			supertypes="//@dataContexts.0/@elements.66 //@dataContexts.0/@elements.22 //@dataContexts.0/@elements.6" />

-		<elements name="ListCompartment"

-			supertypes="//@dataContexts.0/@elements.66 //@dataContexts.0/@elements.7 //@dataContexts.0/@elements.30 //@dataContexts.0/@elements.6" />

-		<elements name="Connector"

-			supertypes="//@dataContexts.0/@elements.0 //@dataContexts.0/@elements.24" />

-		<elements name="StandardDiagram"

-			supertypes="//@dataContexts.0/@elements.20 //@dataContexts.0/@elements.31" />

-		<elements name="DecorationNode" supertypes="//@dataContexts.0/@elements.65" />

-		<elements name="BasicDecorationNode" supertypes="//@dataContexts.0/@elements.1" />

-		<elements name="BasicCompartment"

-			supertypes="//@dataContexts.0/@elements.64 //@dataContexts.0/@elements.26" />

-		<elements name="BasicSemanticCompartment"

-			supertypes="//@dataContexts.0/@elements.65 //@dataContexts.0/@elements.26" />

-		<elements name="SemanticListCompartment"

-			supertypes="//@dataContexts.0/@elements.67 //@dataContexts.0/@elements.7 //@dataContexts.0/@elements.30 //@dataContexts.0/@elements.6" />

-		<elements name="RoundedCornersStyle" supertypes="//@dataContexts.0/@elements.2">

-			<properties name="roundedBendpointsRadius" type="Integer" />

-		</elements>

-		<elements name="GradientData">

-			<properties name="gradientColor1" label="Gradient color"

-				type="Integer" />

-			<properties name="gradientColor2" label="Gradient color 2"

-				type="Integer" />

-			<properties name="gradientStyle" type="Enumeration" />

-			<properties name="activate" label="Activate" type="Boolean" />

-		</elements>

-		<modelElementFactory

-			href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.0" />

-	</dataContexts>

-</contexts:Context>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/notation.ctx b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/notation.ctx
new file mode 100644
index 00000000000..41490475b08
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/notation.ctx
@@ -0,0 +1,667 @@
+<?xml version="1.0" encoding="ASCII"?>

+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" name="notation">

+  <tabs label="Appearance" id="appearance" category="org.eclipse.papyrus" priority="75">

+    <sections name="Single Edge" sectionFile="ui/SingleEdge.xwt">

+      <widget href="ui/SingleEdge.xwt#/"/>

+    </sections>

+    <sections name="Single Node" sectionFile="ui/SingleNode.xwt">

+      <widget href="ui/SingleNode.xwt#/"/>

+    </sections>

+    <sections name="Single LayoutConstraint" sectionFile="ui/SingleLayoutConstraint.xwt">

+      <widget href="ui/SingleLayoutConstraint.xwt#/"/>

+    </sections>

+    <sections name="Single Size" sectionFile="ui/SingleSize.xwt">

+      <widget href="ui/SingleSize.xwt#/"/>

+    </sections>

+    <sections name="Single Location" sectionFile="ui/SingleLocation.xwt">

+      <widget href="ui/SingleLocation.xwt#/"/>

+    </sections>

+    <sections name="Single Bounds" sectionFile="ui/SingleBounds.xwt">

+      <widget href="ui/SingleBounds.xwt#/"/>

+    </sections>

+    <sections name="Single Ratio" sectionFile="ui/SingleRatio.xwt">

+      <widget href="ui/SingleRatio.xwt#/"/>

+    </sections>

+    <sections name="Single Anchor" sectionFile="ui/SingleAnchor.xwt">

+      <widget href="ui/SingleAnchor.xwt#/"/>

+    </sections>

+    <sections name="Single Bendpoints" sectionFile="ui/SingleBendpoints.xwt">

+      <widget href="ui/SingleBendpoints.xwt#/"/>

+    </sections>

+    <sections name="Single IdentityAnchor" sectionFile="ui/SingleIdentityAnchor.xwt">

+      <widget href="ui/SingleIdentityAnchor.xwt#/"/>

+    </sections>

+    <sections name="Single View" sectionFile="ui/SingleView.xwt">

+      <widget href="ui/SingleView.xwt#/"/>

+    </sections>

+    <sections name="Single RelativeBendpoints" sectionFile="ui/SingleRelativeBendpoints.xwt">

+      <widget href="ui/SingleRelativeBendpoints.xwt#/"/>

+    </sections>

+    <sections name="Single Diagram" sectionFile="ui/SingleDiagram.xwt">

+      <widget href="ui/SingleDiagram.xwt#/"/>

+    </sections>

+    <sections name="Single Image" sectionFile="ui/SingleImage.xwt">

+      <widget href="ui/SingleImage.xwt#/"/>

+    </sections>

+    <sections name="Single Guide" sectionFile="ui/SingleGuide.xwt">

+      <widget href="ui/SingleGuide.xwt#/"/>

+    </sections>

+    <sections name="Single NodeEntry" sectionFile="ui/SingleNodeEntry.xwt">

+      <widget href="ui/SingleNodeEntry.xwt#/"/>

+    </sections>

+    <sections name="Single StringToPropertyValueMapEntry" sectionFile="ui/SingleStringToPropertyValueMapEntry.xwt">

+      <widget href="ui/SingleStringToPropertyValueMapEntry.xwt#/"/>

+    </sections>

+    <sections name="Single PropertyValue" sectionFile="ui/SinglePropertyValue.xwt">

+      <widget href="ui/SinglePropertyValue.xwt#/"/>

+    </sections>

+    <sections name="Single StringObjectConverter" sectionFile="ui/SingleStringObjectConverter.xwt">

+      <widget href="ui/SingleStringObjectConverter.xwt#/"/>

+    </sections>

+    <sections name="Single Shape" sectionFile="ui/SingleShape.xwt">

+      <widget href="ui/SingleShape.xwt#/"/>

+    </sections>

+    <sections name="Single Compartment" sectionFile="ui/SingleCompartment.xwt">

+      <widget href="ui/SingleCompartment.xwt#/"/>

+    </sections>

+    <sections name="Single ListCompartment" sectionFile="ui/SingleListCompartment.xwt">

+      <widget href="ui/SingleListCompartment.xwt#/"/>

+    </sections>

+    <sections name="Single Connector" sectionFile="ui/SingleConnector.xwt">

+      <widget href="ui/SingleConnector.xwt#/"/>

+    </sections>

+    <sections name="Single StandardDiagram" sectionFile="ui/SingleStandardDiagram.xwt">

+      <widget href="ui/SingleStandardDiagram.xwt#/"/>

+    </sections>

+    <sections name="Single DecorationNode" sectionFile="ui/SingleDecorationNode.xwt">

+      <widget href="ui/SingleDecorationNode.xwt#/"/>

+    </sections>

+    <sections name="Single BasicDecorationNode" sectionFile="ui/SingleBasicDecorationNode.xwt">

+      <widget href="ui/SingleBasicDecorationNode.xwt#/"/>

+    </sections>

+    <sections name="Single BasicCompartment" sectionFile="ui/SingleBasicCompartment.xwt">

+      <widget href="ui/SingleBasicCompartment.xwt#/"/>

+    </sections>

+    <sections name="Single BasicSemanticCompartment" sectionFile="ui/SingleBasicSemanticCompartment.xwt">

+      <widget href="ui/SingleBasicSemanticCompartment.xwt#/"/>

+    </sections>

+    <sections name="Single SemanticListCompartment" sectionFile="ui/SingleSemanticListCompartment.xwt">

+      <widget href="ui/SingleSemanticListCompartment.xwt#/"/>

+    </sections>

+    <sections name="Multiple Edge" sectionFile="ui/MultipleEdge.xwt">

+      <widget href="ui/MultipleEdge.xwt#/"/>

+    </sections>

+    <sections name="Multiple Node" sectionFile="ui/MultipleNode.xwt">

+      <widget href="ui/MultipleNode.xwt#/"/>

+    </sections>

+    <sections name="Multiple LayoutConstraint" sectionFile="ui/MultipleLayoutConstraint.xwt">

+      <widget href="ui/MultipleLayoutConstraint.xwt#/"/>

+    </sections>

+    <sections name="Multiple Size" sectionFile="ui/MultipleSize.xwt">

+      <widget href="ui/MultipleSize.xwt#/"/>

+    </sections>

+    <sections name="Multiple Location" sectionFile="ui/MultipleLocation.xwt">

+      <widget href="ui/MultipleLocation.xwt#/"/>

+    </sections>

+    <sections name="Multiple Bounds" sectionFile="ui/MultipleBounds.xwt">

+      <widget href="ui/MultipleBounds.xwt#/"/>

+    </sections>

+    <sections name="Multiple Ratio" sectionFile="ui/MultipleRatio.xwt">

+      <widget href="ui/MultipleRatio.xwt#/"/>

+    </sections>

+    <sections name="Multiple Anchor" sectionFile="ui/MultipleAnchor.xwt">

+      <widget href="ui/MultipleAnchor.xwt#/"/>

+    </sections>

+    <sections name="Multiple Bendpoints" sectionFile="ui/MultipleBendpoints.xwt">

+      <widget href="ui/MultipleBendpoints.xwt#/"/>

+    </sections>

+    <sections name="Multiple IdentityAnchor" sectionFile="ui/MultipleIdentityAnchor.xwt">

+      <widget href="ui/MultipleIdentityAnchor.xwt#/"/>

+    </sections>

+    <sections name="Multiple View" sectionFile="ui/MultipleView.xwt">

+      <widget href="ui/MultipleView.xwt#/"/>

+    </sections>

+    <sections name="Multiple RelativeBendpoints" sectionFile="ui/MultipleRelativeBendpoints.xwt">

+      <widget href="ui/MultipleRelativeBendpoints.xwt#/"/>

+    </sections>

+    <sections name="Multiple Diagram" sectionFile="ui/MultipleDiagram.xwt">

+      <widget href="ui/MultipleDiagram.xwt#/"/>

+    </sections>

+    <sections name="Multiple Image" sectionFile="ui/MultipleImage.xwt">

+      <widget href="ui/MultipleImage.xwt#/"/>

+    </sections>

+    <sections name="Multiple Guide" sectionFile="ui/MultipleGuide.xwt">

+      <widget href="ui/MultipleGuide.xwt#/"/>

+    </sections>

+    <sections name="Multiple NodeEntry" sectionFile="ui/MultipleNodeEntry.xwt">

+      <widget href="ui/MultipleNodeEntry.xwt#/"/>

+    </sections>

+    <sections name="Multiple StringToPropertyValueMapEntry" sectionFile="ui/MultipleStringToPropertyValueMapEntry.xwt">

+      <widget href="ui/MultipleStringToPropertyValueMapEntry.xwt#/"/>

+    </sections>

+    <sections name="Multiple PropertyValue" sectionFile="ui/MultiplePropertyValue.xwt">

+      <widget href="ui/MultiplePropertyValue.xwt#/"/>

+    </sections>

+    <sections name="Multiple StringObjectConverter" sectionFile="ui/MultipleStringObjectConverter.xwt">

+      <widget href="ui/MultipleStringObjectConverter.xwt#/"/>

+    </sections>

+    <sections name="Multiple Shape" sectionFile="ui/MultipleShape.xwt">

+      <widget href="ui/MultipleShape.xwt#/"/>

+    </sections>

+    <sections name="Multiple Compartment" sectionFile="ui/MultipleCompartment.xwt">

+      <widget href="ui/MultipleCompartment.xwt#/"/>

+    </sections>

+    <sections name="Multiple ListCompartment" sectionFile="ui/MultipleListCompartment.xwt">

+      <widget href="ui/MultipleListCompartment.xwt#/"/>

+    </sections>

+    <sections name="Multiple Connector" sectionFile="ui/MultipleConnector.xwt">

+      <widget href="ui/MultipleConnector.xwt#/"/>

+    </sections>

+    <sections name="Multiple StandardDiagram" sectionFile="ui/MultipleStandardDiagram.xwt">

+      <widget href="ui/MultipleStandardDiagram.xwt#/"/>

+    </sections>

+    <sections name="Multiple DecorationNode" sectionFile="ui/MultipleDecorationNode.xwt">

+      <widget href="ui/MultipleDecorationNode.xwt#/"/>

+    </sections>

+    <sections name="Multiple BasicDecorationNode" sectionFile="ui/MultipleBasicDecorationNode.xwt">

+      <widget href="ui/MultipleBasicDecorationNode.xwt#/"/>

+    </sections>

+    <sections name="Multiple BasicCompartment" sectionFile="ui/MultipleBasicCompartment.xwt">

+      <widget href="ui/MultipleBasicCompartment.xwt#/"/>

+    </sections>

+    <sections name="Multiple BasicSemanticCompartment" sectionFile="ui/MultipleBasicSemanticCompartment.xwt">

+      <widget href="ui/MultipleBasicSemanticCompartment.xwt#/"/>

+    </sections>

+    <sections name="Multiple SemanticListCompartment" sectionFile="ui/MultipleSemanticListCompartment.xwt">

+      <widget href="ui/MultipleSemanticListCompartment.xwt#/"/>

+    </sections>

+  </tabs>

+  <views name="Single Diagram" sections="//@tabs.0/@sections.12" automaticContext="true" datacontexts="//@dataContexts.0/@elements.12">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleDiagram">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Diagram"/>

+    </constraints>

+  </views>

+  <views name="Single Edge" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleEdge">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Edge"/>

+    </constraints>

+  </views>

+  <views name="Single Node" sections="//@tabs.0/@sections.1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleNode">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Node"/>

+    </constraints>

+  </views>

+  <views name="Single LayoutConstraint" sections="//@tabs.0/@sections.2" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleLayoutConstraint">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="LayoutConstraint"/>

+    </constraints>

+  </views>

+  <views name="Single Size" sections="//@tabs.0/@sections.3" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleSize">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Size"/>

+    </constraints>

+  </views>

+  <views name="Single Location" sections="//@tabs.0/@sections.4" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleLocation">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Location"/>

+    </constraints>

+  </views>

+  <views name="Single Bounds" sections="//@tabs.0/@sections.5" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleBounds">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Bounds"/>

+    </constraints>

+  </views>

+  <views name="Single Ratio" sections="//@tabs.0/@sections.6" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleRatio">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Ratio"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single Anchor" sections="//@tabs.0/@sections.7" automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleAnchor">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Anchor"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single Bendpoints" sections="//@tabs.0/@sections.8" automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleBendpoints">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Bendpoints"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single IdentityAnchor" sections="//@tabs.0/@sections.9" automaticContext="true" datacontexts="//@dataContexts.0/@elements.9">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleIdentityAnchor">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="IdentityAnchor"/>

+    </constraints>

+  </views>

+  <views name="Single View" sections="//@tabs.0/@sections.10" automaticContext="true" datacontexts="//@dataContexts.0/@elements.10">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleView">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="View"/>

+    </constraints>

+  </views>

+  <views name="Single RelativeBendpoints" sections="//@tabs.0/@sections.11" automaticContext="true" datacontexts="//@dataContexts.0/@elements.11">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleRelativeBendpoints">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="RelativeBendpoints"/>

+    </constraints>

+  </views>

+  <views name="Single Image" sections="//@tabs.0/@sections.13" automaticContext="true" datacontexts="//@dataContexts.0/@elements.13">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleImage">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Image"/>

+    </constraints>

+  </views>

+  <views name="Single Guide" sections="//@tabs.0/@sections.14" automaticContext="true" datacontexts="//@dataContexts.0/@elements.14">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleGuide">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Guide"/>

+    </constraints>

+  </views>

+  <views name="Single NodeEntry" sections="//@tabs.0/@sections.15" automaticContext="true" datacontexts="//@dataContexts.0/@elements.15">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleNodeEntry">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="NodeEntry"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single StringToPropertyValueMapEntry" sections="//@tabs.0/@sections.16" automaticContext="true" datacontexts="//@dataContexts.0/@elements.16">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleStringToPropertyValueMapEntry">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="StringToPropertyValueMapEntry"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single PropertyValue" sections="//@tabs.0/@sections.17" automaticContext="true" datacontexts="//@dataContexts.0/@elements.17">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSinglePropertyValue">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="PropertyValue"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single StringObjectConverter" sections="//@tabs.0/@sections.18" automaticContext="true" datacontexts="//@dataContexts.0/@elements.18">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleStringObjectConverter">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="StringObjectConverter"/>

+    </constraints>

+  </views>

+  <views name="Single Shape" sections="//@tabs.0/@sections.19" automaticContext="true" datacontexts="//@dataContexts.0/@elements.19">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleShape">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Shape"/>

+    </constraints>

+  </views>

+  <views name="Single Compartment" sections="//@tabs.0/@sections.20" automaticContext="true" datacontexts="//@dataContexts.0/@elements.20">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleCompartment">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Compartment"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single ListCompartment" sections="//@tabs.0/@sections.21" automaticContext="true" datacontexts="//@dataContexts.0/@elements.21">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleListCompartment">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ListCompartment"/>

+    </constraints>

+  </views>

+  <views name="Single Connector" sections="//@tabs.0/@sections.22" automaticContext="true" datacontexts="//@dataContexts.0/@elements.22">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleConnector">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Connector"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single StandardDiagram" sections="//@tabs.0/@sections.23" automaticContext="true" datacontexts="//@dataContexts.0/@elements.23">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleStandardDiagram">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="StandardDiagram"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single DecorationNode" sections="//@tabs.0/@sections.24" automaticContext="true" datacontexts="//@dataContexts.0/@elements.24">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleDecorationNode">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DecorationNode"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single BasicDecorationNode" sections="//@tabs.0/@sections.25" automaticContext="true" datacontexts="//@dataContexts.0/@elements.25">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleBasicDecorationNode">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="BasicDecorationNode"/>

+    </constraints>

+  </views>

+  <views name="Single BasicCompartment" sections="//@tabs.0/@sections.26" automaticContext="true" datacontexts="//@dataContexts.0/@elements.26">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleBasicCompartment">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="BasicCompartment"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single BasicSemanticCompartment" sections="//@tabs.0/@sections.27" automaticContext="true" datacontexts="//@dataContexts.0/@elements.27">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleBasicSemanticCompartment">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="BasicSemanticCompartment"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single SemanticListCompartment" sections="//@tabs.0/@sections.28" automaticContext="true" datacontexts="//@dataContexts.0/@elements.28">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleSemanticListCompartment">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="SemanticListCompartment"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Edge" sections="//@tabs.0/@sections.29" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleEdge">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Edge"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Node" sections="//@tabs.0/@sections.30" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleNode">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Node"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple LayoutConstraint" sections="//@tabs.0/@sections.31" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleLayoutConstraint">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="LayoutConstraint"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Size" sections="//@tabs.0/@sections.32" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleSize">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Size"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Location" sections="//@tabs.0/@sections.33" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleLocation">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Location"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Bounds" sections="//@tabs.0/@sections.34" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleBounds">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Bounds"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Ratio" sections="//@tabs.0/@sections.35" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleRatio">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Ratio"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Anchor" sections="//@tabs.0/@sections.36" automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleAnchor">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Anchor"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Bendpoints" sections="//@tabs.0/@sections.37" automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleBendpoints">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Bendpoints"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple IdentityAnchor" sections="//@tabs.0/@sections.38" automaticContext="true" datacontexts="//@dataContexts.0/@elements.9">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleIdentityAnchor">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="IdentityAnchor"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple View" sections="//@tabs.0/@sections.39" automaticContext="true" datacontexts="//@dataContexts.0/@elements.10">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleView">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="View"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple RelativeBendpoints" sections="//@tabs.0/@sections.40" automaticContext="true" datacontexts="//@dataContexts.0/@elements.11">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleRelativeBendpoints">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="RelativeBendpoints"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Diagram" sections="//@tabs.0/@sections.41" automaticContext="true" datacontexts="//@dataContexts.0/@elements.12">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDiagram">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Diagram"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Image" sections="//@tabs.0/@sections.42" automaticContext="true" datacontexts="//@dataContexts.0/@elements.13">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleImage">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Image"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Guide" sections="//@tabs.0/@sections.43" automaticContext="true" datacontexts="//@dataContexts.0/@elements.14">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleGuide">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Guide"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple NodeEntry" sections="//@tabs.0/@sections.44" automaticContext="true" datacontexts="//@dataContexts.0/@elements.15">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleNodeEntry">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="NodeEntry"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple StringToPropertyValueMapEntry" sections="//@tabs.0/@sections.45" automaticContext="true" datacontexts="//@dataContexts.0/@elements.16">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleStringToPropertyValueMapEntry">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="StringToPropertyValueMapEntry"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple PropertyValue" sections="//@tabs.0/@sections.46" automaticContext="true" datacontexts="//@dataContexts.0/@elements.17">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultiplePropertyValue">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="PropertyValue"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple StringObjectConverter" sections="//@tabs.0/@sections.47" automaticContext="true" datacontexts="//@dataContexts.0/@elements.18">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleStringObjectConverter">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="StringObjectConverter"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Shape" sections="//@tabs.0/@sections.48" automaticContext="true" datacontexts="//@dataContexts.0/@elements.19">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleShape">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Shape"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Compartment" sections="//@tabs.0/@sections.49" automaticContext="true" datacontexts="//@dataContexts.0/@elements.20">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleCompartment">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Compartment"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple ListCompartment" sections="//@tabs.0/@sections.50" automaticContext="true" datacontexts="//@dataContexts.0/@elements.21">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleListCompartment">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ListCompartment"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Connector" sections="//@tabs.0/@sections.51" automaticContext="true" datacontexts="//@dataContexts.0/@elements.22">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleConnector">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Connector"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple StandardDiagram" sections="//@tabs.0/@sections.52" automaticContext="true" datacontexts="//@dataContexts.0/@elements.23">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleStandardDiagram">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="StandardDiagram"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple DecorationNode" sections="//@tabs.0/@sections.53" automaticContext="true" datacontexts="//@dataContexts.0/@elements.24">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDecorationNode">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DecorationNode"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple BasicDecorationNode" sections="//@tabs.0/@sections.54" automaticContext="true" datacontexts="//@dataContexts.0/@elements.25">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleBasicDecorationNode">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="BasicDecorationNode"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple BasicCompartment" sections="//@tabs.0/@sections.55" automaticContext="true" datacontexts="//@dataContexts.0/@elements.26">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleBasicCompartment">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="BasicCompartment"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple BasicSemanticCompartment" sections="//@tabs.0/@sections.56" automaticContext="true" datacontexts="//@dataContexts.0/@elements.27">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleBasicSemanticCompartment">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="BasicSemanticCompartment"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple SemanticListCompartment" sections="//@tabs.0/@sections.57" automaticContext="true" datacontexts="//@dataContexts.0/@elements.28">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleSemanticListCompartment">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="SemanticListCompartment"/>

+    </constraints>

+  </views>

+  <dataContexts name="notation" label="notation">

+    <elements name="Edge" supertypes="//@dataContexts.0/@elements.10">

+      <properties name="source" type="Reference"/>

+      <properties name="target" type="Reference"/>

+      <properties name="bendpoints" type="Reference"/>

+      <properties name="sourceAnchor" type="Reference"/>

+      <properties name="targetAnchor" type="Reference"/>

+    </elements>

+    <elements name="Node" supertypes="//@dataContexts.0/@elements.10">

+      <properties name="layoutConstraint" type="Reference"/>

+    </elements>

+    <elements name="LayoutConstraint"/>

+    <elements name="Size" supertypes="//@dataContexts.0/@elements.2">

+      <properties name="width" type="Integer"/>

+      <properties name="height" type="Integer"/>

+    </elements>

+    <elements name="Location" supertypes="//@dataContexts.0/@elements.2">

+      <properties name="x" type="Integer"/>

+      <properties name="y" type="Integer"/>

+    </elements>

+    <elements name="Bounds" supertypes="//@dataContexts.0/@elements.4 //@dataContexts.0/@elements.3"/>

+    <elements name="Ratio" supertypes="//@dataContexts.0/@elements.2">

+      <properties name="value"/>

+    </elements>

+    <elements name="Anchor"/>

+    <elements name="Bendpoints"/>

+    <elements name="IdentityAnchor" supertypes="//@dataContexts.0/@elements.7">

+      <properties name="id"/>

+    </elements>

+    <elements name="View">

+      <properties name="visible" type="Boolean"/>

+      <properties name="type"/>

+      <properties name="mutable" type="Boolean"/>

+      <properties name="sourceEdges" type="Reference" multiplicity="-1"/>

+      <properties name="targetEdges" type="Reference" multiplicity="-1"/>

+      <properties name="persistedChildren" type="Reference" multiplicity="-1"/>

+      <properties name="styles" type="Reference" multiplicity="-1"/>

+      <properties name="element" type="Reference"/>

+      <properties name="diagram" type="Reference"/>

+      <properties name="transientChildren" type="Reference" multiplicity="-1"/>

+    </elements>

+    <elements name="RelativeBendpoints" supertypes="//@dataContexts.0/@elements.8">

+      <properties name="points"/>

+    </elements>

+    <elements name="Diagram" supertypes="//@dataContexts.0/@elements.10">

+      <properties name="name" label="Name"/>

+      <properties name="measurementUnit" type="Enumeration"/>

+      <properties name="persistedEdges" type="Reference" multiplicity="-1"/>

+      <properties name="TransientEdges" type="Reference" multiplicity="-1"/>

+    </elements>

+    <elements name="Image">

+      <properties name="data"/>

+    </elements>

+    <elements name="Guide">

+      <properties name="position" type="Integer"/>

+      <properties name="nodeMap" type="Reference" multiplicity="-1"/>

+    </elements>

+    <elements name="NodeEntry">

+      <properties name="value" type="Enumeration"/>

+      <properties name="key" type="Reference"/>

+    </elements>

+    <elements name="StringToPropertyValueMapEntry">

+      <properties name="key"/>

+      <properties name="value" type="Reference"/>

+    </elements>

+    <elements name="PropertyValue" supertypes="//@dataContexts.0/@elements.18">

+      <properties name="rawValue"/>

+      <properties name="instanceType" type="Reference"/>

+    </elements>

+    <elements name="StringObjectConverter"/>

+    <elements name="Shape" supertypes="//@dataContexts.0/@elements.1"/>

+    <elements name="Compartment" supertypes="//@dataContexts.0/@elements.26"/>

+    <elements name="ListCompartment" supertypes="//@dataContexts.0/@elements.26"/>

+    <elements name="Connector" supertypes="//@dataContexts.0/@elements.0"/>

+    <elements name="StandardDiagram" supertypes="//@dataContexts.0/@elements.12"/>

+    <elements name="DecorationNode" supertypes="//@dataContexts.0/@elements.25"/>

+    <elements name="BasicDecorationNode" supertypes="//@dataContexts.0/@elements.1"/>

+    <elements name="BasicCompartment" supertypes="//@dataContexts.0/@elements.24"/>

+    <elements name="BasicSemanticCompartment" supertypes="//@dataContexts.0/@elements.25"/>

+    <elements name="SemanticListCompartment" supertypes="//@dataContexts.0/@elements.27"/>

+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.2"/>

+  </dataContexts>

+</contexts:Context>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSize.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleAnchor.xwt
index b2d51628ca9..f852ec3e3dd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSize.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleAnchor.xwt
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicCompartment.xwt
index cda13d2e069..d281c5148ec 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicCompartment.xwt
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDoubleListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicDecorationNode.xwt
index 22ddc4a4d54..22210d02a6d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDoubleListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicDecorationNode.xwt
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicSemanticCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicSemanticCompartment.xwt
index 90ddedc0d02..4f92943cb38 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicSemanticCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicSemanticCompartment.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

+<Composite xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDataTypeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBendpoints.xwt
index d69369c20ec..d69369c20ec 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDataTypeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBendpoints.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBooleanListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBounds.xwt
index 51204c02825..51204c02825 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBooleanListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBounds.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleCompartment.xwt
index 626d55169c8..b4dbc17f019 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleCompartment.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleShape.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleConnector.xwt
index ac0a53ec02c..1a968cdc1c3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleShape.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleConnector.xwt
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

+<Composite

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleConnector.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleDecorationNode.xwt
index 544df2e1fa5..268a24a4311 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleConnector.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleDecorationNode.xwt
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagram.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleDiagram.xwt
index c68deeb42cb..8a9743d2cdd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagram.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleDiagram.xwt
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEdge.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleEdge.xwt
index 5d4ec443107..c51b0dd6411 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEdge.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleEdge.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleGuide.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleGuide.xwt
new file mode 100644
index 00000000000..4529a80b41c
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleGuide.xwt
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:IntegerEditor input="{Binding}" property="notation:Guide:position"></ppe:IntegerEditor>

+	</Composite>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImageBufferStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleIdentityAnchor.xwt
index 0f03fd30c5d..0f03fd30c5d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImageBufferStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleIdentityAnchor.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleImage.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleImage.xwt
new file mode 100644
index 00000000000..6708b2e86b8
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleImage.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:j="clr-namespace:java.lang">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleByteArrayValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleLayoutConstraint.xwt
index 9ba4ce8ae90..9ba4ce8ae90 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleByteArrayValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleLayoutConstraint.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleListCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleListCompartment.xwt
index 5f22a2fa278..e58ebc5d6f2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleListCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleListCompartment.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleLocation.xwt
index d69369c20ec..0f03fd30c5d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleLocation.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleNode.xwt
index 77130c48e63..5811722ef42 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleNode.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleCanonicalStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleNodeEntry.xwt
index a5ea7d43e6d..e497ea1764e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleCanonicalStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleNodeEntry.xwt
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

 	<Composite>

 		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

 		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:CanonicalStyle:canonical"></ppe:BooleanRadio>

+		<ppe:EnumCombo input="{Binding}" property="notation:NodeEntry:value"></ppe:EnumCombo>

 	</Composite>

 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIdentityAnchor.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultiplePropertyValue.xwt
index abe6b00910f..89517d2ad16 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIdentityAnchor.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultiplePropertyValue.xwt
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRatio.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleRatio.xwt
index 06b744321e8..c92a78b1b3c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRatio.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleRatio.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleMultiDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleRelativeBendpoints.xwt
index 4d0cc388e09..6a66b760328 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleMultiDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleRelativeBendpoints.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSemanticListCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleSemanticListCompartment.xwt
index 888fc6d68ff..3a1567c248e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSemanticListCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleSemanticListCompartment.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleShape.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleShape.xwt
new file mode 100644
index 00000000000..ff5d87bdcff
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleShape.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleSize.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleSize.xwt
new file mode 100644
index 00000000000..6708b2e86b8
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleSize.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:j="clr-namespace:java.lang">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStandardDiagram.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStandardDiagram.xwt
index ffd18b54e90..2560cc8a414 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStandardDiagram.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStandardDiagram.xwt
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEObjectListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStringObjectConverter.xwt
index 4a2db70155f..cfb33162bc7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEObjectListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStringObjectConverter.xwt
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStringToPropertyValueMapEntry.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStringToPropertyValueMapEntry.xwt
new file mode 100644
index 00000000000..6708b2e86b8
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStringToPropertyValueMapEntry.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:j="clr-namespace:java.lang">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleView.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleView.xwt
index 63b5d95e26f..bc1cfbde094 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleView.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleView.xwt
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation">

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleAnchor.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleAnchor.xwt
new file mode 100644
index 00000000000..f852ec3e3dd
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleAnchor.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:j="clr-namespace:java.lang">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicCompartment.xwt
index cc62f120831..7e7f91de22e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicCompartment.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleConnectorStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicDecorationNode.xwt
index b676bdcba92..363105005ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleConnectorStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicDecorationNode.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicSemanticCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicSemanticCompartment.xwt
index 760f8e3f73e..10c44e01d2e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicSemanticCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicSemanticCompartment.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBendpoints.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBendpoints.xwt
index 9047bd98f8e..9047bd98f8e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBendpoints.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBendpoints.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBounds.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBounds.xwt
new file mode 100644
index 00000000000..6708b2e86b8
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBounds.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:j="clr-namespace:java.lang">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleCompartment.xwt
index 23d86901735..16ae2d27d37 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleCompartment.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

+	xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/ShapeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleConnector.xwt
index daba3afe64f..4615b13af09 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/ShapeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleConnector.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

+	xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDecorationNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDecorationNode.xwt
index 1a27520d7bf..4afd2ad2072 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDecorationNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDecorationNode.xwt
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

+	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFilteringStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDiagram.xwt
index c827c87b59b..0e7eb2296f9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFilteringStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDiagram.xwt
@@ -10,6 +10,7 @@
 		<Composite.layout>

 			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

 		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:FilteringStyle:filtering"></ppe:EnumCombo>

+		<ppe:StringEditor input="{Binding}" property="notation:Diagram:name"></ppe:StringEditor>

+		<ppe:StringLabel input="{Binding}" property="notation:View:type"></ppe:StringLabel>

 	</Composite>

 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEdge.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleEdge.xwt
index 7dd1cc74b9a..2d97ebafc76 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEdge.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleEdge.xwt
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

+<Composite

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGuide.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleGuide.xwt
index 0fbb85ce502..6f343c6acbe 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGuide.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleGuide.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleIdentityAnchor.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleIdentityAnchor.xwt
new file mode 100644
index 00000000000..f852ec3e3dd
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleIdentityAnchor.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:j="clr-namespace:java.lang">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImage.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleImage.xwt
index b830da2e4a0..373b1dde6ee 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImage.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleImage.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang">

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLocation.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleLayoutConstraint.xwt
index d69369c20ec..d69369c20ec 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLocation.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleLayoutConstraint.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleListCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleListCompartment.xwt
index 39841341d5b..0f9c5df8b47 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleListCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleListCompartment.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

+	xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleLocation.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleLocation.xwt
new file mode 100644
index 00000000000..89517d2ad16
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleLocation.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns="http://www.eclipse.org/xwt/presentation">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleNode.xwt
index b23f43ed80e..8c3f9a2082a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleNode.xwt
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

+<Composite xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

+	xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNodeEntry.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleNodeEntry.xwt
index eabf278145d..8c5a40ac3cb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNodeEntry.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleNodeEntry.xwt
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang"

 	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

+	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePropertyValue.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SinglePropertyValue.xwt
index 5701a91a7c8..c546e6203b7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePropertyValue.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SinglePropertyValue.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite xmlns:j="clr-namespace:java.lang"

 	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

+	xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePropertiesSetStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRatio.xwt
index e40367039d5..db88ca12577 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePropertiesSetStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRatio.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

@@ -10,6 +10,6 @@
 		<Composite.layout>

 			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

 		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

+		<ppe:StringEditor input="{Binding}" property="notation:Ratio:value"></ppe:StringEditor>

 	</Composite>

 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDescriptionStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRelativeBendpoints.xwt
index 37ea0dfa5c4..d3b34f83106 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDescriptionStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRelativeBendpoints.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

+	xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

@@ -10,6 +11,6 @@
 			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

 		</Composite.layout>

 		<ppe:StringEditor input="{Binding}"

-			property="notation:DescriptionStyle:description"></ppe:StringEditor>

+			property="notation:RelativeBendpoints:points"></ppe:StringEditor>

 	</Composite>

 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSemanticListCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleSemanticListCompartment.xwt
index 0a6c147cce3..28979da3b4e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSemanticListCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleSemanticListCompartment.xwt
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleConnector.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleShape.xwt
index f4e33545fb9..c9a56c611db 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleConnector.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleShape.xwt
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite

+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBounds.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleSize.xwt
index 9047bd98f8e..9047bd98f8e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBounds.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleSize.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStandardDiagram.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStandardDiagram.xwt
index 1c9d333e339..1cbe406c172 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStandardDiagram.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStandardDiagram.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

+<Composite xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStringObjectConverter.xwt
index 73058aaffc8..c902f6a4fb0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStringObjectConverter.xwt
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringToPropertyValueMapEntry.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStringToPropertyValueMapEntry.xwt
index 4c29e1ab4cd..eb4baf88759 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringToPropertyValueMapEntry.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStringToPropertyValueMapEntry.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

+<Composite

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleView.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleView.xwt
index d8c23398037..d9bc2718b59 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleView.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleView.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation">

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

@@ -10,8 +10,7 @@
 		<Composite.layout>

 			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

 		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:View:visible"></ppe:BooleanRadio>

+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

 		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

 	</Composite>

 	<Composite>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/style.ctx b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/style.ctx
new file mode 100644
index 00000000000..facc9c72af4
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/style.ctx
@@ -0,0 +1,931 @@
+<?xml version="1.0" encoding="ASCII"?>

+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" name="style">

+  <tabs label="Appearance" id="appearance" category="org.eclipse.papyrus" priority="75">

+    <sections name="Single Style" sectionFile="ui/SingleStyle.xwt">

+      <widget href="ui/SingleStyle.xwt#/"/>

+    </sections>

+    <sections name="FillStyle" sectionFile="ui/FillStyle.xwt">

+      <widget href="ui/FillStyle.xwt#/"/>

+    </sections>

+    <sections name="Single LineStyle" sectionFile="ui/LineStyle.xwt">

+      <widget href="ui/LineStyle.xwt#/"/>

+    </sections>

+    <sections name="Single FontStyle" sectionFile="ui/FontStyle.xwt">

+      <widget href="ui/FontStyle.xwt#/"/>

+    </sections>

+    <sections name="Single TitleStyle" sectionFile="ui/SingleTitleStyle.xwt">

+      <widget href="ui/SingleTitleStyle.xwt#/"/>

+    </sections>

+    <sections name="Single SortingStyle" sectionFile="ui/SingleSortingStyle.xwt">

+      <widget href="ui/SingleSortingStyle.xwt#/"/>

+    </sections>

+    <sections name="Single DescriptionStyle" sectionFile="ui/SingleDescriptionStyle.xwt">

+      <widget href="ui/SingleDescriptionStyle.xwt#/"/>

+    </sections>

+    <sections name="Single RoutingStyle" sectionFile="ui/SingleRoutingStyle.xwt">

+      <widget href="ui/SingleRoutingStyle.xwt#/"/>

+    </sections>

+    <sections name="Single CanonicalStyle" sectionFile="ui/SingleCanonicalStyle.xwt">

+      <widget href="ui/SingleCanonicalStyle.xwt#/"/>

+    </sections>

+    <sections name="Single ShapeStyle" sectionFile="ui/ShapeStyle.xwt">

+      <widget href="ui/ShapeStyle.xwt#/"/>

+    </sections>

+    <sections name="Single ConnectorStyle" sectionFile="ui/SingleConnectorStyle.xwt">

+      <widget href="ui/SingleConnectorStyle.xwt#/"/>

+    </sections>

+    <sections name="Single PageStyle" sectionFile="ui/SinglePageStyle.xwt">

+      <widget href="ui/SinglePageStyle.xwt#/"/>

+    </sections>

+    <sections name="Single DrawerStyle" sectionFile="ui/SingleDrawerStyle.xwt">

+      <widget href="ui/SingleDrawerStyle.xwt#/"/>

+    </sections>

+    <sections name="Single GuideStyle" sectionFile="ui/SingleGuideStyle.xwt">

+      <widget href="ui/SingleGuideStyle.xwt#/"/>

+    </sections>

+    <sections name="Single FilteringStyle" sectionFile="ui/SingleFilteringStyle.xwt">

+      <widget href="ui/SingleFilteringStyle.xwt#/"/>

+    </sections>

+    <sections name="Single DiagramStyle" sectionFile="ui/SingleDiagramStyle.xwt">

+      <widget href="ui/SingleDiagramStyle.xwt#/"/>

+    </sections>

+    <sections name="Single ImageStyle" sectionFile="ui/SingleImageStyle.xwt">

+      <widget href="ui/SingleImageStyle.xwt#/"/>

+    </sections>

+    <sections name="Single ImageBufferStyle" sectionFile="ui/SingleImageBufferStyle.xwt">

+      <widget href="ui/SingleImageBufferStyle.xwt#/"/>

+    </sections>

+    <sections name="Single PropertiesSetStyle" sectionFile="ui/SinglePropertiesSetStyle.xwt">

+      <widget href="ui/SinglePropertiesSetStyle.xwt#/"/>

+    </sections>

+    <sections name="Single SingleValueStyle" sectionFile="ui/SingleSingleValueStyle.xwt">

+      <widget href="ui/SingleSingleValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Single ListValueStyle" sectionFile="ui/SingleListValueStyle.xwt">

+      <widget href="ui/SingleListValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Single NamedStyle" sectionFile="ui/SingleNamedStyle.xwt">

+      <widget href="ui/SingleNamedStyle.xwt#/"/>

+    </sections>

+    <sections name="Single DataTypeStyle" sectionFile="ui/SingleDataTypeStyle.xwt">

+      <widget href="ui/SingleDataTypeStyle.xwt#/"/>

+    </sections>

+    <sections name="Single IntValueStyle" sectionFile="ui/SingleIntValueStyle.xwt">

+      <widget href="ui/SingleIntValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Single IntListValueStyle" sectionFile="ui/SingleIntListValueStyle.xwt">

+      <widget href="ui/SingleIntListValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Single BooleanValueStyle" sectionFile="ui/SingleBooleanValueStyle.xwt">

+      <widget href="ui/SingleBooleanValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Single DoubleValueStyle" sectionFile="ui/SingleDoubleValueStyle.xwt">

+      <widget href="ui/SingleDoubleValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Single DoubleListValueStyle" sectionFile="ui/SingleDoubleListValueStyle.xwt">

+      <widget href="ui/SingleDoubleListValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Single StringValueStyle" sectionFile="ui/SingleStringValueStyle.xwt">

+      <widget href="ui/SingleStringValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Single StringListValueStyle" sectionFile="ui/SingleStringListValueStyle.xwt">

+      <widget href="ui/SingleStringListValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Single EObjectValueStyle" sectionFile="ui/SingleEObjectValueStyle.xwt">

+      <widget href="ui/SingleEObjectValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Single EObjectListValueStyle" sectionFile="ui/SingleEObjectListValueStyle.xwt">

+      <widget href="ui/SingleEObjectListValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Single ByteArrayValueStyle" sectionFile="ui/SingleByteArrayValueStyle.xwt">

+      <widget href="ui/SingleByteArrayValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Single BooleanListValueStyle" sectionFile="ui/SingleBooleanListValueStyle.xwt">

+      <widget href="ui/SingleBooleanListValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Single HintedDiagramLinkStyle" sectionFile="ui/SingleHintedDiagramLinkStyle.xwt">

+      <widget href="ui/SingleHintedDiagramLinkStyle.xwt#/"/>

+    </sections>

+    <sections name="Single DiagramLinkStyle" sectionFile="ui/SingleDiagramLinkStyle.xwt">

+      <widget href="ui/SingleDiagramLinkStyle.xwt#/"/>

+    </sections>

+    <sections name="Single MultiDiagramLinkStyle" sectionFile="ui/SingleMultiDiagramLinkStyle.xwt">

+      <widget href="ui/SingleMultiDiagramLinkStyle.xwt#/"/>

+    </sections>

+    <sections name="Single TextStyle" sectionFile="ui/SingleTextStyle.xwt">

+      <widget href="ui/SingleTextStyle.xwt#/"/>

+    </sections>

+    <sections name="Single LineTypeStyle" sectionFile="ui/SingleLineTypeStyle.xwt">

+      <widget href="ui/SingleLineTypeStyle.xwt#/"/>

+    </sections>

+    <sections name="Single ArrowStyle" sectionFile="ui/SingleArrowStyle.xwt">

+      <widget href="ui/SingleArrowStyle.xwt#/"/>

+    </sections>

+    <sections name="Single RoundedCornersStyle" sectionFile="ui/RoundedCornersStyle.xwt">

+      <widget href="ui/RoundedCornersStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple TitleStyle" sectionFile="ui/MultipleTitleStyle.xwt">

+      <widget href="ui/MultipleTitleStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple SortingStyle" sectionFile="ui/MultipleSortingStyle.xwt">

+      <widget href="ui/MultipleSortingStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple DescriptionStyle" sectionFile="ui/MultipleDescriptionStyle.xwt">

+      <widget href="ui/MultipleDescriptionStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple RoutingStyle" sectionFile="ui/MultipleRoutingStyle.xwt">

+      <widget href="ui/MultipleRoutingStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple CanonicalStyle" sectionFile="ui/MultipleCanonicalStyle.xwt">

+      <widget href="ui/MultipleCanonicalStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple ConnectorStyle" sectionFile="ui/MultipleConnectorStyle.xwt">

+      <widget href="ui/MultipleConnectorStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple PageStyle" sectionFile="ui/MultiplePageStyle.xwt">

+      <widget href="ui/MultiplePageStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple DrawerStyle" sectionFile="ui/MultipleDrawerStyle.xwt">

+      <widget href="ui/MultipleDrawerStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple GuideStyle" sectionFile="ui/MultipleGuideStyle.xwt">

+      <widget href="ui/MultipleGuideStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple FilteringStyle" sectionFile="ui/MultipleFilteringStyle.xwt">

+      <widget href="ui/MultipleFilteringStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple DiagramStyle" sectionFile="ui/MultipleDiagramStyle.xwt">

+      <widget href="ui/MultipleDiagramStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple ImageStyle" sectionFile="ui/MultipleImageStyle.xwt">

+      <widget href="ui/MultipleImageStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple ImageBufferStyle" sectionFile="ui/MultipleImageBufferStyle.xwt">

+      <widget href="ui/MultipleImageBufferStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple PropertiesSetStyle" sectionFile="ui/MultiplePropertiesSetStyle.xwt">

+      <widget href="ui/MultiplePropertiesSetStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple SingleValueStyle" sectionFile="ui/MultipleSingleValueStyle.xwt">

+      <widget href="ui/MultipleSingleValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple ListValueStyle" sectionFile="ui/MultipleListValueStyle.xwt">

+      <widget href="ui/MultipleListValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple NamedStyle" sectionFile="ui/MultipleNamedStyle.xwt">

+      <widget href="ui/MultipleNamedStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple DataTypeStyle" sectionFile="ui/MultipleDataTypeStyle.xwt">

+      <widget href="ui/MultipleDataTypeStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple IntValueStyle" sectionFile="ui/MultipleIntValueStyle.xwt">

+      <widget href="ui/MultipleIntValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple IntListValueStyle" sectionFile="ui/MultipleIntListValueStyle.xwt">

+      <widget href="ui/MultipleIntListValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple BooleanValueStyle" sectionFile="ui/MultipleBooleanValueStyle.xwt">

+      <widget href="ui/MultipleBooleanValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple DoubleValueStyle" sectionFile="ui/MultipleDoubleValueStyle.xwt">

+      <widget href="ui/MultipleDoubleValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple DoubleListValueStyle" sectionFile="ui/MultipleDoubleListValueStyle.xwt">

+      <widget href="ui/MultipleDoubleListValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple StringValueStyle" sectionFile="ui/MultipleStringValueStyle.xwt">

+      <widget href="ui/MultipleStringValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple StringListValueStyle" sectionFile="ui/MultipleStringListValueStyle.xwt">

+      <widget href="ui/MultipleStringListValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple EObjectValueStyle" sectionFile="ui/MultipleEObjectValueStyle.xwt">

+      <widget href="ui/MultipleEObjectValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple EObjectListValueStyle" sectionFile="ui/MultipleEObjectListValueStyle.xwt">

+      <widget href="ui/MultipleEObjectListValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple ByteArrayValueStyle" sectionFile="ui/MultipleByteArrayValueStyle.xwt">

+      <widget href="ui/MultipleByteArrayValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple BooleanListValueStyle" sectionFile="ui/MultipleBooleanListValueStyle.xwt">

+      <widget href="ui/MultipleBooleanListValueStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple HintedDiagramLinkStyle" sectionFile="ui/MultipleHintedDiagramLinkStyle.xwt">

+      <widget href="ui/MultipleHintedDiagramLinkStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple DiagramLinkStyle" sectionFile="ui/MultipleDiagramLinkStyle.xwt">

+      <widget href="ui/MultipleDiagramLinkStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple MultiDiagramLinkStyle" sectionFile="ui/MultipleMultiDiagramLinkStyle.xwt">

+      <widget href="ui/MultipleMultiDiagramLinkStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple TextStyle" sectionFile="ui/MultipleTextStyle.xwt">

+      <widget href="ui/MultipleTextStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple LineTypeStyle" sectionFile="ui/MultipleLineTypeStyle.xwt">

+      <widget href="ui/MultipleLineTypeStyle.xwt#/"/>

+    </sections>

+    <sections name="Multiple ArrowStyle" sectionFile="ui/MultipleArrowStyle.xwt">

+      <widget href="ui/MultipleArrowStyle.xwt#/"/>

+    </sections>

+    <sections name="SingleGradientData" sectionFile="ui/SingleGradientData.xwt">

+      <widget href="ui/SingleGradientData.xwt#/"/>

+    </sections>

+  </tabs>

+  <views name="Single Style" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Style"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="FillStyle" sections="//@tabs.0/@sections.1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isFillStyle" overrideable="false">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="FillStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="LineStyle" sections="//@tabs.0/@sections.2" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isLineStyle" overrideable="false">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="LineStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="FontStyle" sections="//@tabs.0/@sections.3" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isFontStyle" overrideable="false">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="FontStyle"/>

+    </constraints>

+  </views>

+  <views name="Single TitleStyle" sections="//@tabs.0/@sections.4" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleTitleStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="TitleStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single SortingStyle" sections="//@tabs.0/@sections.5" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleSortingStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="SortingStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single DescriptionStyle" sections="//@tabs.0/@sections.6" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleDescriptionStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DescriptionStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single RoutingStyle" sections="//@tabs.0/@sections.7" automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleRoutingStyle" overrideable="false" overriddenConstraints="//@views.45/@constraints.0">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="RoutingStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single CanonicalStyle" sections="//@tabs.0/@sections.8" automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleCanonicalStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="CanonicalStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Single ShapeStyle" sections="//@tabs.0/@sections.9" automaticContext="true" datacontexts="//@dataContexts.0/@elements.9">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isShapeStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ShapeStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single ConnectorStyle" sections="//@tabs.0/@sections.10" automaticContext="true" datacontexts="//@dataContexts.0/@elements.10">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleConnectorStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ConnectorStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single PageStyle" sections="//@tabs.0/@sections.11" automaticContext="true" datacontexts="//@dataContexts.0/@elements.11">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSinglePageStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="PageStyle"/>

+    </constraints>

+  </views>

+  <views name="Single DrawerStyle" sections="//@tabs.0/@sections.12" automaticContext="true" datacontexts="//@dataContexts.0/@elements.12">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleDrawerStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DrawerStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single GuideStyle" sections="//@tabs.0/@sections.13" automaticContext="true" datacontexts="//@dataContexts.0/@elements.13">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleGuideStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="GuideStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single FilteringStyle" sections="//@tabs.0/@sections.14" automaticContext="true" datacontexts="//@dataContexts.0/@elements.14">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleFilteringStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="FilteringStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single DiagramStyle" sections="//@tabs.0/@sections.15" automaticContext="true" datacontexts="//@dataContexts.0/@elements.15">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleDiagramStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DiagramStyle"/>

+    </constraints>

+  </views>

+  <views name="Single ImageStyle" sections="//@tabs.0/@sections.16" automaticContext="true" datacontexts="//@dataContexts.0/@elements.16">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleImageStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ImageStyle"/>

+    </constraints>

+  </views>

+  <views name="Single ImageBufferStyle" sections="//@tabs.0/@sections.17" automaticContext="true" datacontexts="//@dataContexts.0/@elements.17">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleImageBufferStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ImageBufferStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single PropertiesSetStyle" sections="//@tabs.0/@sections.18" automaticContext="true" datacontexts="//@dataContexts.0/@elements.18">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSinglePropertiesSetStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="PropertiesSetStyle"/>

+    </constraints>

+  </views>

+  <views name="Single SingleValueStyle" sections="//@tabs.0/@sections.19" automaticContext="true" datacontexts="//@dataContexts.0/@elements.19">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleSingleValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="SingleValueStyle"/>

+    </constraints>

+  </views>

+  <views name="Single ListValueStyle" sections="//@tabs.0/@sections.20" automaticContext="true" datacontexts="//@dataContexts.0/@elements.20">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleListValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ListValueStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single NamedStyle" sections="//@tabs.0/@sections.21" automaticContext="true" datacontexts="//@dataContexts.0/@elements.21">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleNamedStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="NamedStyle"/>

+    </constraints>

+  </views>

+  <views name="Single DataTypeStyle" sections="//@tabs.0/@sections.22" automaticContext="true" datacontexts="//@dataContexts.0/@elements.22">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleDataTypeStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DataTypeStyle"/>

+    </constraints>

+  </views>

+  <views name="Single IntValueStyle" sections="//@tabs.0/@sections.23" automaticContext="true" datacontexts="//@dataContexts.0/@elements.23">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleIntValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="IntValueStyle"/>

+    </constraints>

+  </views>

+  <views name="Single IntListValueStyle" sections="//@tabs.0/@sections.24" automaticContext="true" datacontexts="//@dataContexts.0/@elements.24">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleIntListValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="IntListValueStyle"/>

+    </constraints>

+  </views>

+  <views name="Single BooleanValueStyle" sections="//@tabs.0/@sections.25" automaticContext="true" datacontexts="//@dataContexts.0/@elements.25">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleBooleanValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="BooleanValueStyle"/>

+    </constraints>

+  </views>

+  <views name="Single DoubleValueStyle" sections="//@tabs.0/@sections.26" automaticContext="true" datacontexts="//@dataContexts.0/@elements.26">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleDoubleValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DoubleValueStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single DoubleListValueStyle" sections="//@tabs.0/@sections.27" automaticContext="true" datacontexts="//@dataContexts.0/@elements.27">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleDoubleListValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DoubleListValueStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single StringValueStyle" sections="//@tabs.0/@sections.28" automaticContext="true" datacontexts="//@dataContexts.0/@elements.28">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleStringValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="StringValueStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single StringListValueStyle" sections="//@tabs.0/@sections.29" automaticContext="true" datacontexts="//@dataContexts.0/@elements.29">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleStringListValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="StringListValueStyle"/>

+    </constraints>

+  </views>

+  <views name="Single EObjectValueStyle" sections="//@tabs.0/@sections.30" automaticContext="true" datacontexts="//@dataContexts.0/@elements.30">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleEObjectValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="EObjectValueStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single EObjectListValueStyle" sections="//@tabs.0/@sections.31" automaticContext="true" datacontexts="//@dataContexts.0/@elements.31">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleEObjectListValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="EObjectListValueStyle"/>

+    </constraints>

+  </views>

+  <views name="Single ByteArrayValueStyle" sections="//@tabs.0/@sections.32" automaticContext="true" datacontexts="//@dataContexts.0/@elements.32">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleByteArrayValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ByteArrayValueStyle"/>

+    </constraints>

+  </views>

+  <views name="Single BooleanListValueStyle" sections="//@tabs.0/@sections.33" automaticContext="true" datacontexts="//@dataContexts.0/@elements.33">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleBooleanListValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="BooleanListValueStyle"/>

+    </constraints>

+  </views>

+  <views name="Single HintedDiagramLinkStyle" sections="//@tabs.0/@sections.34" automaticContext="true" datacontexts="//@dataContexts.0/@elements.34">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleHintedDiagramLinkStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="HintedDiagramLinkStyle"/>

+    </constraints>

+  </views>

+  <views name="Single DiagramLinkStyle" sections="//@tabs.0/@sections.35" automaticContext="true" datacontexts="//@dataContexts.0/@elements.35">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleDiagramLinkStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DiagramLinkStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single MultiDiagramLinkStyle" sections="//@tabs.0/@sections.36" automaticContext="true" datacontexts="//@dataContexts.0/@elements.36">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleMultiDiagramLinkStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="MultiDiagramLinkStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single TextStyle" sections="//@tabs.0/@sections.37" automaticContext="true" datacontexts="//@dataContexts.0/@elements.37">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleTextStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="TextStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="Single LineTypeStyle" sections="//@tabs.0/@sections.38" automaticContext="true" datacontexts="//@dataContexts.0/@elements.38">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleLineTypeStyle" overrideable="false">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="LineTypeStyle"/>

+    </constraints>

+  </views>

+  <views name="Single ArrowStyle" sections="//@tabs.0/@sections.39" automaticContext="true" datacontexts="//@dataContexts.0/@elements.39">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleArrowStyle" overrideable="false">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ArrowStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="RoundedCornersStyle" sections="//@tabs.0/@sections.40" automaticContext="true" datacontexts="//@dataContexts.0/@elements.40">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isRoundedCornersStyle" overrideable="false">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="RoundedCornersStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Style" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Style"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple TitleStyle" sections="//@tabs.0/@sections.41" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleTitleStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="TitleStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple SortingStyle" sections="//@tabs.0/@sections.42" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleSortingStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="SortingStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple DescriptionStyle" sections="//@tabs.0/@sections.43" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDescriptionStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DescriptionStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple RoutingStyle" sections="//@tabs.0/@sections.44" automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleRoutingStyle" overrideable="false">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="RoutingStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple CanonicalStyle" sections="//@tabs.0/@sections.45" automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleCanonicalStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="CanonicalStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple ConnectorStyle" sections="//@tabs.0/@sections.46" automaticContext="true" datacontexts="//@dataContexts.0/@elements.10">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleConnectorStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ConnectorStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple PageStyle" sections="//@tabs.0/@sections.47" automaticContext="true" datacontexts="//@dataContexts.0/@elements.11">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultiplePageStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="PageStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple DrawerStyle" sections="//@tabs.0/@sections.48" automaticContext="true" datacontexts="//@dataContexts.0/@elements.12">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDrawerStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DrawerStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple GuideStyle" sections="//@tabs.0/@sections.49" automaticContext="true" datacontexts="//@dataContexts.0/@elements.13">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleGuideStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="GuideStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple FilteringStyle" sections="//@tabs.0/@sections.50" automaticContext="true" datacontexts="//@dataContexts.0/@elements.14">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleFilteringStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="FilteringStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple DiagramStyle" sections="//@tabs.0/@sections.51" automaticContext="true" datacontexts="//@dataContexts.0/@elements.15">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDiagramStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DiagramStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple ImageStyle" sections="//@tabs.0/@sections.52" automaticContext="true" datacontexts="//@dataContexts.0/@elements.16">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleImageStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ImageStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple ImageBufferStyle" sections="//@tabs.0/@sections.53" automaticContext="true" datacontexts="//@dataContexts.0/@elements.17">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleImageBufferStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ImageBufferStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple PropertiesSetStyle" sections="//@tabs.0/@sections.54" automaticContext="true" datacontexts="//@dataContexts.0/@elements.18">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultiplePropertiesSetStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="PropertiesSetStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple SingleValueStyle" sections="//@tabs.0/@sections.55" automaticContext="true" datacontexts="//@dataContexts.0/@elements.19">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleSingleValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="SingleValueStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple ListValueStyle" sections="//@tabs.0/@sections.56" automaticContext="true" datacontexts="//@dataContexts.0/@elements.20">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleListValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ListValueStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple NamedStyle" sections="//@tabs.0/@sections.57" automaticContext="true" datacontexts="//@dataContexts.0/@elements.21">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleNamedStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="NamedStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple DataTypeStyle" sections="//@tabs.0/@sections.58" automaticContext="true" datacontexts="//@dataContexts.0/@elements.22">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDataTypeStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DataTypeStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple IntValueStyle" sections="//@tabs.0/@sections.59" automaticContext="true" datacontexts="//@dataContexts.0/@elements.23">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleIntValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="IntValueStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple IntListValueStyle" sections="//@tabs.0/@sections.60" automaticContext="true" datacontexts="//@dataContexts.0/@elements.24">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleIntListValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="IntListValueStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple BooleanValueStyle" sections="//@tabs.0/@sections.61" automaticContext="true" datacontexts="//@dataContexts.0/@elements.25">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleBooleanValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="BooleanValueStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple DoubleValueStyle" sections="//@tabs.0/@sections.62" automaticContext="true" datacontexts="//@dataContexts.0/@elements.26">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDoubleValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DoubleValueStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple DoubleListValueStyle" sections="//@tabs.0/@sections.63" automaticContext="true" datacontexts="//@dataContexts.0/@elements.27">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDoubleListValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DoubleListValueStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple StringValueStyle" sections="//@tabs.0/@sections.64" automaticContext="true" datacontexts="//@dataContexts.0/@elements.28">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleStringValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="StringValueStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple StringListValueStyle" sections="//@tabs.0/@sections.65" automaticContext="true" datacontexts="//@dataContexts.0/@elements.29">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleStringListValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="StringListValueStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple EObjectValueStyle" sections="//@tabs.0/@sections.66" automaticContext="true" datacontexts="//@dataContexts.0/@elements.30">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleEObjectValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="EObjectValueStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple EObjectListValueStyle" sections="//@tabs.0/@sections.67" automaticContext="true" datacontexts="//@dataContexts.0/@elements.31">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleEObjectListValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="EObjectListValueStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple ByteArrayValueStyle" sections="//@tabs.0/@sections.68" automaticContext="true" datacontexts="//@dataContexts.0/@elements.32">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleByteArrayValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ByteArrayValueStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple BooleanListValueStyle" sections="//@tabs.0/@sections.69" automaticContext="true" datacontexts="//@dataContexts.0/@elements.33">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleBooleanListValueStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="BooleanListValueStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple HintedDiagramLinkStyle" sections="//@tabs.0/@sections.70" automaticContext="true" datacontexts="//@dataContexts.0/@elements.34">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleHintedDiagramLinkStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="HintedDiagramLinkStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple DiagramLinkStyle" sections="//@tabs.0/@sections.71" automaticContext="true" datacontexts="//@dataContexts.0/@elements.35">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleDiagramLinkStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="DiagramLinkStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple MultiDiagramLinkStyle" sections="//@tabs.0/@sections.72" automaticContext="true" datacontexts="//@dataContexts.0/@elements.36">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleMultiDiagramLinkStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="MultiDiagramLinkStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple TextStyle" sections="//@tabs.0/@sections.73" automaticContext="true" datacontexts="//@dataContexts.0/@elements.37">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleTextStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="TextStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple LineTypeStyle" sections="//@tabs.0/@sections.74" automaticContext="true" datacontexts="//@dataContexts.0/@elements.38">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleLineTypeStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="LineTypeStyle"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple ArrowStyle" sections="//@tabs.0/@sections.75" automaticContext="true" datacontexts="//@dataContexts.0/@elements.39">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleArrowStyle">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="ArrowStyle"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

+    </constraints>

+  </views>

+  <views name="SingleGradientData" sections="//@tabs.0/@sections.76">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isGradientData">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <properties xsi:type="constraints:ValueProperty" name="class" value="org.eclipse.gmf.runtime.notation.datatype.GradientData"/>

+    </constraints>

+  </views>

+  <dataContexts name="notation" label="notation">

+    <elements name="Style"/>

+    <elements name="FillStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="fillColor" type="Integer"/>

+      <properties name="transparency" type="Integer"/>

+      <properties name="gradient" type="Reference"/>

+    </elements>

+    <elements name="LineStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="lineColor" type="Integer"/>

+      <properties name="lineWidth" type="Integer"/>

+    </elements>

+    <elements name="FontStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="fontColor" type="Integer"/>

+      <properties name="fontName"/>

+      <properties name="fontHeight" type="Integer"/>

+      <properties name="bold" type="Boolean"/>

+      <properties name="italic" type="Boolean"/>

+      <properties name="underline" type="Boolean"/>

+      <properties name="strikeThrough" type="Boolean"/>

+    </elements>

+    <elements name="TitleStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="showTitle" type="Boolean"/>

+    </elements>

+    <elements name="SortingStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="sorting" type="Enumeration"/>

+      <properties name="sortingKeys"/>

+      <properties name="sortedObjects" type="Reference" multiplicity="-1"/>

+    </elements>

+    <elements name="DescriptionStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="description"/>

+    </elements>

+    <elements name="RoutingStyle" supertypes="//@dataContexts.0/@elements.40">

+      <properties name="routing" type="Enumeration"/>

+      <properties name="smoothness" type="Enumeration"/>

+      <properties name="avoidObstructions" type="Boolean"/>

+      <properties name="closestDistance" type="Boolean"/>

+      <properties name="jumpLinkStatus" type="Enumeration"/>

+      <properties name="jumpLinkType" type="Enumeration"/>

+      <properties name="jumpLinksReverse" type="Boolean"/>

+    </elements>

+    <elements name="CanonicalStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="canonical" type="Boolean"/>

+    </elements>

+    <elements name="ShapeStyle" supertypes="//@dataContexts.0/@elements.3 //@dataContexts.0/@elements.6 //@dataContexts.0/@elements.1 //@dataContexts.0/@elements.2 //@dataContexts.0/@elements.40"/>

+    <elements name="ConnectorStyle" supertypes="//@dataContexts.0/@elements.7 //@dataContexts.0/@elements.2"/>

+    <elements name="PageStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="pageX" type="Integer"/>

+      <properties name="pageY" type="Integer"/>

+      <properties name="pageWidth" type="Integer"/>

+      <properties name="pageHeight" type="Integer"/>

+    </elements>

+    <elements name="DrawerStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="collapsed" type="Boolean"/>

+    </elements>

+    <elements name="GuideStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="horizontalGuides" type="Reference" multiplicity="-1"/>

+      <properties name="verticalGuides" type="Reference" multiplicity="-1"/>

+    </elements>

+    <elements name="FilteringStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="filtering" type="Enumeration"/>

+      <properties name="filteringKeys"/>

+      <properties name="filteredObjects" type="Reference" multiplicity="-1"/>

+    </elements>

+    <elements name="DiagramStyle" supertypes="//@dataContexts.0/@elements.11 //@dataContexts.0/@elements.13 //@dataContexts.0/@elements.6"/>

+    <elements name="ImageStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="antiAlias"/>

+      <properties name="maintainAspectRatio"/>

+      <properties name="cropBound" type="Reference"/>

+    </elements>

+    <elements name="ImageBufferStyle" supertypes="//@dataContexts.0/@elements.16">

+      <properties name="imageBuffer" type="Reference"/>

+    </elements>

+    <elements name="PropertiesSetStyle" supertypes="//@dataContexts.0/@elements.21">

+      <properties name="propertiesMap" type="Reference" multiplicity="-1"/>

+    </elements>

+    <elements name="SingleValueStyle" supertypes="//@dataContexts.0/@elements.22">

+      <properties name="rawValue"/>

+    </elements>

+    <elements name="ListValueStyle" supertypes="//@dataContexts.0/@elements.22">

+      <properties name="rawValuesList" multiplicity="-1"/>

+    </elements>

+    <elements name="NamedStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="name"/>

+    </elements>

+    <elements name="DataTypeStyle" supertypes="//@dataContexts.0/@elements.21">

+      <properties name="instanceType" type="Reference"/>

+    </elements>

+    <elements name="IntValueStyle" supertypes="//@dataContexts.0/@elements.21">

+      <properties name="intValue"/>

+    </elements>

+    <elements name="IntListValueStyle" supertypes="//@dataContexts.0/@elements.21">

+      <properties name="intListValue" multiplicity="-1"/>

+    </elements>

+    <elements name="BooleanValueStyle" supertypes="//@dataContexts.0/@elements.21">

+      <properties name="booleanValue"/>

+    </elements>

+    <elements name="DoubleValueStyle" supertypes="//@dataContexts.0/@elements.21">

+      <properties name="doubleValue"/>

+    </elements>

+    <elements name="DoubleListValueStyle" supertypes="//@dataContexts.0/@elements.21">

+      <properties name="doubleListValue" multiplicity="-1"/>

+    </elements>

+    <elements name="StringValueStyle" supertypes="//@dataContexts.0/@elements.21">

+      <properties name="stringValue"/>

+    </elements>

+    <elements name="StringListValueStyle" supertypes="//@dataContexts.0/@elements.21">

+      <properties name="stringListValue" multiplicity="-1"/>

+    </elements>

+    <elements name="EObjectValueStyle" supertypes="//@dataContexts.0/@elements.21">

+      <properties name="eObjectValue" type="Reference"/>

+    </elements>

+    <elements name="EObjectListValueStyle" supertypes="//@dataContexts.0/@elements.21">

+      <properties name="eObjectListValue" type="Reference" multiplicity="-1"/>

+    </elements>

+    <elements name="ByteArrayValueStyle" supertypes="//@dataContexts.0/@elements.21">

+      <properties name="byteArrayValue"/>

+    </elements>

+    <elements name="BooleanListValueStyle" supertypes="//@dataContexts.0/@elements.21">

+      <properties name="booleanListValue" multiplicity="-1"/>

+    </elements>

+    <elements name="HintedDiagramLinkStyle" supertypes="//@dataContexts.0/@elements.35 //@dataContexts.0/@elements.0">

+      <properties name="hint"/>

+    </elements>

+    <elements name="DiagramLinkStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="diagramLink" type="Reference"/>

+    </elements>

+    <elements name="MultiDiagramLinkStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="diagramLinks" type="Reference" multiplicity="-1"/>

+    </elements>

+    <elements name="TextStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="textAlignment" type="Enumeration"/>

+    </elements>

+    <elements name="LineTypeStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="lineType" type="Enumeration"/>

+    </elements>

+    <elements name="ArrowStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="arrowSource" type="Enumeration"/>

+      <properties name="arrowTarget" type="Enumeration"/>

+    </elements>

+    <elements name="RoundedCornersStyle" supertypes="//@dataContexts.0/@elements.0">

+      <properties name="roundedBendpointsRadius" type="Integer"/>

+    </elements>

+    <elements name="GradientData">

+      <properties name="gradientColor1" label="Gradient color" type="Integer"/>

+      <properties name="gradientColor2" label="Gradient color 2" type="Integer"/>

+      <properties name="gradientStyle" type="Enumeration"/>

+      <properties name="activate" label="Activate" type="Boolean"/>

+    </elements>

+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.0"/>

+  </dataContexts>

+</contexts:Context>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/FillStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/FillStyle.xwt
index 371432a832e..236407b2849 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/FillStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/FillStyle.xwt
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

 	text="Fill">

 	<Composite.layout>

 		<GridLayout></GridLayout>

@@ -20,7 +21,7 @@
 		<Group.layout>

 			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

 		</Group.layout>

-		<ppe:ViewEditor input="{Binding}" view="notation:SingleGradientData"

-			property="notation:FillStyle:gradient"></ppe:ViewEditor>

+		<ppe:ViewEditor view="style:SingleGradientData"

+			input="{Binding}" property="notation:FillStyle:gradient"></ppe:ViewEditor>

 	</Group>

 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/FontStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/FontStyle.xwt
index 47b7aa17565..46d642d8b9a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/FontStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/FontStyle.xwt
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors">

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

+	xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<GridLayout></GridLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/LineStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/LineStyle.xwt
index fb9625b6c70..b67410f65e2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/LineStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/LineStyle.xwt
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:j="clr-namespace:java.lang"

+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="Line">

+	text="Line">

 	<Composite.layout>

 		<GridLayout></GridLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleArrowStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleArrowStyle.xwt
index d39c548a243..f826bd0ae84 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleArrowStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleArrowStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleBooleanListValueStyle.xwt
index 0972b3893fb..8fd1b2ad08e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleBooleanListValueStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

+	xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBooleanValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleBooleanValueStyle.xwt
index a8c3646c414..6a89e368bb1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBooleanValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleBooleanValueStyle.xwt
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRelativeBendpoints.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleByteArrayValueStyle.xwt
index 0972b3893fb..0972b3893fb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRelativeBendpoints.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleByteArrayValueStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleTitleStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleCanonicalStyle.xwt
index 50b895807ee..97d5becd5d3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleTitleStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleCanonicalStyle.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

@@ -10,6 +11,6 @@
 			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

 		</Composite.layout>

 		<ppe:BooleanRadio input="{Binding}"

-			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>

+			property="notation:CanonicalStyle:canonical"></ppe:BooleanRadio>

 	</Composite>

 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleShapeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleConnectorStyle.xwt
index 153489f2dc3..153489f2dc3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleShapeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleConnectorStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIntListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDataTypeStyle.xwt
index efa18b1c194..9047bd98f8e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIntListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDataTypeStyle.xwt
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDescriptionStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDescriptionStyle.xwt
new file mode 100644
index 00000000000..f852ec3e3dd
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDescriptionStyle.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:j="clr-namespace:java.lang">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDiagramLinkStyle.xwt
new file mode 100644
index 00000000000..f010630797c
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDiagramLinkStyle.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagramStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDiagramStyle.xwt
index f66296009f9..69182c394d4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagramStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDiagramStyle.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDecorationNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDoubleListValueStyle.xwt
index c06f378902d..8d0743d63a1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDecorationNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDoubleListValueStyle.xwt
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringToPropertyValueMapEntry.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDoubleValueStyle.xwt
index 755961dc28d..755961dc28d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringToPropertyValueMapEntry.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDoubleValueStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDrawerStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDrawerStyle.xwt
new file mode 100644
index 00000000000..2888a0fe95d
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDrawerStyle.xwt
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:j="clr-namespace:java.lang">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:BooleanRadio input="{Binding}"

+			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>

+	</Composite>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIntValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleEObjectListValueStyle.xwt
index abe6b00910f..0f03fd30c5d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIntValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleEObjectListValueStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleEObjectValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleEObjectValueStyle.xwt
new file mode 100644
index 00000000000..8d0743d63a1
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleEObjectValueStyle.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFillStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFillStyle.xwt
index 92b43a2ebb4..92b43a2ebb4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFillStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFillStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRatio.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFilteringStyle.xwt
index 3309b472c64..40c5c99caa6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRatio.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFilteringStyle.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

@@ -9,6 +10,6 @@
 		<Composite.layout>

 			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

 		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:Ratio:value"></ppe:StringEditor>

+		<ppe:EnumCombo input="{Binding}" property="notation:FilteringStyle:filtering"></ppe:EnumCombo>

 	</Composite>

 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFontStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFontStyle.xwt
index ea846fff252..ea846fff252 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFontStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFontStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImage.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleGuideStyle.xwt
index 51204c02825..51204c02825 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImage.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleGuideStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLocation.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleHintedDiagramLinkStyle.xwt
index 51204c02825..51204c02825 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLocation.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleHintedDiagramLinkStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleImageBufferStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleImageBufferStyle.xwt
new file mode 100644
index 00000000000..8d0743d63a1
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleImageBufferStyle.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleAnchor.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleImageStyle.xwt
index 9ba4ce8ae90..9ba4ce8ae90 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleAnchor.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleImageStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleIntListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleIntListValueStyle.xwt
new file mode 100644
index 00000000000..f010630797c
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleIntListValueStyle.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGuideStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleIntValueStyle.xwt
index efa18b1c194..9047bd98f8e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGuideStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleIntValueStyle.xwt
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLineStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleLineStyle.xwt
index 4aa07d55061..4aa07d55061 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLineStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleLineStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLineTypeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleLineTypeStyle.xwt
index a7a7092d6ad..3e4724efc20 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLineTypeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleLineTypeStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

+<Composite xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleListValueStyle.xwt
index 4d0cc388e09..4d0cc388e09 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleListValueStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleMultiDiagramLinkStyle.xwt
index efa18b1c194..9047bd98f8e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleMultiDiagramLinkStyle.xwt
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLayoutConstraint.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleNamedStyle.xwt
index b4b832b78ea..b4b832b78ea 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLayoutConstraint.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleNamedStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePageStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultiplePageStyle.xwt
index 5163c98313e..02cf9b3ecc2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePageStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultiplePageStyle.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePropertiesSetStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultiplePropertiesSetStyle.xwt
index 73058aaffc8..c902f6a4fb0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePropertiesSetStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultiplePropertiesSetStyle.xwt
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRoundedCornersStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleRoundedCornersStyle.xwt
index d6dfd8c9379..d6dfd8c9379 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRoundedCornersStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleRoundedCornersStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRoutingStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleRoutingStyle.xwt
index 6a39ad636ee..4e3300b33d8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRoutingStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleRoutingStyle.xwt
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

+	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

-		<GridLayout numColumns="2" makeColumnsEqualWidth="true"></GridLayout>

+		<GridLayout makeColumnsEqualWidth="true" numColumns="2"></GridLayout>

 	</Composite.layout>

 	<Group text="Routing">

 		<Group.layout>

@@ -13,13 +15,13 @@
 			<Group.layout>

 				<FillLayout></FillLayout>

 			</Group.layout>

-			<ppe:EnumRadio numColumns="2" input="{Binding}"

+			<ppe:EnumRadio input="{Binding}" numColumns="2"

 				property="notation:RoutingStyle:routing" showLabel="false"></ppe:EnumRadio>

 		</Group>

 		<Composite>

 			<Composite.layout>

-				<ppel:PropertiesLayout makeColumnsEqualWidth="true"

-					numColumns="2"></ppel:PropertiesLayout>

+				<ppel:PropertiesLayout numColumns="2"

+					makeColumnsEqualWidth="true"></ppel:PropertiesLayout>

 			</Composite.layout>

 			<ppe:BooleanCheckbox input="{Binding}"

 				property="notation:RoutingStyle:avoidObstructions"></ppe:BooleanCheckbox>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRoundedCornersStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleShapeStyle.xwt
index 153489f2dc3..153489f2dc3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRoundedCornersStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleShapeStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSingleValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleSingleValueStyle.xwt
index 22ddc4a4d54..22ddc4a4d54 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSingleValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleSingleValueStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSortingStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleSortingStyle.xwt
index d4581387e24..989161262b6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSortingStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleSortingStyle.xwt
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+<Composite

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleAnchor.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStringListValueStyle.xwt
index 4a2db70155f..cfb33162bc7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleAnchor.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStringListValueStyle.xwt
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePropertyValue.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStringValueStyle.xwt
index fe12aa8cdc9..755961dc28d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePropertyValue.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStringValueStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStyle.xwt
new file mode 100644
index 00000000000..9ba4ce8ae90
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStyle.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleTextStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleTextStyle.xwt
index 81cb9df8340..f42a3714c9c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleTextStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleTextStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang">

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDrawerStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleTitleStyle.xwt
index bee910a29ea..33965fb41e8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDrawerStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleTitleStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

+<Composite xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt">

+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

@@ -11,6 +11,6 @@
 			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

 		</Composite.layout>

 		<ppe:BooleanRadio input="{Binding}"

-			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>

+			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>

 	</Composite>

 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/RoundedCornersStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/RoundedCornersStyle.xwt
new file mode 100644
index 00000000000..3d9ef82206f
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/RoundedCornersStyle.xwt
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/ShapeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/ShapeStyle.xwt
new file mode 100644
index 00000000000..434feeaf3f2
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/ShapeStyle.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleArrowStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleArrowStyle.xwt
index a4f143abcfc..c04cab2ef03 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleArrowStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleArrowStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBooleanListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleBooleanListValueStyle.xwt
index d13178eea6b..f86615ca0e2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBooleanListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleBooleanListValueStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt">

+	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBooleanValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleBooleanValueStyle.xwt
index ded90ee49ca..a973c70dd65 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBooleanValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleBooleanValueStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

+	xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIntValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleByteArrayValueStyle.xwt
index 436d1b861d0..b453c0a0262 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIntValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleByteArrayValueStyle.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

@@ -10,7 +11,7 @@
 			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

 		</Composite.layout>

 		<ppe:StringEditor input="{Binding}"

-			property="notation:IntValueStyle:intValue"></ppe:StringEditor>

+			property="notation:ByteArrayValueStyle:byteArrayValue"></ppe:StringEditor>

 		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

 	</Composite>

 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleCanonicalStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleCanonicalStyle.xwt
index 0ab224c66d7..0913baccb44 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleCanonicalStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleCanonicalStyle.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

+<Composite xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/RoundedCornersStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleConnectorStyle.xwt
index d27ceb5e7ee..0d58bb08d27 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/RoundedCornersStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleConnectorStyle.xwt
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDataTypeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDataTypeStyle.xwt
index 3e2716acb23..28de3f5e22b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDataTypeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDataTypeStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDescriptionStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDescriptionStyle.xwt
new file mode 100644
index 00000000000..87a866e2802
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDescriptionStyle.xwt
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:StringEditor input="{Binding}"

+			property="notation:DescriptionStyle:description"></ppe:StringEditor>

+	</Composite>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDiagramLinkStyle.xwt
index 5b713533e38..91de296578a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDiagramLinkStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang">

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagramStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDiagramStyle.xwt
index f82cdd033ab..1d63b34efd6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagramStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDiagramStyle.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDoubleListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDoubleListValueStyle.xwt
new file mode 100644
index 00000000000..10bb31a6abc
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDoubleListValueStyle.xwt
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

+	</Composite>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:MultiString input="{Binding}"

+			property="notation:DoubleListValueStyle:doubleListValue"></ppe:MultiString>

+	</Composite>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNamedStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDoubleValueStyle.xwt
index ebc3888e5b6..bccaca939ef 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNamedStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDoubleValueStyle.xwt
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

+<Composite xmlns:j="clr-namespace:java.lang"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

@@ -9,6 +10,8 @@
 		<Composite.layout>

 			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

 		</Composite.layout>

+		<ppe:StringEditor input="{Binding}"

+			property="notation:DoubleValueStyle:doubleValue"></ppe:StringEditor>

 		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

 	</Composite>

 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDrawerStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDrawerStyle.xwt
index 936f5239e31..2287bd6beb7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDrawerStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDrawerStyle.xwt
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang">

+	xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEObjectListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleEObjectListValueStyle.xwt
index 2be197173b4..6e2e5f7a4d9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEObjectListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleEObjectListValueStyle.xwt
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang">

+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEObjectValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleEObjectValueStyle.xwt
index 79a35ec271b..fc8dc8ad60e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEObjectValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleEObjectValueStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFillStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFillStyle.xwt
index a9cfff796a8..a9cfff796a8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFillStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFillStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFilteringStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFilteringStyle.xwt
index ce703282aa9..1b95e0d07b3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFilteringStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFilteringStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFontStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFontStyle.xwt
index f6f48522265..f6f48522265 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFontStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFontStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGradientData.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleGradientData.xwt
index 8e9f9232ce8..5bc1500a61b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGradientData.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleGradientData.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+<Composite xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

 	text="Gradient">

 	<Composite.layout>

 		<ppel:PropertiesLayout makeColumnsEqualWidth="false"

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleGuideStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleGuideStyle.xwt
new file mode 100644
index 00000000000..89517d2ad16
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleGuideStyle.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns="http://www.eclipse.org/xwt/presentation">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleHintedDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleHintedDiagramLinkStyle.xwt
index 3578891bc27..47aae6913b5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleHintedDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleHintedDiagramLinkStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

+<Composite

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImageBufferStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleImageBufferStyle.xwt
index cf4fdbbd40c..d14d0d984c4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImageBufferStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleImageBufferStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang">

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImageStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleImageStyle.xwt
index 0c7469f7e2e..58952b1d058 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImageStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleImageStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+<Composite

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIntListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleIntListValueStyle.xwt
index 8e8ce84ae50..ba104356341 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIntListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleIntListValueStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleIntValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleIntValueStyle.xwt
new file mode 100644
index 00000000000..349258bc1c8
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleIntValueStyle.xwt
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:j="clr-namespace:java.lang"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:StringEditor input="{Binding}"

+			property="notation:IntValueStyle:intValue"></ppe:StringEditor>

+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

+	</Composite>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLineStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleLineStyle.xwt
index 530a34ebc56..530a34ebc56 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLineStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleLineStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLineTypeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleLineTypeStyle.xwt
index dd020c57332..bb6a22eba65 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLineTypeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleLineTypeStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

+<Composite

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleListValueStyle.xwt
index f93c25d6e30..6449d0ac44b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleListValueStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

+	xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleMultiDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleMultiDiagramLinkStyle.xwt
index a3ae57286cd..f03db7ba1bc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleMultiDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleMultiDiagramLinkStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleNamedStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleNamedStyle.xwt
new file mode 100644
index 00000000000..827de6b772a
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleNamedStyle.xwt
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

+	</Composite>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePageStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SinglePageStyle.xwt
index e3af9b0c8e8..665854e4057 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePageStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SinglePageStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

+<Composite

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDoubleValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SinglePropertiesSetStyle.xwt
index 8acba25d40d..58b6b56af01 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDoubleValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SinglePropertiesSetStyle.xwt
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

@@ -9,8 +10,6 @@
 		<Composite.layout>

 			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

 		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:DoubleValueStyle:doubleValue"></ppe:StringEditor>

 		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

 	</Composite>

 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleRoundedCornersStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleRoundedCornersStyle.xwt
new file mode 100644
index 00000000000..153489f2dc3
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleRoundedCornersStyle.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRoutingStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleRoutingStyle.xwt
index b21e7d0c467..9030b0db748 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRoutingStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleRoutingStyle.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

+<Composite xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<GridLayout numColumns="2" makeColumnsEqualWidth="true"></GridLayout>

 	</Composite.layout>

@@ -13,7 +14,7 @@
 			<Group.layout>

 				<FillLayout></FillLayout>

 			</Group.layout>

-			<ppe:EnumRadio input="{Binding}" numColumns="2"

+			<ppe:EnumRadio numColumns="2" input="{Binding}"

 				property="notation:RoutingStyle:routing" showLabel="false"></ppe:EnumRadio>

 		</Group>

 		<Composite>

@@ -42,7 +43,7 @@
 			<Group.layout>

 				<ppel:PropertiesLayout></ppel:PropertiesLayout>

 			</Group.layout>

-			<ppe:EnumRadio numColumns="2" input="{Binding}"

+			<ppe:EnumRadio input="{Binding}" numColumns="2"

 				property="notation:RoutingStyle:jumpLinkType" showLabel="false"></ppe:EnumRadio>

 		</Group>

 		<ppe:BooleanCheckbox input="{Binding}"

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleShapeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleShapeStyle.xwt
index d2d785c0f3f..d2d785c0f3f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleShapeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleShapeStyle.xwt
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSingleValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleSingleValueStyle.xwt
index ff383d62bac..caf13f8dbea 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSingleValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleSingleValueStyle.xwt
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

+<Composite xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSortingStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleSortingStyle.xwt
index 007128c1105..5c89867066e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSortingStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleSortingStyle.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+<Composite

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStringListValueStyle.xwt
index 0225ad16a0b..e501d018421 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStringListValueStyle.xwt
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

+<Composite

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStringValueStyle.xwt
index bfea5d3ba6b..3a536453c42 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStringValueStyle.xwt
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+<Composite

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBendpoints.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStyle.xwt
index 0972b3893fb..8fd1b2ad08e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBendpoints.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

+	xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleTextStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleTextStyle.xwt
index c287cb61d2c..e3cef434528 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleTextStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleTextStyle.xwt
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+<Composite xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

+	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleTitleStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleTitleStyle.xwt
index d9404104afa..5c0d9d725f6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleTitleStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleTitleStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:j="clr-namespace:java.lang"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicDecorationNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicDecorationNode.xwt
deleted file mode 100644
index a09bc27f944..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicDecorationNode.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleConnectorStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleConnectorStyle.xwt
deleted file mode 100644
index d12e2bc0d41..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleConnectorStyle.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDescriptionStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDescriptionStyle.xwt
deleted file mode 100644
index fe12aa8cdc9..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDescriptionStyle.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDoubleValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDoubleValueStyle.xwt
deleted file mode 100644
index 48685e97082..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDoubleValueStyle.xwt
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEObjectValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEObjectValueStyle.xwt
deleted file mode 100644
index efa18b1c194..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEObjectValueStyle.xwt
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleGuide.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleGuide.xwt
deleted file mode 100644
index 5d444d290de..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleGuide.xwt
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}" property="notation:Guide:position"></ppe:IntegerEditor>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleGuideStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleGuideStyle.xwt
deleted file mode 100644
index a8c3646c414..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleGuideStyle.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleHintedDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleHintedDiagramLinkStyle.xwt
deleted file mode 100644
index 48685e97082..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleHintedDiagramLinkStyle.xwt
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImageStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImageStyle.xwt
deleted file mode 100644
index 5875b27a695..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImageStyle.xwt
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNamedStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNamedStyle.xwt
deleted file mode 100644
index 73058aaffc8..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNamedStyle.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNodeEntry.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNodeEntry.xwt
deleted file mode 100644
index 3805db4c2ce..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNodeEntry.xwt
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:NodeEntry:value"></ppe:EnumCombo>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringObjectConverter.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringObjectConverter.xwt
deleted file mode 100644
index 48685e97082..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringObjectConverter.xwt
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicDecorationNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicDecorationNode.xwt
deleted file mode 100644
index 3e09e2359ef..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicDecorationNode.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBounds.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBounds.xwt
deleted file mode 100644
index abe6b00910f..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBounds.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleByteArrayValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleByteArrayValueStyle.xwt
deleted file mode 100644
index 98996d392d4..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleByteArrayValueStyle.xwt
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:ByteArrayValueStyle:byteArrayValue"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagram.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagram.xwt
deleted file mode 100644
index 94417b8fd6a..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagram.xwt
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:Diagram:name"></ppe:StringEditor>

-		<ppe:StringLabel input="{Binding}" property="notation:View:type"></ppe:StringLabel>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDoubleListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDoubleListValueStyle.xwt
deleted file mode 100644
index fd2e7a6d719..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDoubleListValueStyle.xwt
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="notation:DoubleListValueStyle:doubleListValue"></ppe:MultiString>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIdentityAnchor.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIdentityAnchor.xwt
deleted file mode 100644
index 00abe47a686..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIdentityAnchor.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLayoutConstraint.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLayoutConstraint.xwt
deleted file mode 100644
index fe12aa8cdc9..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLayoutConstraint.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRelativeBendpoints.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRelativeBendpoints.xwt
deleted file mode 100644
index 345fa6160d9..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRelativeBendpoints.xwt
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:RelativeBendpoints:points"></ppe:StringEditor>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleShape.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleShape.xwt
deleted file mode 100644
index f0ce3cc1278..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleShape.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSize.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSize.xwt
deleted file mode 100644
index 5875b27a695..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSize.xwt
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringObjectConverter.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringObjectConverter.xwt
deleted file mode 100644
index ad991d92b1e..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringObjectConverter.xwt
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStyle.xwt
deleted file mode 100644
index ad991d92b1e..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStyle.xwt
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-</Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.xml
index 619d6a4c09c..821bcac39e2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <?eclipse version="3.4"?>

 <plugin>

+   <extension-point id="stylehandler" name="StyleHandler" schema="schema/stylehandler.exsd"/>

    <extension

          point="org.eclipse.papyrus.views.properties.context">

       <context

-            contextModel="model/notation.ctx">

+            contextModel="model/style/style.ctx">

+      </context>

+      <context

+            contextModel="model/notation/notation.ctx">

       </context>

    </extension>

    <extension

@@ -13,5 +17,12 @@
             environmentModel="model/Environment.xmi">

       </environment>

    </extension>

+   <extension

+         point="org.eclipse.papyrus.infra.gmfdiag.properties.stylehandler">

+      <stylehandler

+            priority="100"

+            provider="org.eclipse.papyrus.infra.gmfdiag.properties.extension.NotationStyleHandlerProvider">

+      </stylehandler>

+   </extension>

 

 </plugin>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/schema/stylehandler.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/schema/stylehandler.exsd
new file mode 100644
index 00000000000..224cb910077
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/schema/stylehandler.exsd
@@ -0,0 +1,109 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<!-- Schema file written by PDE -->

+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.properties" xmlns="http://www.w3.org/2001/XMLSchema">

+<annotation>

+      <appinfo>

+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.properties" id="stylehandler" name="StyleHandler"/>

+      </appinfo>

+      <documentation>

+         [Enter description of this extension point.]

+      </documentation>

+   </annotation>

+

+   <element name="extension">

+      <annotation>

+         <appinfo>

+            <meta.element />

+         </appinfo>

+      </annotation>

+      <complexType>

+         <sequence>

+            <element ref="stylehandler" minOccurs="1" maxOccurs="unbounded"/>

+         </sequence>

+         <attribute name="point" type="string" use="required">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+            </annotation>

+         </attribute>

+         <attribute name="id" type="string">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+            </annotation>

+         </attribute>

+         <attribute name="name" type="string">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+               <appinfo>

+                  <meta.attribute translatable="true"/>

+               </appinfo>

+            </annotation>

+         </attribute>

+      </complexType>

+   </element>

+

+   <element name="stylehandler">

+      <complexType>

+         <attribute name="provider" type="string" use="required">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+               <appinfo>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.StyleHandlerProvider"/>

+               </appinfo>

+            </annotation>

+         </attribute>

+         <attribute name="priority" type="string" use="required">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+            </annotation>

+         </attribute>

+      </complexType>

+   </element>

+

+   <annotation>

+      <appinfo>

+         <meta.section type="since"/>

+      </appinfo>

+      <documentation>

+         [Enter the first release in which this extension point appears.]

+      </documentation>

+   </annotation>

+

+   <annotation>

+      <appinfo>

+         <meta.section type="examples"/>

+      </appinfo>

+      <documentation>

+         [Enter extension point usage example here.]

+      </documentation>

+   </annotation>

+

+   <annotation>

+      <appinfo>

+         <meta.section type="apiinfo"/>

+      </appinfo>

+      <documentation>

+         [Enter API information here.]

+      </documentation>

+   </annotation>

+

+   <annotation>

+      <appinfo>

+         <meta.section type="implementation"/>

+      </appinfo>

+      <documentation>

+         [Enter information about supplied implementation of this extension point.]

+      </documentation>

+   </annotation>

+

+

+</schema>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/AppearanceConstraint.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/AppearanceConstraint.java
new file mode 100644
index 00000000000..4807b18e152
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/AppearanceConstraint.java
@@ -0,0 +1,99 @@
+/*****************************************************************************

+ * Copyright (c) 2012 CEA LIST.

+ * 

+ * 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:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;

+

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;

+import org.eclipse.papyrus.infra.constraints.DisplayUnit;

+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

+import org.eclipse.papyrus.infra.gmfdiag.properties.extension.StyleHandlerManager;

+import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.StyleHandlerProvider;

+import org.eclipse.papyrus.views.properties.Activator;

+

+/**

+ * A constraint matching an Object on which the Appearance properties can

+ * be applied. This constraint dispatches

+ * 

+ * @author Camille Letavernier

+ */

+public class AppearanceConstraint implements Constraint {

+

+	private final List<Constraint> constraints;

+

+	private DisplayUnit display;

+

+	private ConstraintDescriptor descriptor;

+

+	public AppearanceConstraint() {

+		constraints = new LinkedList<Constraint>();

+		for(StyleHandlerProvider provider : StyleHandlerManager.instance.getStyleHandlerProviders()) {

+			try {

+				Constraint constraint = provider.createConstraint();

+				if(constraint == null) {

+					Activator.log.warn("StyleHandlerProvider " + provider.getClass().getName() + " provided an invalid Constraint");

+				} else {

+					constraints.add(constraint);

+				}

+			} catch (Exception ex) {

+				Activator.log.error(ex);

+			}

+		}

+	}

+

+	public boolean overrides(Constraint constraint) {

+		//Unsupported. The appearance property view constraints are not automatically overrideable

+		return false;

+	}

+

+	public boolean match(IStructuredSelection selection) {

+		for(Constraint constraint : constraints) {

+			if(constraint.match(selection)) {

+				return true;

+			}

+		}

+		return false;

+	}

+

+	public void setConstraintDescriptor(ConstraintDescriptor descriptor) {

+		this.descriptor = descriptor;

+		display = getDisplay(descriptor);

+

+		for(Constraint constraint : constraints) {

+			try {

+				constraint.setConstraintDescriptor(descriptor);

+			} catch (Exception ex) {

+				Activator.log.error(ex);

+			}

+		}

+	}

+

+	public DisplayUnit getDisplayUnit() {

+		return display;

+	}

+

+	private DisplayUnit getDisplay(ConstraintDescriptor descriptor) {

+		if(descriptor.getDisplay() == null) {

+			if(descriptor.eContainer() instanceof ConstraintDescriptor) {

+				return getDisplay((ConstraintDescriptor)descriptor.eContainer());

+			}

+		}

+		return descriptor.getDisplay();

+	}

+

+	public ConstraintDescriptor getDescriptor() {

+		return descriptor;

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsEditPartConstraint.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsEditPartConstraint.java
index a44467b4f65..2a716fea4a8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsEditPartConstraint.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsEditPartConstraint.java
@@ -12,18 +12,20 @@
 package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;

 

 import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

 import org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint;

 import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

 

 /**

- * Tests if the selection is an EditPart

+ * Tests if the selection is an EditPart (Excluding DiagramEditPart)

  * 

  * @author Camille Letavernier

  */

 public class IsEditPartConstraint extends AbstractConstraint {

 

+	@Override

 	public boolean match(Object selection) {

-		return selection instanceof EditPart;

+		return selection instanceof EditPart && !(selection instanceof DiagramEditPart);

 	}

 

 	/**

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/NotationStyleHandlerProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/NotationStyleHandlerProvider.java
new file mode 100644
index 00000000000..fdba8fba81e
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/NotationStyleHandlerProvider.java
@@ -0,0 +1,49 @@
+/*****************************************************************************

+ * Copyright (c) 2012 CEA LIST.

+ * 

+ * 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:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.properties.extension;

+

+import org.eclipse.gmf.runtime.notation.datatype.GradientData;

+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

+import org.eclipse.papyrus.infra.gmfdiag.properties.constraint.GMFNotationConstraint;

+import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.NotationModelElementFactory;

+import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.StyleHandlerProvider;

+import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

+import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

+

+/**

+ * Default implementation of StyleHandlerProvider

+ * Handles the GMF Notation views (With a low priority)

+ * 

+ * @author Camille Letavernier

+ */

+public class NotationStyleHandlerProvider implements StyleHandlerProvider {

+

+	private ModelElementFactory factory = new NotationModelElementFactory();

+

+	public Constraint createConstraint() {

+		return new GMFNotationConstraint();

+	}

+

+	public boolean isProviderFor(Object selection) {

+		if(selection instanceof GradientData) {

+			return true;

+		}

+		return NotationHelper.findView(selection) != null;

+	}

+

+	public ModelElement createModelElement(Object selection, DataContextElement context) {

+		return factory.createFromSource(selection, context);

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/StyleHandlerManager.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/StyleHandlerManager.java
new file mode 100644
index 00000000000..27f73c9509c
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/StyleHandlerManager.java
@@ -0,0 +1,57 @@
+/*****************************************************************************

+ * Copyright (c) 2012 CEA LIST.

+ * 

+ * 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:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.properties.extension;

+

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Map;

+import java.util.TreeMap;

+

+import org.eclipse.core.runtime.IConfigurationElement;

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.StyleHandlerProvider;

+

+

+public class StyleHandlerManager {

+

+	public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".stylehandler";

+

+	private final List<StyleHandlerProvider> providers;

+

+	private StyleHandlerManager() {

+		Map<Integer, StyleHandlerProvider> providersMap = new TreeMap<Integer, StyleHandlerProvider>();

+

+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

+

+		for(IConfigurationElement e : config) {

+			try {

+				StyleHandlerProvider provider = (StyleHandlerProvider)e.createExecutableExtension("provider"); //$NON-NLS-1$

+				String priorityString = e.getAttribute("priority");

+				int priority = Integer.parseInt(priorityString);

+				providersMap.put(priority, provider);

+			} catch (NumberFormatException ex) {

+				Activator.log.error("The plugin " + e.getContributor() + " provided an invalid extension for " + EXTENSION_ID, ex);

+			} catch (Exception ex) {

+				Activator.log.error(ex);

+			}

+		}

+

+		providers = new LinkedList<StyleHandlerProvider>(providersMap.values());

+	}

+

+	public List<StyleHandlerProvider> getStyleHandlerProviders() {

+		return providers;

+	}

+

+	public static StyleHandlerManager instance = new StyleHandlerManager();

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/AppearanceModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/AppearanceModelElementFactory.java
new file mode 100644
index 00000000000..11f5520683c
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/AppearanceModelElementFactory.java
@@ -0,0 +1,44 @@
+/*****************************************************************************

+ * Copyright (c) 2012 CEA LIST.

+ * 

+ * 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:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;

+

+import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.properties.extension.StyleHandlerManager;

+import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

+import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

+

+/**

+ * A ModelElementFactory for the Appearance property view. Dispatches the

+ * creation of ModelElement to the registered StyleHandlerProvider with

+ * the highest priority.

+ * 

+ * @author Camille Letavernier

+ */

+public class AppearanceModelElementFactory implements ModelElementFactory {

+

+	public ModelElement createFromSource(Object sourceElement, DataContextElement context) {

+		for(StyleHandlerProvider provider : StyleHandlerManager.instance.getStyleHandlerProviders()) {

+			if(provider.isProviderFor(sourceElement)) {

+				ModelElement element = provider.createModelElement(sourceElement, context);

+				if(element == null) {

+					Activator.log.warn("The StyleHandlerProvider " + provider.getClass().getName() + " provided an invalid ModelElement");

+				}

+				return element;

+			}

+		}

+

+		Activator.log.warn("No StyleHandlerProvider found for the following object: " + sourceElement);

+		return null;

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java
index c83369ed04d..49c6626c916 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java
@@ -61,7 +61,7 @@ public class GMFModelElement extends EMFModelElement {
 	}

 

 	@Override

-	public IObservable doGetObservable(String propertyPath) {

+	protected IObservable doGetObservable(String propertyPath) {

 		FeaturePath featurePath = getFeaturePath(propertyPath);

 		EStructuralFeature feature = getFeature(propertyPath);

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/StyleHandlerProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/StyleHandlerProvider.java
new file mode 100644
index 00000000000..8f93d6981c7
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/StyleHandlerProvider.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * Copyright (c) 2012 CEA LIST.

+ * 

+ * 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:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;

+

+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

+import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

+

+/**

+ * 

+ * Provides a ModelElement and a Constraint implementation for a given

+ * selection.

+ * 

+ * More than one implementation can be provided, with different priorities,

+ * so that the Appearance property view can be used to edit different models,

+ * in different contexts (e.g. Notation model, CSS stylesheet, Preferences...)

+ * 

+ * The Providers can be registered through the extension point:

+ * org.eclipse.papyrus.infra.gmfdiag.properties.stylehandler

+ * 

+ * @author Camille Letavernier

+ * 

+ */

+//TODO: Can this be generalized to the whole property view framework?

+public interface StyleHandlerProvider {

+

+	/**

+	 * Returns a Constraint implementation

+	 * 

+	 * @return

+	 */

+	public Constraint createConstraint();

+

+	/**

+	 * Tests whether this provider can handle the given selection.

+	 * 

+	 * @param selection

+	 * @return

+	 */

+	public boolean isProviderFor(Object selection);

+

+	/**

+	 * Returns a ModelElement for the given selection. This method can only be

+	 * called when {@link #isProviderFor(Object)} returns true for the given

+	 * selection.

+	 * 

+	 * @param selection

+	 * @param context

+	 * @return

+	 */

+	public ModelElement createModelElement(Object selection, DataContextElement context);

+}