359794: [UML - Tools] Content/Label providers

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

367066: [Refactoring] There should be a central generic plug-in for pure EMF-based tools
https://bugs.eclipse.org/bugs/show_bug.cgi?id=367066

351802: [Constraints] The Property View constraints model should be more generic
https://bugs.eclipse.org/bugs/show_bug.cgi?id=351802

8 files changed, 321 insertions, 224 deletions

diff --git a/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF
index 7281b5bfbcb..a42bed34672 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF
@@ -24,7 +24,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;bundle-version="2.7.0",

  org.eclipse.emf.databinding;bundle-version="1.2.0",

  org.eclipse.papyrus.views.properties.model;bundle-version="0.9.0",

- org.eclipse.papyrus.infra.emf;bundle-version="0.9.0"

+ org.eclipse.papyrus.infra.emf;bundle-version="0.9.0",

+ org.eclipse.papyrus.infra.constraints;bundle-version="0.9.0"

 Bundle-Vendor: %providerName

 Bundle-Version: 0.9.0.qualifier

 Bundle-ManifestVersion: 2

diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/Customization.ctx b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/Customization.ctx
index bb691043108..f7f9cbd7971 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/Customization.ctx
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/Customization.ctx
@@ -1,219 +1,312 @@
 <?xml version="1.0" encoding="ASCII"?>

-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts" name="customization">

-  <tabs label="Default" id="default" category="default">

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

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

-    </sections>

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

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

-    </sections>

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

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

-    </sections>

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

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

-    </sections>

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

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

-    </sections>

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

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

-    </sections>

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

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

-    </sections>

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

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

-    </sections>

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

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

-    </sections>

-    <sections name="Multiple CustomizationConfiguration" sectionFile="ui/MultipleCustomizationConfiguration.xwt">

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

-    </sections>

-    <sections name="Multiple CustomizableElement" sectionFile="ui/MultipleCustomizableElement.xwt">

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

-    </sections>

-    <sections name="Multiple FileBasedCustomizableElement" sectionFile="ui/MultipleFileBasedCustomizableElement.xwt">

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

-    </sections>

-    <sections name="Multiple PropertyView" sectionFile="ui/MultiplePropertyView.xwt">

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

-    </sections>

-    <sections name="Multiple UICustom" sectionFile="ui/MultipleUICustom.xwt">

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

-    </sections>

-    <sections name="Multiple ModelTemplate" sectionFile="ui/MultipleModelTemplate.xwt">

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

-    </sections>

-    <sections name="Multiple Palette" sectionFile="ui/MultiplePalette.xwt">

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

-    </sections>

-    <sections name="Multiple Profile" sectionFile="ui/MultipleProfile.xwt">

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

-    </sections>

-    <sections name="Multiple UMLModel" sectionFile="ui/MultipleUMLModel.xwt">

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

-    </sections>

-  </tabs>

-  <views name="Single CustomizationConfiguration" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCustomizationConfiguration">

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

-      <properties xsi:type="contexts:ValueProperty" name="className" value="CustomizationConfiguration"/>

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-    </constraints>

-  </views>

-  <views name="Single CustomizableElement" sections="//@tabs.0/@sections.1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCustomizableElement">

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

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-      <properties xsi:type="contexts:ValueProperty" name="className" value="CustomizableElement"/>

-    </constraints>

-  </views>

-  <views name="Single FileBasedCustomizableElement" sections="//@tabs.0/@sections.2" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFileBasedCustomizableElement">

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

-      <properties xsi:type="contexts:ValueProperty" name="className" value="FileBasedCustomizableElement"/>

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-    </constraints>

-  </views>

-  <views name="Single PropertyView" sections="//@tabs.0/@sections.3" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePropertyView">

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

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-      <properties xsi:type="contexts:ValueProperty" name="className" value="PropertyView"/>

-    </constraints>

-  </views>

-  <views name="Single UICustom" sections="//@tabs.0/@sections.4" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSingleUICustom">

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

-      <properties xsi:type="contexts:ValueProperty" name="className" value="UICustom"/>

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-    </constraints>

