Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2011-05-16 15:15:04 +0000
committervlorenzo2011-05-16 15:15:04 +0000
commit76aaf6661d06a40cb7fe93a35a472732edc824d4 (patch)
treece9eda02b3e958fbefdfc2977f8c1145f1130d2d /incoming
parent65b92217cd3a726046bf38458c16f0ca08edf4dd (diff)
downloadorg.eclipse.papyrus-76aaf6661d06a40cb7fe93a35a472732edc824d4.tar.gz
org.eclipse.papyrus-76aaf6661d06a40cb7fe93a35a472732edc824d4.tar.xz
org.eclipse.papyrus-76aaf6661d06a40cb7fe93a35a472732edc824d4.zip
NEW - bug 335332: [Property View] Papyrus shall provide an extensible property view runtime
https://bugs.eclipse.org/bugs/show_bug.cgi?id=335332 C. Letavernier Contribution
Diffstat (limited to 'incoming')
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/Customization.ctx16
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/custom.querySet4
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/EcoreInstanceOf.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/GridLayout.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/GroupAttributes.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/Label.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleCompositeWidget.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleCompositeWidgetType.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConfigProperty.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConstraintDescriptor.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConstraintType.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleContext.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextElement.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextPackage.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextRoot.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDisplayUnit.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleElement.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleEnvironment.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleLayout.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleLayoutType.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleModelElementFactoryDescriptor.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleProperty.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultiplePropertyEditor.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultiplePropertyEditorType.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleReferenceAttribute.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleReferenceProperty.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleSection.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleStandardWidget.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleStandardWidgetType.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleTab.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUIComponent.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUnknownComponent.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUnknownProperty.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleValueAttribute.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleValueProperty.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleView.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidget.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidgetAttribute.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidgetType.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/OCLQuery.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/Single IntegerSpinner.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/Single ToggleButton.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleCompositeWidget.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleCompositeWidgetType.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConfigProperty.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConstraintDescriptor.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConstraintType.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleContext.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextElement.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextPackage.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextRoot.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDisplayUnit.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleElement.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleEnvironment.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleFileSelector.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleLayout.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleLayoutType.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleModelElementFactoryDescriptor.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleProperty.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SinglePropertyEditor.xwt30
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SinglePropertyEditorType.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleReferenceAttribute.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleReferenceProperty.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleSection.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleStandardWidget.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleStandardWidgetType.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleTab.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUIComponent.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUnknownComponent.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUnknownProperty.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleValueAttribute.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleValueProperty.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleView.xwt31
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidget.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidgetAttribute.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidgetType.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/Stereotype.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/Model/ui/UMLInstanceOf.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/src/org/eclipse/papyrus/properties/customization/modelelement/CustomizationModelElement.java14
-rw-r--r--incoming/org.eclipse.papyrus.properties.customization/src/org/eclipse/papyrus/properties/customization/modelelement/GenericAttributeModelElement.java8
80 files changed, 139 insertions, 112 deletions
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/Customization.ctx b/incoming/org.eclipse.papyrus.properties.customization/Model/Customization.ctx
index 8b259f1d149..1a2dca9b479 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/Customization.ctx
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/Customization.ctx
@@ -280,6 +280,15 @@
</constraints>
<widget href="ui/SingleFileSelector.xwt#/"/>
</sections>
+ <sections name="Single IntegerSpinner" sectionFile="ui/Single IntegerSpinner.xwt">
+ <constraints xsi:type="contexts:SimpleConstraint" name="isIntegerSpinner">
+ <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.2"/>
+ <properties xsi:type="contexts:ReferenceProperty" name="query">
+ <value href="custom.querySet#isIntegerSpinner"/>
+ </properties>
+ </constraints>
+ <widget href="ui/Single IntegerSpinner.xwt#/"/>
+ </sections>
</tabs>
<views name="Single Environment" sections="//@tabs.0/@sections.0" automaticContext="true">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleEnvironment">
@@ -645,7 +654,7 @@
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/properties/ui"/>
</constraints>
</views>
- <views name="Single PropertyEditor" sections="//@tabs.0/@sections.52 //@tabs.0/@sections.73 //@tabs.0/@sections.74" automaticContext="true">
+ <views name="Single PropertyEditor" sections="//@tabs.0/@sections.52 //@tabs.0/@sections.73 //@tabs.0/@sections.74 //@tabs.0/@sections.75" automaticContext="true">
<constraints xsi:type="contexts:SimpleConstraint" name="isSinglePropertyEditor">
<constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/properties/ui"/>
@@ -909,6 +918,11 @@
<properties name="allowFileSystem"/>
<properties name="filteredExtension"/>
</elements>
+ <elements name="IntegerSpinner">
+ <properties name="minimum" label="" description="The minimum value that this spinner can return"/>
+ <properties name="maximum" description="The maximum value that this spinner can return"/>
+ <properties name="increment" description="The increment value for this spinner"/>
+ </elements>
</elements>
<modelElementFactory href="pathmap://PPECustom/CustomizationEnvironment.xmi#//@modelElementFactories.0"/>
</dataContexts>
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/custom.querySet b/incoming/org.eclipse.papyrus.properties.customization/Model/custom.querySet
index 9cc38b506ba..3836dc3414e 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/custom.querySet
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/custom.querySet
@@ -38,4 +38,8 @@
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
<scope href="http://www.eclipse.org/papyrus/properties/ui#//PropertyEditor"/>
</queries>
+ <queries xsi:type="query:OCLModelQuery" name="isIntegerSpinner" description="Tests if a PropertyEditor is an IntegerSpinner" lowerBound="1" query="widgetType.widgetClass = 'IntegerSpinner' and widgetType.namespace.name = 'ppe'">
+ <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <scope href="http://www.eclipse.org/papyrus/properties/ui#//PropertyEditor"/>
+ </queries>
</query:ModelQuerySet>
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/EcoreInstanceOf.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/EcoreInstanceOf.xwt
index dc2e8c4b749..c971158aa4a 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/EcoreInstanceOf.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/EcoreInstanceOf.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Properties:EcoreInstanceOf:nsUri"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="Properties:EcoreInstanceOf:className"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Properties:EcoreInstanceOf:nsUri"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="Properties:EcoreInstanceOf:className"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/GridLayout.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/GridLayout.xwt
index 8580425afc2..8b4b3a3a696 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/GridLayout.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/GridLayout.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Custom:Attribute:GridLayout:numColumns"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="Custom:Attribute:GridLayout:makeColumnsEqualWidth"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Custom:Attribute:GridLayout:numColumns"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="Custom:Attribute:GridLayout:makeColumnsEqualWidth"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/GroupAttributes.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/GroupAttributes.xwt
index fb48283a435..7e8020539b9 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/GroupAttributes.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/GroupAttributes.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Custom:Attribute:Group:text"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Custom:Attribute:Group:text"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Label.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Label.xwt
index 95ff06fe63a..beb4755ae1a 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Label.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Label.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Custom:Attribute:Label:text"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Custom:Attribute:Label:text"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleCompositeWidget.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleCompositeWidget.xwt
index b7fa33615e2..01e70cc0e40 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleCompositeWidget.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleCompositeWidget.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleCompositeWidgetType.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleCompositeWidgetType.xwt
index bd0571a7538..2380a4c605f 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleCompositeWidgetType.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleCompositeWidgetType.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" 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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConfigProperty.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConfigProperty.xwt
index 7302f1fef08..21d4be90379 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConfigProperty.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConfigProperty.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConstraintDescriptor.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConstraintDescriptor.xwt
index 7d59c5a021d..0652e3cca94 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConstraintDescriptor.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConstraintDescriptor.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConstraintType.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConstraintType.xwt
index e042a6b22df..d8af99ae532 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConstraintType.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleConstraintType.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleContext.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleContext.xwt
index d8af99ae532..7302f1fef08 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleContext.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleContext.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextElement.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextElement.xwt
index 0652e3cca94..d8af99ae532 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextElement.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextElement.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextPackage.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextPackage.xwt
index e042a6b22df..b7fa33615e2 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextPackage.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextPackage.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextRoot.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextRoot.xwt
index b7fa33615e2..627779f9e7f 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextRoot.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDataContextRoot.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDisplayUnit.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDisplayUnit.xwt
index 43527b5a314..7d59c5a021d 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDisplayUnit.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleDisplayUnit.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleElement.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleElement.xwt
index 34c895e0be7..1ba60ede71f 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleElement.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleElement.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleEnvironment.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleEnvironment.xwt
index bf5b2414a33..c42af8507ee 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleEnvironment.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleEnvironment.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleLayout.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleLayout.xwt
index 01e70cc0e40..1ac31f24dbe 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleLayout.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleLayout.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleLayoutType.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleLayoutType.xwt
index 1ba60ede71f..e042a6b22df 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleLayoutType.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleLayoutType.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleModelElementFactoryDescriptor.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleModelElementFactoryDescriptor.xwt
index 1ba60ede71f..7d59c5a021d 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleModelElementFactoryDescriptor.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleModelElementFactoryDescriptor.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleProperty.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleProperty.xwt
index af560c63b67..609c6c9572b 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleProperty.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleProperty.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="properties:contexts:Property:multiplicity"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="properties:contexts:Property:type"></ppe:EnumCombo></Composite></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="properties:contexts:Property:multiplicity"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="properties:contexts:Property:type"></ppe:EnumCombo></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultiplePropertyEditor.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultiplePropertyEditor.xwt
index d497495c81c..12d84c2dd50 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultiplePropertyEditor.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultiplePropertyEditor.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" 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:BooleanRadio input="{Binding}" property="properties:ui:PropertyEditor:readOnly"></ppe:BooleanRadio></Composite></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="properties:ui:PropertyEditor:readOnly"></ppe:BooleanRadio></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultiplePropertyEditorType.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultiplePropertyEditorType.xwt
index 761bd0a61b0..4233462061f 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultiplePropertyEditorType.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultiplePropertyEditorType.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="properties:environment:PropertyEditorType:multiplicity"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="properties:environment:PropertyEditorType:type"></ppe:EnumCombo></Composite></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="properties:environment:PropertyEditorType:multiplicity"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="properties:environment:PropertyEditorType:type"></ppe:EnumCombo></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleReferenceAttribute.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleReferenceAttribute.xwt
index 3de4720027c..699b974ca4f 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleReferenceAttribute.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleReferenceAttribute.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" 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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleReferenceProperty.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleReferenceProperty.xwt
index d8af99ae532..699b974ca4f 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleReferenceProperty.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleReferenceProperty.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" 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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleSection.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleSection.xwt
index b7fa33615e2..ab3d7fcf9b9 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleSection.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleSection.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleStandardWidget.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleStandardWidget.xwt
index 699b974ca4f..4411f6d9377 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleStandardWidget.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleStandardWidget.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleStandardWidgetType.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleStandardWidgetType.xwt
index e042a6b22df..7d59c5a021d 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleStandardWidgetType.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleStandardWidgetType.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleTab.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleTab.xwt
index 583f071265a..3bcce30f714 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleTab.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleTab.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="properties:contexts:Tab:indented"></ppe:BooleanRadio></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="properties:contexts:Tab:indented"></ppe:BooleanRadio></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUIComponent.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUIComponent.xwt
index 4467d5e2d3b..3de4720027c 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUIComponent.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUIComponent.xwt
@@ -1,2 +1,2 @@
<?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.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUnknownComponent.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUnknownComponent.xwt
index d8af99ae532..7302f1fef08 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUnknownComponent.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUnknownComponent.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUnknownProperty.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUnknownProperty.xwt
index 4164993f3c4..27952085dc4 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUnknownProperty.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleUnknownProperty.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.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="properties:contexts:Property:multiplicity"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="properties:contexts:Property:type"></ppe:EnumCombo></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="properties:contexts:Property:multiplicity"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="properties:contexts:Property:type"></ppe:EnumCombo></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleValueAttribute.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleValueAttribute.xwt
index 0652e3cca94..e042a6b22df 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleValueAttribute.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleValueAttribute.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleValueProperty.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleValueProperty.xwt
index 43527b5a314..627779f9e7f 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleValueProperty.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleValueProperty.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleView.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleView.xwt
index 4fa8c07cae3..9c74caa6ca1 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleView.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleView.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="properties:contexts:View:elementMultiplicity"></ppe:IntegerEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="properties:contexts:View:elementMultiplicity"></ppe:IntegerEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidget.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidget.xwt
index 1ac31f24dbe..ab3d7fcf9b9 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidget.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidget.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidgetAttribute.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidgetAttribute.xwt
index 1ba60ede71f..34c895e0be7 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidgetAttribute.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidgetAttribute.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidgetType.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidgetType.xwt
index 43527b5a314..0652e3cca94 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidgetType.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/MultipleWidgetType.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/OCLQuery.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/OCLQuery.xwt
index f776424b579..43f23369284 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/OCLQuery.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/OCLQuery.xwt
@@ -1,2 +1,2 @@
<?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.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="Properties:OCLQuery:query"></ppe:ReferenceDialog></Composite></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="Properties:OCLQuery:query"></ppe:ReferenceDialog></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Single IntegerSpinner.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Single IntegerSpinner.xwt
new file mode 100644
index 00000000000..cd417d2364e
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Single IntegerSpinner.xwt
@@ -0,0 +1,2 @@
+<?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.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Custom:Attribute:IntegerSpinner:minimum"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="Custom:Attribute:IntegerSpinner:maximum"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="Custom:Attribute:IntegerSpinner:increment"></ppe:StringEditor></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Single ToggleButton.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Single ToggleButton.xwt
index 4205bfbeb12..f6f1ae3359e 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Single ToggleButton.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Single ToggleButton.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringFileSelector allowWorkspace="true" allowFileSystem="false" input="{Binding}" property="Custom:Attribute:BooleanToggle:image"></ppe:StringFileSelector></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringFileSelector allowWorkspace="true" allowFileSystem="false" input="{Binding}" property="Custom:Attribute:BooleanToggle:image"></ppe:StringFileSelector></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleCompositeWidget.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleCompositeWidget.xwt
index 6b0ebc12a5c..d36aff8a599 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleCompositeWidget.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleCompositeWidget.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation" 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:ReferenceDialog input="{Binding}" property="properties:ui:CompositeWidget:widgetType"></ppe:ReferenceDialog></Composite></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="properties:ui:CompositeWidget:widgetType"></ppe:ReferenceDialog></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleCompositeWidgetType.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleCompositeWidgetType.xwt
index ef2970175df..88ef6b197db 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleCompositeWidgetType.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleCompositeWidgetType.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:environment:WidgetType:label"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:environment:WidgetType:widgetClass"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:environment:WidgetType:label"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:environment:WidgetType:widgetClass"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConfigProperty.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConfigProperty.xwt
index fd8723f7a3e..bc14daedba3 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConfigProperty.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConfigProperty.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:contexts:ConfigProperty:name"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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="properties:contexts:ConfigProperty:name"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConstraintDescriptor.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConstraintDescriptor.xwt
index fffc16eed9c..e841cf3fa44 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConstraintDescriptor.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConstraintDescriptor.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:contexts:ConstraintDescriptor:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="properties:contexts:ConstraintDescriptor:constraintType"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio property="properties:contexts:ConstraintDescriptor:overrideable" input="{Binding}"></ppe:BooleanRadio><ppe:MultiReference input="{Binding}" property="properties:contexts:ConstraintDescriptor:overriddenConstraints"></ppe:MultiReference></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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="properties:contexts:ConstraintDescriptor:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="properties:contexts:ConstraintDescriptor:constraintType"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="properties:contexts:ConstraintDescriptor:overrideable"></ppe:BooleanRadio><ppe:MultiReference input="{Binding}" property="properties:contexts:ConstraintDescriptor:overriddenConstraints"></ppe:MultiReference></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConstraintType.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConstraintType.xwt
index 4fdb60727be..03a3b35f6aa 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConstraintType.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleConstraintType.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:environment:ConstraintType:label"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:environment:ConstraintType:constraintClass"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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="properties:environment:ConstraintType:label"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:environment:ConstraintType:constraintClass"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleContext.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleContext.xwt
index e2d87b0e8ce..ef11d6f49ab 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleContext.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleContext.xwt
@@ -1,2 +1,2 @@
<?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.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:contexts:Context:name"></ppe:StringEditor><ppe:MultiReference input="{Binding}" property="properties:contexts:Context:dependencies"></ppe:MultiReference></Composite></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:contexts:Context:name"></ppe:StringEditor><ppe:MultiReference input="{Binding}" property="properties:contexts:Context:dependencies"></ppe:MultiReference></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextElement.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextElement.xwt
index 8de0c7fbada..6a38a9dfcd2 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextElement.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextElement.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" 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="properties:contexts:DataContextElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="properties:contexts:DataContextElement:supertypes"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="properties:contexts:DataContextElement:properties"></ppe:MultiReference></Composite></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:contexts:DataContextElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="properties:contexts:DataContextElement:supertypes"></ppe:MultiReference></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextPackage.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextPackage.xwt
index d1be21bdc17..1d536445eee 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextPackage.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextPackage.xwt
@@ -1,2 +1,2 @@
<?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.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:contexts:DataContextElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="properties:contexts:DataContextElement:supertypes"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="properties:contexts:Property:contextElement"></ppe:MultiReference></Composite></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:contexts:DataContextElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="properties:contexts:DataContextElement:supertypes"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="properties:contexts:Property:contextElement"></ppe:MultiReference></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextRoot.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextRoot.xwt
index fd949677848..72a36493415 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextRoot.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDataContextRoot.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" 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="properties:contexts:DataContextElement:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:contexts:DataContextRoot:label"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="properties:contexts:DataContextRoot:modelElementFactory"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="properties:contexts:DataContextElement:supertypes"></ppe:MultiReference></Composite></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:contexts:DataContextElement:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:contexts:DataContextRoot:label"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="properties:contexts:DataContextRoot:modelElementFactory"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="properties:contexts:DataContextElement:supertypes"></ppe:MultiReference></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDisplayUnit.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDisplayUnit.xwt
index 7302f1fef08..43527b5a314 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDisplayUnit.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleDisplayUnit.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleElement.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleElement.xwt
index 4467d5e2d3b..d8af99ae532 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleElement.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleElement.xwt
@@ -1,2 +1,2 @@
<?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.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleEnvironment.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleEnvironment.xwt
index a33bf938270..9d4a124e5c8 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleEnvironment.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleEnvironment.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.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/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleFileSelector.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleFileSelector.xwt
index 59f754a3776..e4532454c00 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleFileSelector.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleFileSelector.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Custom:Attribute:FileSelector:allowWorkspace"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="Custom:Attribute:FileSelector:allowFileSystem"></ppe:StringEditor></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Custom:Attribute:FileSelector:allowWorkspace"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="Custom:Attribute:FileSelector:allowFileSystem"></ppe:StringEditor></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleLayout.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleLayout.xwt
index 94a774d44ac..41e992d003f 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleLayout.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleLayout.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="properties:ui:Layout:layoutType"></ppe:ReferenceDialog></Composite></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="properties:ui:Layout:layoutType"></ppe:ReferenceDialog></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleLayoutType.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleLayoutType.xwt
index 0a737190284..f808fbead44 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleLayoutType.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleLayoutType.xwt
@@ -1,2 +1,2 @@
<?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.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" showLabel="false" property="properties:environment:WidgetType:label"></ppe:StringEditor><ppe:StringEditor input="{Binding}" showLabel="false" property="properties:environment:WidgetType:widgetClass"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:environment:WidgetType:label" showLabel="false"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:environment:WidgetType:widgetClass" showLabel="false"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleModelElementFactoryDescriptor.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleModelElementFactoryDescriptor.xwt
index 1883030c47b..792a17e3129 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleModelElementFactoryDescriptor.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleModelElementFactoryDescriptor.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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="properties:environment:ModelElementFactoryDescriptor:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:environment:ModelElementFactoryDescriptor:factoryClass"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:environment:ModelElementFactoryDescriptor:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:environment:ModelElementFactoryDescriptor:factoryClass"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleProperty.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleProperty.xwt
index 47272191553..da938ce13b6 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleProperty.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleProperty.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:contexts:Property:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:contexts:Property:label"></ppe:StringEditor><ppe:StringMultiline input="{Binding}" property="properties:contexts:Property:description"></ppe:StringMultiline></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="properties:contexts:Property:multiplicity"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="properties:contexts:Property:type"></ppe:EnumCombo></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:contexts:Property:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:contexts:Property:label"></ppe:StringEditor><ppe:StringMultiline input="{Binding}" property="properties:contexts:Property:description"></ppe:StringMultiline></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="properties:contexts:Property:multiplicity"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="properties:contexts:Property:type"></ppe:EnumCombo></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SinglePropertyEditor.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SinglePropertyEditor.xwt
index 6d1f40c36d4..901f9695798 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SinglePropertyEditor.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SinglePropertyEditor.xwt
@@ -1,2 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="properties:ui:PropertyEditor:readOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="properties:ui:PropertyEditor:showLabel"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="properties:ui:PropertyEditor:property"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="properties:ui:PropertyEditor:widgetType"></ppe:ReferenceDialog><ppe:StringEditor input="{Binding}" property="properties:ui:PropertyEditor:customLabel"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"
+ xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation"
+ xmlns="http://www.eclipse.org/xwt/presentation">
+ <Composite.layout>
+ <ppel:PropertiesLayout></ppel:PropertiesLayout>
+ </Composite.layout>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:BooleanRadio input="{Binding}"
+ property="properties:ui:PropertyEditor:readOnly"></ppe:BooleanRadio>
+ <ppe:BooleanRadio input="{Binding}"
+ property="properties:ui:PropertyEditor:showLabel"></ppe:BooleanRadio>
+ </Composite>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:ReferenceDialog input="{Binding}"
+ property="properties:ui:PropertyEditor:property"></ppe:ReferenceDialog>
+ <ppe:ReferenceDialog input="{Binding}"
+ property="properties:ui:PropertyEditor:widgetType"></ppe:ReferenceDialog>
+ <ppe:StringEditor input="{Binding}"
+ property="properties:ui:PropertyEditor:customLabel"></ppe:StringEditor>
+ </Composite>
+</Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SinglePropertyEditorType.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SinglePropertyEditorType.xwt
index 67f2c0c0aac..939d78ffec8 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SinglePropertyEditorType.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SinglePropertyEditorType.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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="properties:environment:WidgetType:label"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:environment:WidgetType:widgetClass"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="properties:environment:PropertyEditorType:multiplicity"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="properties:environment:PropertyEditorType:type"></ppe:EnumCombo></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.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="properties:environment:WidgetType:label"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:environment:WidgetType:widgetClass"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="properties:environment:PropertyEditorType:multiplicity"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="properties:environment:PropertyEditorType:type"></ppe:EnumCombo></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleReferenceAttribute.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleReferenceAttribute.xwt
index 420114da3e2..6d2476de0ff 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleReferenceAttribute.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleReferenceAttribute.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.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="properties:ui:WidgetAttribute:name"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:ui:WidgetAttribute:name"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleReferenceProperty.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleReferenceProperty.xwt
index f98d1889f68..c7eb02b7921 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleReferenceProperty.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleReferenceProperty.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:contexts:ConfigProperty:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="properties:contexts:ReferenceProperty:value"></ppe:ReferenceDialog></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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="properties:contexts:ConfigProperty:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="properties:contexts:ReferenceProperty:value"></ppe:ReferenceDialog></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleSection.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleSection.xwt
index 0a0a5d7ffbe..49b58b8457d 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleSection.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleSection.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:contexts:Section:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:contexts:Section:sectionFile"></ppe:StringEditor><ppe:ReferenceCombo input="{Binding}" property="properties:contexts:Section:tab"></ppe:ReferenceCombo><ppe:MultiReference input="{Binding}" property="properties:contexts:DisplayUnit:constraints"><ppe:MultiReference.factory><ppec:EcorePropertyEditorFactory className="ConstraintDescriptor" nsUri="http://www.eclipse.org/papyrus/properties/contexts"></ppec:EcorePropertyEditorFactory></ppe:MultiReference.factory></ppe:MultiReference></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:contexts:Section:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:contexts:Section:sectionFile"></ppe:StringEditor><ppe:ReferenceCombo input="{Binding}" property="properties:contexts:Section:tab"></ppe:ReferenceCombo><ppe:MultiReference input="{Binding}" property="properties:contexts:DisplayUnit:constraints"></ppe:MultiReference></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleStandardWidget.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleStandardWidget.xwt
index 18d54f353bd..f49eefc8ac6 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleStandardWidget.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleStandardWidget.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="properties:ui:StandardWidget:widgetType"></ppe:ReferenceDialog></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation" 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:ReferenceDialog input="{Binding}" property="properties:ui:StandardWidget:widgetType"></ppe:ReferenceDialog></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleStandardWidgetType.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleStandardWidgetType.xwt
index 5df5140d967..c6887805c6c 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleStandardWidgetType.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleStandardWidgetType.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.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="properties:environment:WidgetType:label"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:environment:WidgetType:widgetClass"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:environment:WidgetType:label"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:environment:WidgetType:widgetClass"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleTab.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleTab.xwt
index 573c41e19e2..637cef56787 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleTab.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleTab.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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="properties:contexts:Tab:label"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:contexts:Tab:id"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:contexts:Tab:image"></ppe:StringEditor><ppe:BooleanRadio input="{Binding}" property="properties:contexts:Tab:indented"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:contexts:Tab:category"></ppe:StringEditor><ppe:ReferenceCombo input="{Binding}" property="properties:contexts:Tab:afterTab"></ppe:ReferenceCombo></Composite></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:contexts:Tab:label"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:contexts:Tab:id"></ppe:StringEditor><ppe:StringFileSelector input="{Binding}" allowWorkspace="true" allowFileSystem="false" property="properties:contexts:Tab:image"></ppe:StringFileSelector><ppe:BooleanRadio input="{Binding}" property="properties:contexts:Tab:indented"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:contexts:Tab:category"></ppe:StringEditor><ppe:ReferenceCombo input="{Binding}" property="properties:contexts:Tab:afterTab"></ppe:ReferenceCombo></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUIComponent.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUIComponent.xwt
index d77783aeb5c..162b5d2099d 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUIComponent.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUIComponent.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="properties:ui:UIComponent:attributes"><ppe:MultiReference.factory><ppec:EcorePropertyEditorFactory className="ValueAttribute" nsUri="http://www.eclipse.org/papyrus/properties/ui"></ppec:EcorePropertyEditorFactory></ppe:MultiReference.factory></ppe:MultiReference></Composite> \ No newline at end of file
+<Composite xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="properties:ui:UIComponent:attributes"><ppe:MultiReference.factory><ppec:EcorePropertyEditorFactory className="ValueAttribute" nsUri="http://www.eclipse.org/papyrus/properties/ui"></ppec:EcorePropertyEditorFactory></ppe:MultiReference.factory></ppe:MultiReference></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUnknownComponent.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUnknownComponent.xwt
index acff327e257..72b487ee482 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUnknownComponent.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUnknownComponent.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:ui:UnknownComponent:typeName"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" 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="properties:ui:UnknownComponent:typeName"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUnknownProperty.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUnknownProperty.xwt
index 87f2b155d3f..6b7fba7c3c4 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUnknownProperty.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleUnknownProperty.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:contexts:Property:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:contexts:Property:label"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="properties:contexts:Property:multiplicity"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="properties:contexts:Property:type"></ppe:EnumCombo></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:contexts:Property:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:contexts:Property:label"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="properties:contexts:Property:multiplicity"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="properties:contexts:Property:type"></ppe:EnumCombo></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleValueAttribute.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleValueAttribute.xwt
index 7f268016b73..7626587722c 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleValueAttribute.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleValueAttribute.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:ui:WidgetAttribute:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:ui:ValueAttribute:value"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:ui:WidgetAttribute:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:ui:ValueAttribute:value"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleValueProperty.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleValueProperty.xwt
index 0f6b8e43449..d8f0e405cb2 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleValueProperty.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleValueProperty.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:contexts:ConfigProperty:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:contexts:ValueProperty:value"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:contexts:ConfigProperty:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:contexts:ValueProperty:value"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleView.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleView.xwt
index 760c1612544..7fbc46f3910 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleView.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleView.xwt
@@ -1,31 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"
- xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation"
- 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="properties:contexts:View:name"></ppe:StringEditor>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:IntegerEditor input="{Binding}"
- property="properties:contexts:View:elementMultiplicity"></ppe:IntegerEditor>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:MultiReference input="{Binding}"
- property="properties:contexts:DisplayUnit:constraints">
- </ppe:MultiReference>
- </Composite>
-</Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:contexts:View:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="properties:contexts:View:elementMultiplicity"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="properties:contexts:DisplayUnit:constraints"></ppe:MultiReference></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidget.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidget.xwt
index 708a18731b1..3c8c16c9afc 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidget.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidget.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppec="clr-namespace:org.eclipse.papyrus.properties.creation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidgetAttribute.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidgetAttribute.xwt
index 9bfc2d267d6..14244acfae6 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidgetAttribute.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidgetAttribute.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="properties:ui:WidgetAttribute:name"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:ui:WidgetAttribute:name"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidgetType.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidgetType.xwt
index 68e140c2af0..8ea793200f8 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidgetType.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/SingleWidgetType.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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="properties:environment:WidgetType:label"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:environment:WidgetType:widgetClass"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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="properties:environment:WidgetType:label"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="properties:environment:WidgetType:widgetClass"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Stereotype.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Stereotype.xwt
index 951492fd5d6..93536b4094c 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Stereotype.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/Stereotype.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Properties:Stereotype:stereotypeName"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 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></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Properties:Stereotype:stereotypeName"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/UMLInstanceOf.xwt b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/UMLInstanceOf.xwt
index 44f46aa1fc5..578271783f2 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/Model/ui/UMLInstanceOf.xwt
+++ b/incoming/org.eclipse.papyrus.properties.customization/Model/ui/UMLInstanceOf.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Properties:UMLInstanceOf:umlClassName"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="Properties:UMLInstanceOf:umlClassName"></ppe:StringEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.customization/src/org/eclipse/papyrus/properties/customization/modelelement/CustomizationModelElement.java b/incoming/org.eclipse.papyrus.properties.customization/src/org/eclipse/papyrus/properties/customization/modelelement/CustomizationModelElement.java
index f44cd7d2d90..fd7c6bb96b4 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/src/org/eclipse/papyrus/properties/customization/modelelement/CustomizationModelElement.java
+++ b/incoming/org.eclipse.papyrus.properties.customization/src/org/eclipse/papyrus/properties/customization/modelelement/CustomizationModelElement.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.properties.customization.providers.TabContentProvider
import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
import org.eclipse.papyrus.properties.modelelement.AbstractModelElement;
import org.eclipse.papyrus.properties.modelelement.EMFModelElement;
-import org.eclipse.papyrus.properties.modelelement.ModelElement;
import org.eclipse.papyrus.widgets.creation.ReferenceValueFactory;
import org.eclipse.papyrus.widgets.providers.EmptyContentProvider;
import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
@@ -94,8 +93,9 @@ public class CustomizationModelElement extends AbstractModelElement {
@Override
public IStaticContentProvider getContentProvider(String propertyPath) {
EStructuralFeature feature = delegate.getFeature(propertyPath);
- if(feature == null)
+ if(feature == null) {
return EmptyContentProvider.instance;
+ }
EClassifier classifier = feature.getEType();
if(providers.containsKey(classifier)) {
@@ -116,8 +116,9 @@ public class CustomizationModelElement extends AbstractModelElement {
}
private boolean isDataContextElement(EClassifier classifier) {
- if(classifier == ContextsPackage.eINSTANCE.getDataContextElement())
+ if(classifier == ContextsPackage.eINSTANCE.getDataContextElement()) {
return true;
+ }
if(classifier instanceof EClass) {
EClass eClass = (EClass)classifier;
@@ -149,8 +150,9 @@ public class CustomizationModelElement extends AbstractModelElement {
@Override
public boolean isEditable(String propertyPath) {
- if(delegate.getFeature(propertyPath) == ContextsPackage.eINSTANCE.getSection_SectionFile())
+ if(delegate.getFeature(propertyPath) == ContextsPackage.eINSTANCE.getSection_SectionFile()) {
return false;
+ }
return delegate.isEditable(propertyPath);
}
@@ -163,4 +165,8 @@ public class CustomizationModelElement extends AbstractModelElement {
public boolean forceRefresh(String localPropertyPath) {
return false;
}
+
+ public Object getDefaultValue(String propertyPath) {
+ return delegate.getDefaultValue(propertyPath);
+ }
}
diff --git a/incoming/org.eclipse.papyrus.properties.customization/src/org/eclipse/papyrus/properties/customization/modelelement/GenericAttributeModelElement.java b/incoming/org.eclipse.papyrus.properties.customization/src/org/eclipse/papyrus/properties/customization/modelelement/GenericAttributeModelElement.java
index 61ed02b0825..4b493dc4f6f 100644
--- a/incoming/org.eclipse.papyrus.properties.customization/src/org/eclipse/papyrus/properties/customization/modelelement/GenericAttributeModelElement.java
+++ b/incoming/org.eclipse.papyrus.properties.customization/src/org/eclipse/papyrus/properties/customization/modelelement/GenericAttributeModelElement.java
@@ -24,10 +24,8 @@ import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.facet.infra.query.ModelQuery;
import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.papyrus.properties.contexts.ConfigProperty;
import org.eclipse.papyrus.properties.modelelement.AbstractModelElement;
import org.eclipse.papyrus.properties.providers.EMFObjectLabelProvider;
-import org.eclipse.papyrus.properties.ui.WidgetAttribute;
import org.eclipse.papyrus.widgets.providers.AbstractStaticContentProvider;
import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
@@ -46,7 +44,7 @@ import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
* In fact, this property is specific to the "GridLayout" and
* "PropertiesLayout". This property is defined via a key/value pair
* (i.e. a {@link WidgetAttribute} which name is "numColumns" and the value is the
- * number of columns). However, in the property view, we want a field "Number
+ * number of columns). However, in the property view, we want to display a field "Number
* of Columns" when we select a GridLayout or PropertiesLayout.
*
* The same goes for Constraints : EMFInstanceOf needs a "nsUri" and
@@ -125,4 +123,8 @@ public class GenericAttributeModelElement extends AbstractModelElement {
public ILabelProvider getLabelProvider(String propertyPath) {
return new EMFObjectLabelProvider();
}
+
+ public Object getDefaultValue(String propertyPath) {
+ return ""; //$NON-NLS-1$
+ }
}

Back to the top