Bug 572794: [Properties] Fix a regression in the Architecture modelsbugs/572794-javafx-poc

- Architecture Representations depend on the Constraint model and need
to be regenerated

15 files changed, 57 insertions, 91 deletions

diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF
index 3919e577237..6bf8df604f1 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF
@@ -10,12 +10,17 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.papyrus.infra.architecture.representation.provider
 Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.edit,
  org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.constraints.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types,
  org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.types.edit;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.edit,
  org.eclipse.uml2.common.edit;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.papyrus.infra.architecture.representation.edit
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RootAutoSelectItemProvider.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RootAutoSelectItemProvider.java
index 05d3ee243d9..6559b5cacd1 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RootAutoSelectItemProvider.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RootAutoSelectItemProvider.java
@@ -128,6 +128,7 @@ public class RootAutoSelectItemProvider
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
+		super.notifyChanged(notification);
 	}
 
 	/**
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF
index e6414a94e2d..f66153ebbf5 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF
@@ -17,6 +17,7 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0
  org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.119.0,4.0.0)",
  org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.core.runtime,
  org.eclipse.emf.ecore;bundle-version="[2.21.0,3.0.0)",
  org.eclipse.papyrus.emf;bundle-version="[2.0.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/constraints.ecore b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/Constraints.ecore
index 47c6bf00595..47c6bf00595 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/constraints.ecore
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/Constraints.ecore
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/constraints.genmodel b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel
index 55226670973..4ea1ac64926 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/constraints.genmodel
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel
@@ -32,51 +32,51 @@
     <details key="INVOCATION_DELEGATES" value="IGNORE"/>
     <details key="VALIDATION_DELEGATES" value="IGNORE"/>
   </genAnnotations>
-  <foreignModel>constraints.uml</foreignModel>
+  <foreignModel>Constraints.uml</foreignModel>
   <genPackages xsi:type="genmodel:GenPackage" prefix="Constraints" basePackage="org.eclipse.papyrus.infra"
-      disposableProviderFactory="true" ecorePackage="constraints.ecore#/">
-    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="constraints.ecore#//DisplayUnit">
+      disposableProviderFactory="true" ecorePackage="Constraints.ecore#/">
+    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="Constraints.ecore#//DisplayUnit">
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-          createChild="true" ecoreFeature="ecore:EReference constraints.ecore#//DisplayUnit/constraints"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute constraints.ecore#//DisplayUnit/elementMultiplicity"/>
+          createChild="true" ecoreFeature="ecore:EReference Constraints.ecore#//DisplayUnit/constraints"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//DisplayUnit/elementMultiplicity"/>
     </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="constraints.ecore#//ConstraintDescriptor">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute constraints.ecore#//ConstraintDescriptor/name"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute constraints.ecore#//ConstraintDescriptor/overrideable"/>
+    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="Constraints.ecore#//ConstraintDescriptor">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//ConstraintDescriptor/name"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//ConstraintDescriptor/overrideable"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference constraints.ecore#//ConstraintDescriptor/overriddenConstraints"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference Constraints.ecore#//ConstraintDescriptor/overriddenConstraints"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference constraints.ecore#//ConstraintDescriptor/display"/>
+          ecoreFeature="ecore:EReference Constraints.ecore#//ConstraintDescriptor/display"/>
     </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="constraints.ecore#//SimpleConstraint">
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="Constraints.ecore#//SimpleConstraint">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference constraints.ecore#//SimpleConstraint/constraintType"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference Constraints.ecore#//SimpleConstraint/constraintType"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-          createChild="true" ecoreFeature="ecore:EReference constraints.ecore#//SimpleConstraint/properties"/>
+          createChild="true" ecoreFeature="ecore:EReference Constraints.ecore#//SimpleConstraint/properties"/>
     </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="constraints.ecore#//ConfigProperty">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute constraints.ecore#//ConfigProperty/name"/>
+    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="Constraints.ecore#//ConfigProperty">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//ConfigProperty/name"/>
     </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="constraints.ecore#//CompositeConstraint">
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="Constraints.ecore#//CompositeConstraint">
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-          createChild="true" ecoreFeature="ecore:EReference constraints.ecore#//CompositeConstraint/constraints"/>
+          createChild="true" ecoreFeature="ecore:EReference Constraints.ecore#//CompositeConstraint/constraints"/>
     </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="constraints.ecore#//ValueProperty">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute constraints.ecore#//ValueProperty/value"/>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="Constraints.ecore#//ValueProperty">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//ValueProperty/value"/>
     </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="constraints.ecore#//ReferenceProperty">
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="Constraints.ecore#//ReferenceProperty">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference constraints.ecore#//ReferenceProperty/value"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference Constraints.ecore#//ReferenceProperty/value"/>
     </genClasses>
-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Environment" disposableProviderFactory="true"
-        ecorePackage="constraints.ecore#//environment">
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="constraints.ecore#//environment/ConstraintEnvironment">
+    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Environment" basePackage="org.eclipse.papyrus.infra.constraints"
+        disposableProviderFactory="true" ecorePackage="Constraints.ecore#//environment">
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="Constraints.ecore#//environment/ConstraintEnvironment">
         <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-            createChild="true" ecoreFeature="ecore:EReference constraints.ecore#//environment/ConstraintEnvironment/constraintTypes"/>
+            createChild="true" ecoreFeature="ecore:EReference Constraints.ecore#//environment/ConstraintEnvironment/constraintTypes"/>
       </genClasses>
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="constraints.ecore#//environment/ConstraintType">
-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute constraints.ecore#//environment/ConstraintType/label"/>
-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute constraints.ecore#//environment/ConstraintType/constraintClass"/>
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="Constraints.ecore#//environment/ConstraintType">
+        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//environment/ConstraintType/label"/>
+        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//environment/ConstraintType/constraintClass"/>
       </genClasses>
     </nestedGenPackages>
   </genPackages>
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/constraints.uml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/Constraints.uml
index 267c729f201..267c729f201 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/constraints.uml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/Constraints.uml
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/plugin.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/plugin.xml
index 73e823d7292..a0bea568098 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/plugin.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/plugin.xml
@@ -18,7 +18,7 @@
    <extension-point id="ConstraintEnvironment" name="ConstraintEnvironment" schema="schema/ConstraintEnvironment.exsd"/>
 
    <extension point="org.eclipse.emf.ecore.generated_package">
-      <package class="org.eclipse.papyrus.infra.constraints.ConstraintsPackage" genModel="Model/constraints.genmodel" uri="http://www.eclipse.org/papyrus/constraints/0.9"/>
+      <package class="org.eclipse.papyrus.infra.constraints.ConstraintsPackage" genModel="Model/Constraints.genmodel" uri="http://www.eclipse.org/papyrus/constraints/0.9"/>
    </extension>
 
    <extension point="org.eclipse.emf.ecore.generated_package">
@@ -26,7 +26,7 @@
       <package
             uri="http://www.eclipse.org/papyrus/constraints/environment/0.9"
             class="org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage"
-            genModel="Model/constraints.genmodel"/>
+            genModel="Model/Constraints.genmodel"/>
    </extension>
    
    <extension
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
index 9c7edf577af..d70191c6325 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
@@ -14,13 +14,21 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.filters,
  org.eclipse.papyrus.infra.constraints.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.edit,
+ org.eclipse.papyrus.infra.types,
  org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.constraints,
  org.eclipse.papyrus.infra.filters.edit;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.edit,
  org.eclipse.papyrus.infra.types.edit;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration,
  org.eclipse.uml2.common.edit;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PathElementItemProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PathElementItemProvider.java
index 37143a518b5..01981f7e5d4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PathElementItemProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PathElementItemProvider.java
@@ -184,6 +184,7 @@ public class PathElementItemProvider
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
+		super.notifyChanged(notification);
 	}
 
 	/**
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
index d2b7cdca75b..6bc3916f877 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
@@ -16,6 +16,8 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore,
  org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.filters;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[5.0.0,6.0.0)",
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/constraints.ecore b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/constraints.ecore
deleted file mode 100644
index 5614b32f90b..00000000000
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/constraints.ecore
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="constraints" nsURI="http://www.eclipse.org/papyrus/constraints/0.9"
-    nsPrefix="constraints">
-  <eClassifiers xsi:type="ecore:EClass" name="DisplayUnit" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="constraints" upperBound="-1"
-        eType="#//ConstraintDescriptor" containment="true" eOpposite="#//ConstraintDescriptor/display"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementMultiplicity" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConstraintDescriptor" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overrideable" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="overriddenConstraints"
-        upperBound="-1" eType="#//SimpleConstraint"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="display" eType="#//DisplayUnit"
-        eOpposite="#//DisplayUnit/constraints"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SimpleConstraint" eSuperTypes="#//ConstraintDescriptor">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="constraintType" lowerBound="1"
-        eType="#//environment/ConstraintType"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//ConfigProperty" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConfigProperty" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CompositeConstraint" eSuperTypes="#//ConstraintDescriptor">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="constraints" upperBound="-1"
-        eType="#//SimpleConstraint" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ValueProperty" eSuperTypes="#//ConfigProperty">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReferenceProperty" eSuperTypes="#//ConfigProperty">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
-  </eClassifiers>
-  <eSubpackages name="environment" nsURI="http://www.eclipse.org/papyrus/constraints/environment/0.9"
-      nsPrefix="environment">
-    <eClassifiers xsi:type="ecore:EClass" name="ConstraintType">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" lowerBound="1"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="constraintClass" lowerBound="1"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="ConstraintEnvironment">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="constraintTypes" upperBound="-1"
-          eType="#//environment/ConstraintType" containment="true"/>
-    </eClassifiers>
-  </eSubpackages>
-</ecore:EPackage>
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.ecore b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.ecore
index dd4cff6955a..bc2186f6fc3 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.ecore
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.ecore
@@ -4,7 +4,7 @@
     nsPrefix="properties">
   <eSubpackages name="environment" nsURI="http://www.eclipse.org/papyrus/properties/environment/0.9"
       nsPrefix="environment">
-    <eClassifiers xsi:type="ecore:EClass" name="Environment" eSuperTypes="../../org.eclipse.papyrus.infra.constraints/Model/constraints.ecore#//environment/ConstraintEnvironment">
+    <eClassifiers xsi:type="ecore:EClass" name="Environment" eSuperTypes="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.ecore#//environment/ConstraintEnvironment">
       <eStructuralFeatures xsi:type="ecore:EReference" name="modelElementFactories"
           upperBound="-1" eType="#//environment/ModelElementFactoryDescriptor" containment="true"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="widgetTypes" upperBound="-1"
@@ -129,7 +129,7 @@
         <eAnnotations source="subsets" references="#//contexts/AbstractSection/tab"/>
       </eStructuralFeatures>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="AbstractSection" abstract="true" eSuperTypes="../../org.eclipse.papyrus.infra.constraints/Model/constraints.ecore#//DisplayUnit">
+    <eClassifiers xsi:type="ecore:EClass" name="AbstractSection" abstract="true" eSuperTypes="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.ecore#//DisplayUnit">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
           eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="tab" lowerBound="1" eType="#//contexts/Tab"
@@ -168,7 +168,7 @@
           eType="#//contexts/DataContextElement" containment="true" eOpposite="#//contexts/DataContextElement/package"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="UnknownProperty" eSuperTypes="#//contexts/Property"/>
-    <eClassifiers xsi:type="ecore:EClass" name="View" eSuperTypes="../../org.eclipse.papyrus.infra.constraints/Model/constraints.ecore#//DisplayUnit">
+    <eClassifiers xsi:type="ecore:EClass" name="View" eSuperTypes="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.ecore#//DisplayUnit">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
           eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="sections" upperBound="-1"
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.genmodel b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.genmodel
index e9ee3caee80..8d9c33f85fe 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.genmodel
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.genmodel
@@ -5,7 +5,7 @@
     editDirectory="/org.eclipse.papyrus.infra.properties.edit/src-gen" editorDirectory="/org.eclipse.papyrus.infra.properties.editor/src-gen"
     modelPluginID="org.eclipse.papyrus.infra.properties" modelName="Properties" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="11.0" copyrightFields="false"
-    usedGenPackages="../../org.eclipse.papyrus.infra.constraints/Model/constraints.genmodel#//constraints ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
+    usedGenPackages="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
     operationReflection="true" importOrganizing="true">
   <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
     <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.notation b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.notation
index 78ef796c178..6ba35d9abcf 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.notation
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.notation
@@ -89,11 +89,11 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_wIHAAZxpEeu216dzZOP2Cw"/>
       </children>
       <children xmi:type="notation:Shape" xmi:id="_wIHAApxpEeu216dzZOP2Cw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="platform:/resource/org.eclipse.papyrus.infra.constraints/Model/constraints.uml#_zg0XXJxgEeu216dzZOP2Cw"/>
+        <element xmi:type="uml:Property" href="platform:/resource/org.eclipse.papyrus.infra.constraints/Model/Constraints.uml#_zg0XXJxgEeu216dzZOP2Cw"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_wIHAA5xpEeu216dzZOP2Cw"/>
       </children>
       <children xmi:type="notation:Shape" xmi:id="_wIHABJxpEeu216dzZOP2Cw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="platform:/resource/org.eclipse.papyrus.infra.constraints/Model/constraints.uml#_zg0XX5xgEeu216dzZOP2Cw"/>
+        <element xmi:type="uml:Property" href="platform:/resource/org.eclipse.papyrus.infra.constraints/Model/Constraints.uml#_zg0XX5xgEeu216dzZOP2Cw"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_wIHABZxpEeu216dzZOP2Cw"/>
       </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_CBH3s5xkEeu216dzZOP2Cw"/>
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.uml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.uml
index 1122d6b9d88..88c38c6c2e1 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.uml
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/properties.uml
@@ -7,7 +7,7 @@
     <packagedElement xmi:type="uml:Package" xmi:id="_jfIcYZxgEeu216dzZOP2Cw" name="environment" URI="http://www.eclipse.org/papyrus/properties/environment/0.9">
       <packagedElement xmi:type="uml:Class" xmi:id="_jfIcYpxgEeu216dzZOP2Cw" name="Environment">
         <generalization xmi:type="uml:Generalization" xmi:id="_jfIcY5xgEeu216dzZOP2Cw">
-          <general xmi:type="uml:Class" href="../../org.eclipse.papyrus.infra.constraints/Model/constraints.uml#_zg0XUpxgEeu216dzZOP2Cw"/>
+          <general xmi:type="uml:Class" href="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.uml#_zg0XUpxgEeu216dzZOP2Cw"/>
         </generalization>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_jfIcZJxgEeu216dzZOP2Cw" name="modelElementFactories" type="_jfIceZxgEeu216dzZOP2Cw" isOrdered="true" aggregation="composite" association="_jfIcfJxgEeu216dzZOP2Cw">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jfIcZZxgEeu216dzZOP2Cw"/>
@@ -243,7 +243,7 @@ just the name of the context.</body>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_jfIc6JxgEeu216dzZOP2Cw" name="AbstractSection" isAbstract="true">
         <generalization xmi:type="uml:Generalization" xmi:id="_jfIc6ZxgEeu216dzZOP2Cw">
-          <general xmi:type="uml:Class" href="../../org.eclipse.papyrus.infra.constraints/Model/constraints.uml#_zg0XW5xgEeu216dzZOP2Cw"/>
+          <general xmi:type="uml:Class" href="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.uml#_zg0XW5xgEeu216dzZOP2Cw"/>
         </generalization>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_jfIc6pxgEeu216dzZOP2Cw" name="name" visibility="public" isOrdered="true">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
@@ -323,7 +323,7 @@ just the name of the context.</body>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_jfJDiZxgEeu216dzZOP2Cw" name="View">
         <generalization xmi:type="uml:Generalization" xmi:id="_jfJDipxgEeu216dzZOP2Cw">
-          <general xmi:type="uml:Class" href="../../org.eclipse.papyrus.infra.constraints/Model/constraints.uml#_zg0XW5xgEeu216dzZOP2Cw"/>
+          <general xmi:type="uml:Class" href="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.uml#_zg0XW5xgEeu216dzZOP2Cw"/>
         </generalization>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_jfJDi5xgEeu216dzZOP2Cw" name="name" visibility="public" isOrdered="true">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>