-  </views>

-  <views name="Single ModelTemplate" sections="//@tabs.0/@sections.5" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSingleModelTemplate">

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

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-      <properties xsi:type="contexts:ValueProperty" name="className" value="ModelTemplate"/>

-    </constraints>

-  </views>

-  <views name="Single Palette" sections="//@tabs.0/@sections.6" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePalette">

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

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-      <properties xsi:type="contexts:ValueProperty" name="className" value="Palette"/>

-    </constraints>

-  </views>

-  <views name="Single Profile" sections="//@tabs.0/@sections.7" automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSingleProfile">

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

-      <properties xsi:type="contexts:ValueProperty" name="className" value="Profile"/>

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-    </constraints>

-  </views>

-  <views name="Single UMLModel" sections="//@tabs.0/@sections.8" automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSingleUMLModel">

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

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-      <properties xsi:type="contexts:ValueProperty" name="className" value="UMLModel"/>

-    </constraints>

-  </views>

-  <views name="Multiple CustomizationConfiguration" sections="//@tabs.0/@sections.9" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCustomizationConfiguration">

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

-      <properties xsi:type="contexts:ValueProperty" name="className" value="CustomizationConfiguration"/>

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-    </constraints>

-  </views>

-  <views name="Multiple CustomizableElement" sections="//@tabs.0/@sections.10" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCustomizableElement">

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

-      <properties xsi:type="contexts:ValueProperty" name="className" value="CustomizableElement"/>

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-    </constraints>

-  </views>

-  <views name="Multiple FileBasedCustomizableElement" sections="//@tabs.0/@sections.11" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFileBasedCustomizableElement">

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

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-      <properties xsi:type="contexts:ValueProperty" name="className" value="FileBasedCustomizableElement"/>

-    </constraints>

-  </views>

-  <views name="Multiple PropertyView" sections="//@tabs.0/@sections.12" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePropertyView">

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

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-      <properties xsi:type="contexts:ValueProperty" name="className" value="PropertyView"/>

-    </constraints>

-  </views>

-  <views name="Multiple UICustom" sections="//@tabs.0/@sections.13" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleUICustom">

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

-      <properties xsi:type="contexts:ValueProperty" name="className" value="UICustom"/>

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-    </constraints>

-  </views>

-  <views name="Multiple ModelTemplate" sections="//@tabs.0/@sections.14" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleModelTemplate">

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

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-      <properties xsi:type="contexts:ValueProperty" name="className" value="ModelTemplate"/>

-    </constraints>

-  </views>

-  <views name="Multiple Palette" sections="//@tabs.0/@sections.15" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePalette">

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

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-      <properties xsi:type="contexts:ValueProperty" name="className" value="Palette"/>

-    </constraints>

-  </views>

-  <views name="Multiple Profile" sections="//@tabs.0/@sections.16" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleProfile">

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

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-      <properties xsi:type="contexts:ValueProperty" name="className" value="Profile"/>

-    </constraints>

-  </views>

-  <views name="Multiple UMLModel" sections="//@tabs.0/@sections.17" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleUMLModel">

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

-      <properties xsi:type="contexts:ValueProperty" name="className" value="UMLModel"/>

-      <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

-    </constraints>

-  </views>

-  <dataContexts name="customization" label="customization">

-    <elements name="CustomizationConfiguration">

-      <properties name="plugin"/>

-      <properties name="elements" label="Configuration elements" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements name="CustomizableElement"/>

-    <elements name="FileBasedCustomizableElement">

-      <properties name="file"/>

-    </elements>

-    <elements name="PropertyView"/>

-    <elements name="UICustom">

-      <properties name="loadByDefault" type="Boolean"/>

-    </elements>

-    <elements name="ModelTemplate">

-      <properties name="language"/>

-      <properties name="name"/>

-      <properties name="id"/>

-    </elements>

-    <elements name="Palette"/>

-    <elements name="Profile">

-      <properties name="qualifiednames"/>

-      <properties name="iconpath"/>

-      <properties name="description"/>

-      <properties name="provider"/>

-      <properties name="name"/>

-    </elements>

-    <elements name="UMLModel">

-      <properties name="name"/>

-      <properties name="iconpath"/>

-      <properties name="description"/>

-      <properties name="provider"/>

-    </elements>

-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.customization/Model/Environment.xmi#//@modelElementFactories.0"/>

-  </dataContexts>

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

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

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

+	name="customization">

+	<tabs label="Default" id="default" category="default">

+		<sections name="Single CustomizationConfiguration"

+			sectionFile="ui/SingleCustomizationConfiguration.xwt">

+			<widget href="ui/SingleCustomizationConfiguration.xwt#/" />

+		</sections>

+		<sections name="Single CustomizableElement" sectionFile="ui/SingleCustomizableElement.xwt">

+			<widget href="ui/SingleCustomizableElement.xwt#/" />

+		</sections>

+		<sections name="Single FileBasedCustomizableElement"

+			sectionFile="ui/SingleFileBasedCustomizableElement.xwt">

+			<widget href="ui/SingleFileBasedCustomizableElement.xwt#/" />

+		</sections>

+		<sections name="Single PropertyView" sectionFile="ui/SinglePropertyView.xwt">

+			<widget href="ui/SinglePropertyView.xwt#/" />

+		</sections>

+		<sections name="Single UICustom" sectionFile="ui/SingleUICustom.xwt">

+			<widget href="ui/SingleUICustom.xwt#/" />

+		</sections>

+		<sections name="Single ModelTemplate" sectionFile="ui/SingleModelTemplate.xwt">

+			<widget href="ui/SingleModelTemplate.xwt#/" />

+		</sections>

+		<sections name="Single Palette" sectionFile="ui/SinglePalette.xwt">

+			<widget href="ui/SinglePalette.xwt#/" />

+		</sections>

+		<sections name="Single Profile" sectionFile="ui/SingleProfile.xwt">

+			<widget href="ui/SingleProfile.xwt#/" />

+		</sections>

+		<sections name="Single UMLModel" sectionFile="ui/SingleUMLModel.xwt">

+			<widget href="ui/SingleUMLModel.xwt#/" />

+		</sections>

+		<sections name="Multiple CustomizationConfiguration"

+			sectionFile="ui/MultipleCustomizationConfiguration.xwt">

+			<widget href="ui/MultipleCustomizationConfiguration.xwt#/" />

+		</sections>

+		<sections name="Multiple CustomizableElement" sectionFile="ui/MultipleCustomizableElement.xwt">

+			<widget href="ui/MultipleCustomizableElement.xwt#/" />

+		</sections>

+		<sections name="Multiple FileBasedCustomizableElement"

+			sectionFile="ui/MultipleFileBasedCustomizableElement.xwt">

+			<widget href="ui/MultipleFileBasedCustomizableElement.xwt#/" />

+		</sections>

+		<sections name="Multiple PropertyView" sectionFile="ui/MultiplePropertyView.xwt">

+			<widget href="ui/MultiplePropertyView.xwt#/" />

+		</sections>

+		<sections name="Multiple UICustom" sectionFile="ui/MultipleUICustom.xwt">

+			<widget href="ui/MultipleUICustom.xwt#/" />

+		</sections>

+		<sections name="Multiple ModelTemplate" sectionFile="ui/MultipleModelTemplate.xwt">

+			<widget href="ui/MultipleModelTemplate.xwt#/" />

+		</sections>

+		<sections name="Multiple Palette" sectionFile="ui/MultiplePalette.xwt">

+			<widget href="ui/MultiplePalette.xwt#/" />

+		</sections>

+		<sections name="Multiple Profile" sectionFile="ui/MultipleProfile.xwt">

+			<widget href="ui/MultipleProfile.xwt#/" />

+		</sections>

+		<sections name="Multiple UMLModel" sectionFile="ui/MultipleUMLModel.xwt">

+			<widget href="ui/MultipleUMLModel.xwt#/" />

+		</sections>

+	</tabs>

+	<views name="Single CustomizationConfiguration" sections="//@tabs.0/@sections.0"

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

+		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleCustomizationConfiguration">

+			<constraintType

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

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

+				value="CustomizationConfiguration" />

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

+				value="http://www.eclipse.org/papyrus/customization" />

+		</constraints>

+	</views>

+	<views name="Single CustomizableElement" sections="//@tabs.0/@sections.1"

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

+		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleCustomizableElement">

+			<constraintType

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

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

+				value="http://www.eclipse.org/papyrus/customization" />

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

+				value="CustomizableElement" />

+		</constraints>

+	</views>

+	<views name="Single FileBasedCustomizableElement" sections="//@tabs.0/@sections.2"

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

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

+			name="isSingleFileBasedCustomizableElement">

+			<constraintType

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

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

+				value="FileBasedCustomizableElement" />

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

+				value="http://www.eclipse.org/papyrus/customization" />

+		</constraints>

+	</views>

+	<views name="Single PropertyView" sections="//@tabs.0/@sections.3"

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

+		<constraints xsi:type="constraints:SimpleConstraint" name="isSinglePropertyView">

+			<constraintType

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

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

+				value="http://www.eclipse.org/papyrus/customization" />

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

+				value="PropertyView" />

+		</constraints>

+	</views>

+	<views name="Single UICustom" sections="//@tabs.0/@sections.4"

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

+		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleUICustom">

+			<constraintType

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

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

+				value="UICustom" />

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

+				value="http://www.eclipse.org/papyrus/customization" />

+		</constraints>

+	</views>

+	<views name="Single ModelTemplate" sections="//@tabs.0/@sections.5"

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

+		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleModelTemplate">

+			<constraintType

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

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

+				value="http://www.eclipse.org/papyrus/customization" />

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

+				value="ModelTemplate" />

+		</constraints>

+	</views>

+	<views name="Single Palette" sections="//@tabs.0/@sections.6"

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

+		<constraints xsi:type="constraints:SimpleConstraint" name="isSinglePalette">

+			<constraintType

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

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

+				value="http://www.eclipse.org/papyrus/customization" />

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

+				value="Palette" />

+		</constraints>

+	</views>

+	<views name="Single Profile" sections="//@tabs.0/@sections.7"

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

+		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleProfile">

+			<constraintType

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

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

+				value="Profile" />

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

+				value="http://www.eclipse.org/papyrus/customization" />

+		</constraints>

+	</views>

+	<views name="Single UMLModel" sections="//@tabs.0/@sections.8"

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

+		<constraints xsi:type="constraints:SimpleConstraint" name="isSingleUMLModel">

+			<constraintType

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

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

+				value="http://www.eclipse.org/papyrus/customization" />

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

+				value="UMLModel" />

+		</constraints>

+	</views>

+	<views name="Multiple CustomizationConfiguration" sections="//@tabs.0/@sections.9"

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

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

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

+			name="isMultipleCustomizationConfiguration">

+			<constraintType

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

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

+				value="CustomizationConfiguration" />

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

+				value="http://www.eclipse.org/papyrus/customization" />

+		</constraints>

+	</views>

+	<views name="Multiple CustomizableElement" sections="//@tabs.0/@sections.10"

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

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

+		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleCustomizableElement">

+			<constraintType

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

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

+				value="CustomizableElement" />

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

+				value="http://www.eclipse.org/papyrus/customization" />

+		</constraints>

+	</views>

+	<views name="Multiple FileBasedCustomizableElement" sections="//@tabs.0/@sections.11"

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

+		datacontexts="//@dataContexts.0/@elements.2">

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

+			name="isMultipleFileBasedCustomizableElement">

+			<constraintType

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

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

+				value="http://www.eclipse.org/papyrus/customization" />

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

+				value="FileBasedCustomizableElement" />

+		</constraints>

+	</views>

+	<views name="Multiple PropertyView" sections="//@tabs.0/@sections.12"

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

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

+		<constraints xsi:type="constraints:SimpleConstraint" name="isMultiplePropertyView">

+			<constraintType

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

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

+				value="http://www.eclipse.org/papyrus/customization" />

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

+				value="PropertyView" />

+		</constraints>

+	</views>

+	<views name="Multiple UICustom" sections="//@tabs.0/@sections.13"

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

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

+		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleUICustom">

+			<constraintType

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

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

+				value="UICustom" />

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

+				value="http://www.eclipse.org/papyrus/customization" />

+		</constraints>

+	</views>

+	<views name="Multiple ModelTemplate" sections="//@tabs.0/@sections.14"

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

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

+		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleModelTemplate">

+			<constraintType

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

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

+				value="http://www.eclipse.org/papyrus/customization" />

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

+				value="ModelTemplate" />

+		</constraints>

+	</views>

+	<views name="Multiple Palette" sections="//@tabs.0/@sections.15"

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

+		datacontexts="//@dataContexts.0/@elements.6">

+		<constraints xsi:type="constraints:SimpleConstraint" name="isMultiplePalette">

+			<constraintType

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

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

+				value="http://www.eclipse.org/papyrus/customization" />

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

+				value="Palette" />

+		</constraints>

+	</views>

+	<views name="Multiple Profile" sections="//@tabs.0/@sections.16"

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

+		datacontexts="//@dataContexts.0/@elements.7">

+		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleProfile">

+			<constraintType

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

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

+				value="http://www.eclipse.org/papyrus/customization" />

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

+				value="Profile" />

+		</constraints>

+	</views>

+	<views name="Multiple UMLModel" sections="//@tabs.0/@sections.17"

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

+		datacontexts="//@dataContexts.0/@elements.8">

+		<constraints xsi:type="constraints:SimpleConstraint" name="isMultipleUMLModel">

+			<constraintType

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

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

+				value="UMLModel" />

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

+				value="http://www.eclipse.org/papyrus/customization" />

+		</constraints>

+	</views>

+	<dataContexts name="customization" label="customization">

+		<elements name="CustomizationConfiguration">

+			<properties name="plugin" />

+			<properties name="elements" label="Configuration elements"

+				type="Reference" multiplicity="-1" />

+		</elements>

+		<elements name="CustomizableElement" />

+		<elements name="FileBasedCustomizableElement">

+			<properties name="file" />

+		</elements>

+		<elements name="PropertyView" />

+		<elements name="UICustom">

+			<properties name="loadByDefault" type="Boolean" />

+		</elements>

+		<elements name="ModelTemplate">

+			<properties name="language" />

+			<properties name="name" />

+			<properties name="id" />

+		</elements>

+		<elements name="Palette" />

+		<elements name="Profile">

+			<properties name="qualifiednames" />

+			<properties name="iconpath" />

+			<properties name="description" />

+			<properties name="provider" />

+			<properties name="name" />

+		</elements>

+		<elements name="UMLModel">

+			<properties name="name" />

+			<properties name="iconpath" />

+			<properties name="description" />

+			<properties name="provider" />

+		</elements>

+		<modelElementFactory

+			href="ppe:/environment/org.eclipse.papyrus.customization/Model/Environment.xmi#//@modelElementFactories.0" />

+	</dataContexts>

 </contexts:Context>

diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Environment.xmi b/plugins/customization/org.eclipse.papyrus.customization/Model/Environment.xmi
index acf1704d653..e761d49334d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Environment.xmi
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Environment.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="ASCII"?>

-<environment:Environment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:environment="http://www.eclipse.org/papyrus/properties/environment">

+<environment:Environment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:environment="http://www.eclipse.org/papyrus/properties/environment/0.9">

   <modelElementFactories name="Customization Plugin Factory" factoryClass="org.eclipse.papyrus.customization.modelelement.CustomizationModelElementFactory"/>

 </environment:Environment>

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customization/impl/CustomizationFactoryImpl.java b/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customization/impl/CustomizationFactoryImpl.java
index a1fce8fcd28..ef87eddf59e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customization/impl/CustomizationFactoryImpl.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customization/impl/CustomizationFactoryImpl.java
@@ -11,6 +11,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.papyrus.customization.model.customization.*;

 import org.eclipse.papyrus.customization.model.customization.CustomizationConfiguration;

 import org.eclipse.papyrus.customization.model.customization.CustomizationFactory;

 import org.eclipse.papyrus.customization.model.customization.CustomizationPackage;

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customization/util/CustomizationAdapterFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customization/util/CustomizationAdapterFactory.java
index a49c517058b..5e3ec814aa0 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customization/util/CustomizationAdapterFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customization/util/CustomizationAdapterFactory.java
@@ -10,6 +10,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

 import org.eclipse.emf.ecore.EObject;

+import org.eclipse.papyrus.customization.model.customization.*;

 import org.eclipse.papyrus.customization.model.customization.CustomizableElement;

 import org.eclipse.papyrus.customization.model.customization.CustomizationConfiguration;

 import org.eclipse.papyrus.customization.model.customization.CustomizationPackage;

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customization/util/CustomizationSwitch.java b/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customization/util/CustomizationSwitch.java
index 2a9a7e12ac8..7de3416e123 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customization/util/CustomizationSwitch.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customization/util/CustomizationSwitch.java
@@ -9,6 +9,7 @@ package org.eclipse.papyrus.customization.model.customization.util;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.util.Switch;

+import org.eclipse.papyrus.customization.model.customization.*;

 import org.eclipse.papyrus.customization.model.customization.CustomizableElement;

 import org.eclipse.papyrus.customization.model.customization.CustomizationConfiguration;

 import org.eclipse.papyrus.customization.model.customization.CustomizationPackage;

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/display/DisplayManager.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/display/DisplayManager.java
index 32d8f05c598..fba9493b385 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/display/DisplayManager.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/display/DisplayManager.java
@@ -1,7 +1,7 @@
 package org.eclipse.papyrus.customization.display;

 

 import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;

-import org.eclipse.papyrus.views.properties.runtime.ConstraintEngine;

+import org.eclipse.papyrus.views.properties.runtime.ViewConstraintEngine;

 

 

 public class DisplayManager {

@@ -11,7 +11,7 @@ public class DisplayManager {
 		constraintEngine = ConfigurationManager.instance.constraintEngine;

 

 		//TODO : Add support for local constraint engines in the creation factories

-		//		constraintEngine = new DefaultConstraintEngine();

+		//		constraintEngine = new DefaultViewConstraintEngine();

 		//		ResourceSet resourceSet = new ResourceSetImpl();

 		//		URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/Model/Customization/Customization.ctx", true); //$NON-NLS-1$

 		//		try {

@@ -29,5 +29,5 @@ public class DisplayManager {
 

 	public static DisplayManager instance = new DisplayManager();

 

-	public ConstraintEngine constraintEngine;

+	public ViewConstraintEngine constraintEngine;

 }

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/wizard/CustomizationPage.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/wizard/CustomizationPage.java
index 5c319ad5347..4330d422290 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/wizard/CustomizationPage.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/wizard/CustomizationPage.java
@@ -21,8 +21,8 @@ import org.eclipse.papyrus.customization.messages.Messages;
 import org.eclipse.papyrus.customization.model.customization.CustomizationConfiguration;

 import org.eclipse.papyrus.customization.model.customization.CustomizationPackage;

 import org.eclipse.papyrus.views.properties.contexts.View;

-import org.eclipse.papyrus.views.properties.runtime.ConstraintEngine;

 import org.eclipse.papyrus.views.properties.runtime.EmbeddedDisplayEngine;

+import org.eclipse.papyrus.views.properties.runtime.ViewConstraintEngine;

 import org.eclipse.papyrus.views.properties.widgets.layout.PropertiesLayout;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.FillLayout;

@@ -59,7 +59,7 @@ public class CustomizationPage extends WizardPage {
 

 		IStructuredSelection selection = new StructuredSelection(configuration);

 

-		ConstraintEngine constraintEngine = DisplayManager.instance.constraintEngine;

+		ViewConstraintEngine constraintEngine = DisplayManager.instance.constraintEngine;

 		Set<View> views = constraintEngine.getViews(selection);

 

 		Composite self = new Composite(container, SWT.BORDER);