add non reg for compo 0..1 1..1

143 files changed, 867 insertions, 3031 deletions

diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/icons/full/ctool16/CreateAdvancedEObjectFlatComboViewerSample_advancedeobjectflatcomboviewerCompoOptionalProperty_TotalSample.gif b/tests/org.eclipse.emf.eef.tests.nonreg.edit/icons/full/ctool16/CreateAdvancedEObjectFlatComboViewerSample_advancedeobjectflatcomboviewerCompoOptionalProperty_TotalSample.gif
new file mode 100644
index 000000000..bb27d461b
--- /dev/null
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/icons/full/ctool16/CreateAdvancedEObjectFlatComboViewerSample_advancedeobjectflatcomboviewerCompoOptionalProperty_TotalSample.gif
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/icons/full/ctool16/CreateAdvancedEObjectFlatComboViewerSample_advancedeobjectflatcomboviewerCompoRequiredProperty_TotalSample.gif b/tests/org.eclipse.emf.eef.tests.nonreg.edit/icons/full/ctool16/CreateAdvancedEObjectFlatComboViewerSample_advancedeobjectflatcomboviewerCompoRequiredProperty_TotalSample.gif
new file mode 100644
index 000000000..bb27d461b
--- /dev/null
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/icons/full/ctool16/CreateAdvancedEObjectFlatComboViewerSample_advancedeobjectflatcomboviewerCompoRequiredProperty_TotalSample.gif
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/models/eefnr.components b/tests/org.eclipse.emf.eef.tests.nonreg.edit/models/eefnr.components
index 715851ef2..e45e5b8d3 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/models/eefnr.components
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/models/eefnr.components
@@ -219,6 +219,12 @@
         <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_VWCWgBFSEeK9-dPF-WhGng" name="advancedeobjectflatcomboviewerROProperty" views="_0WSXwBEsEeKsDfmeKGw7WA">

           <model xsi:type="ecore:EReference" href="platform:/resource/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//AdvancedEObjectFlatComboViewerSample/advancedeobjectflatcomboviewerROPropery"/>

         </properties>

+        <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_6tz3EC8TEeK_A82pEPogkw" name="advancedeobjectflatcomboviewerCompoRequiredProperty" views="_3eL5YS8TEeK_A82pEPogkw">

+          <model xsi:type="ecore:EReference" href="platform:/resource/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//AdvancedEObjectFlatComboViewerSample/advancedeobjectflatcomboviewerCompoRequiredProperty"/>

+        </properties>

+        <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_6tz3ES8TEeK_A82pEPogkw" name="advancedeobjectflatcomboviewerCompoOptionalProperty" views="_3eL5Yi8TEeK_A82pEPogkw">

+          <model xsi:type="ecore:EReference" href="platform:/resource/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//AdvancedEObjectFlatComboViewerSample/advancedeobjectflatcomboviewerCompoOptionalProperty"/>

+        </properties>

         <model xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//AdvancedEObjectFlatComboViewerSample"/>

       </bindings>

       <bindings xsi:type="eef-components:PropertiesEditionComponent" xmi:id="_Fx_LPgwvEd-uP4lw9e0IMw" name="AdvancedTableCompositionEditorSample" views="_Fx_yMQwvEd-uP4lw9e0IMw">

@@ -959,6 +965,12 @@
           <elements xsi:type="eef-views:ElementEditor" xmi:id="_0WSXwBEsEeKsDfmeKGw7WA" name="advancedeobjectflatcomboviewerROProperty" readOnly="true">

             <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.9"/>

           </elements>

+          <elements xsi:type="eef-views:ElementEditor" xmi:id="_3eL5YS8TEeK_A82pEPogkw" name="advancedeobjectflatcomboviewerCompoRequiredProperty">

+            <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.9"/>

+          </elements>

+          <elements xsi:type="eef-views:ElementEditor" xmi:id="_3eL5Yi8TEeK_A82pEPogkw" name="advancedeobjectflatcomboviewerCompoOptionalProperty">

+            <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.9"/>

+          </elements>

         </elements>

       </views>

       <views xmi:id="_Fx_yMQwvEd-uP4lw9e0IMw" name="AdvancedTableCompositionEditorSample">

diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/plugin.properties b/tests/org.eclipse.emf.eef.tests.nonreg.edit/plugin.properties
index d589dedd6..8d646a36e 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/plugin.properties
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/plugin.properties
@@ -230,3 +230,5 @@ _UI_FlatReferencesTableSample_flatreferencestableROProperty_feature = Flatrefere
 _UI_ImageViewerSample_imageviewerROProperty_feature = Imageviewer RO Property
 _UI_SelectionDialogSample_selectionDialogROProperty_feature = Selection Dialog RO Property
 _UI_SingleCompositionViewerSample_singlecompositionviewSingleROProperty_feature = Singlecompositionview Single RO Property
+_UI_AdvancedEObjectFlatComboViewerSample_advancedeobjectflatcomboviewerCompoRequiredProperty_feature = Advancedeobjectflatcomboviewer Compo Required Property
+_UI_AdvancedEObjectFlatComboViewerSample_advancedeobjectflatcomboviewerCompoOptionalProperty_feature = Advancedeobjectflatcomboviewer Compo Optional Property
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent.java
index 17dfbb555..d7512c3a9 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent.java
@@ -64,6 +64,16 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent exte
 	 */
 	private EObjectFlatComboSettings advancedeobjectflatcomboviewerROPropertySettings;
 	
+	/**
+	 * Settings for advancedeobjectflatcomboviewerCompoRequiredProperty EObjectFlatComboViewer
+	 */
+	private EObjectFlatComboSettings advancedeobjectflatcomboviewerCompoRequiredPropertySettings;
+	
+	/**
+	 * Settings for advancedeobjectflatcomboviewerCompoOptionalProperty EObjectFlatComboViewer
+	 */
+	private EObjectFlatComboSettings advancedeobjectflatcomboviewerCompoOptionalPropertySettings;
+	
 	
 	/**
 	 * Default constructor
@@ -87,7 +97,6 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent exte
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final AdvancedEObjectFlatComboViewerSample advancedEObjectFlatComboViewerSample = (AdvancedEObjectFlatComboViewerSample)elt;
 			final AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart basePart = (AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -112,10 +121,26 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent exte
 				// set the button mode
 				basePart.setAdvancedeobjectflatcomboviewerROPropertyButtonMode(ButtonsModeEnum.BROWSE);
 			}
+			if (isAccessible(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty)) {
+				// init part
+				advancedeobjectflatcomboviewerCompoRequiredPropertySettings = new EObjectFlatComboSettings(advancedEObjectFlatComboViewerSample, EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerCompoRequiredProperty());
+				basePart.initAdvancedeobjectflatcomboviewerCompoRequiredProperty(advancedeobjectflatcomboviewerCompoRequiredPropertySettings);
+				// set the button mode
+				basePart.setAdvancedeobjectflatcomboviewerCompoRequiredPropertyButtonMode(ButtonsModeEnum.CREATE);
+			}
+			if (isAccessible(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty)) {
+				// init part
+				advancedeobjectflatcomboviewerCompoOptionalPropertySettings = new EObjectFlatComboSettings(advancedEObjectFlatComboViewerSample, EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerCompoOptionalProperty());
+				basePart.initAdvancedeobjectflatcomboviewerCompoOptionalProperty(advancedeobjectflatcomboviewerCompoOptionalPropertySettings);
+				// set the button mode
+				basePart.setAdvancedeobjectflatcomboviewerCompoOptionalPropertyButtonMode(ButtonsModeEnum.CREATE);
+			}
 			// init filters
 			
 			
 			
+			
+			
 			// init values for referenced views
 			
 			// init filters for referenced views
@@ -129,6 +154,8 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent exte
 
 
 
+
+
 	/**
 	 * {@inheritDoc}
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#associatedFeature(java.lang.Object)
@@ -143,6 +170,12 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent exte
 		if (editorKey == EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerROProperty) {
 			return EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerROPropery();
 		}
+		if (editorKey == EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty) {
+			return EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerCompoRequiredProperty();
+		}
+		if (editorKey == EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty) {
+			return EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerCompoOptionalProperty();
+		}
 		return super.associatedFeature(editorKey);
 	}
 
@@ -185,6 +218,38 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent exte
 				advancedeobjectflatcomboviewerOptionalPropertySettings.setToReference(eObject);
 			}
 		}
+		if (EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty == event.getAffectedEditor()) {
+			if (event.getKind() == PropertiesEditionEvent.SET) {
+				advancedeobjectflatcomboviewerCompoRequiredPropertySettings.setToReference((TotalSample)event.getNewValue());
+			} else if (event.getKind() == PropertiesEditionEvent.ADD) {
+				TotalSample eObject = EefnrFactory.eINSTANCE.createTotalSample();
+				EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(editingContext, this, eObject, editingContext.getAdapterFactory());
+				PropertiesEditingProvider provider = (PropertiesEditingProvider)editingContext.getAdapterFactory().adapt(eObject, PropertiesEditingProvider.class);
+				if (provider != null) {
+					PropertiesEditingPolicy policy = provider.getPolicy(context);
+					if (policy != null) {
+						policy.execute();
+					}
+				}
+				advancedeobjectflatcomboviewerCompoRequiredPropertySettings.setToReference(eObject);
+			}
+		}
+		if (EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty == event.getAffectedEditor()) {
+			if (event.getKind() == PropertiesEditionEvent.SET) {
+				advancedeobjectflatcomboviewerCompoOptionalPropertySettings.setToReference((TotalSample)event.getNewValue());
+			} else if (event.getKind() == PropertiesEditionEvent.ADD) {
+				TotalSample eObject = EefnrFactory.eINSTANCE.createTotalSample();
+				EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(editingContext, this, eObject, editingContext.getAdapterFactory());
+				PropertiesEditingProvider provider = (PropertiesEditingProvider)editingContext.getAdapterFactory().adapt(eObject, PropertiesEditingProvider.class);
+				if (provider != null) {
+					PropertiesEditingPolicy policy = provider.getPolicy(context);
+					if (policy != null) {
+						policy.execute();
+					}
+				}
+				advancedeobjectflatcomboviewerCompoOptionalPropertySettings.setToReference(eObject);
+			}
+		}
 	}
 
 	/**
@@ -192,7 +257,6 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent exte
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart basePart = (AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerRequiredProperty().equals(msg.getFeature()) && basePart != null && isAccessible(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty))
@@ -201,6 +265,10 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent exte
 				basePart.setAdvancedeobjectflatcomboviewerOptionalProperty((EObject)msg.getNewValue());
 			if (EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerROPropery().equals(msg.getFeature()) && basePart != null && isAccessible(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerROProperty))
 				basePart.setAdvancedeobjectflatcomboviewerROProperty((EObject)msg.getNewValue());
+			if (EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerCompoRequiredProperty().equals(msg.getFeature()) && basePart != null && isAccessible(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty))
+				basePart.setAdvancedeobjectflatcomboviewerCompoRequiredProperty((EObject)msg.getNewValue());
+			if (EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerCompoOptionalProperty().equals(msg.getFeature()) && basePart != null && isAccessible(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty))
+				basePart.setAdvancedeobjectflatcomboviewerCompoOptionalProperty((EObject)msg.getNewValue());
 			
 		}
 	}
@@ -215,7 +283,9 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent exte
 		NotificationFilter filter = new EStructuralFeatureNotificationFilter(
 			EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerRequiredProperty(),
 			EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerOptionalProperty(),
-			EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerROPropery()		);
+			EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerROPropery(),
+			EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerCompoRequiredProperty(),
+			EefnrPackage.eINSTANCE.getAdvancedEObjectFlatComboViewerSample_AdvancedeobjectflatcomboviewerCompoOptionalProperty()		);
 		return new NotificationFilter[] {filter,};
 	}
 
@@ -227,7 +297,7 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent exte
 	 * 
 	 */
 	public boolean isRequired(Object key, int kind) {
-		return key == EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty;
+		return key == EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty || key == EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty;
 	}
 
 	/**
@@ -249,7 +319,4 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent exte
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedReferencesTableSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedReferencesTableSamplePropertiesEditionComponent.java
index 7aef37894..d176e6f30 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedReferencesTableSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedReferencesTableSamplePropertiesEditionComponent.java
@@ -86,7 +86,6 @@ public class AdvancedReferencesTableSamplePropertiesEditionComponent extends Sin
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final AdvancedReferencesTableSample advancedReferencesTableSample = (AdvancedReferencesTableSample)elt;
 			final AdvancedReferencesTableSamplePropertiesEditionPart basePart = (AdvancedReferencesTableSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -228,7 +227,6 @@ public class AdvancedReferencesTableSamplePropertiesEditionComponent extends Sin
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			AdvancedReferencesTableSamplePropertiesEditionPart basePart = (AdvancedReferencesTableSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAdvancedReferencesTableSample_AdvancedreferencestableRequiredProperty().equals(msg.getFeature())  && isAccessible(EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableRequiredProperty))
@@ -285,7 +283,4 @@ public class AdvancedReferencesTableSamplePropertiesEditionComponent extends Sin
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedTableCompositionEditorSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedTableCompositionEditorSamplePropertiesEditionComponent.java
index f5d873791..20e45e989 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedTableCompositionEditorSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedTableCompositionEditorSamplePropertiesEditionComponent.java
@@ -89,7 +89,6 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionComponent exte
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final AdvancedTableCompositionEditorSample advancedTableCompositionEditorSample = (AdvancedTableCompositionEditorSample)elt;
 			final AdvancedTableCompositionEditorSamplePropertiesEditionPart basePart = (AdvancedTableCompositionEditorSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -247,7 +246,6 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionComponent exte
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			AdvancedTableCompositionEditorSamplePropertiesEditionPart basePart = (AdvancedTableCompositionEditorSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAdvancedTableCompositionEditorSample_AdvancedtablecompositionRequiredProperty().equals(msg.getFeature()) && isAccessible(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionRequiredProperty))
@@ -304,7 +302,4 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionComponent exte
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/CheckboxSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/CheckboxSamplePropertiesEditionComponent.java
index ffbab76c2..46e3e71db 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/CheckboxSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/CheckboxSamplePropertiesEditionComponent.java
@@ -66,7 +66,6 @@ public class CheckboxSamplePropertiesEditionComponent extends SinglePartProperti
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final CheckboxSample checkboxSample = (CheckboxSample)elt;
 			final CheckboxSamplePropertiesEditionPart basePart = (CheckboxSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -133,7 +132,6 @@ public class CheckboxSamplePropertiesEditionComponent extends SinglePartProperti
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			CheckboxSamplePropertiesEditionPart basePart = (CheckboxSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getCheckboxSample_CheckboxRequiredProperty().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(EefnrViewsRepository.CheckboxSample.Properties.checkboxRequiredProperty))
@@ -214,7 +212,4 @@ public class CheckboxSamplePropertiesEditionComponent extends SinglePartProperti
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EMFComboViewerSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EMFComboViewerSamplePropertiesEditionComponent.java
index 5b73eddce..daaefbad3 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EMFComboViewerSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EMFComboViewerSamplePropertiesEditionComponent.java
@@ -68,7 +68,6 @@ public class EMFComboViewerSamplePropertiesEditionComponent extends SinglePartPr
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final EMFComboViewerSample eMFComboViewerSample = (EMFComboViewerSample)elt;
 			final EMFComboViewerSamplePropertiesEditionPart basePart = (EMFComboViewerSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -135,7 +134,6 @@ public class EMFComboViewerSamplePropertiesEditionComponent extends SinglePartPr
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			EMFComboViewerSamplePropertiesEditionPart basePart = (EMFComboViewerSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getEMFComboViewerSample_EmfcomboviewerRequiredProperty().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && isAccessible(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerRequiredProperty))
@@ -216,7 +214,4 @@ public class EMFComboViewerSamplePropertiesEditionComponent extends SinglePartPr
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EObjectFlatComboViewerSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EObjectFlatComboViewerSamplePropertiesEditionComponent.java
index cef68baf3..99c2c5f4f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EObjectFlatComboViewerSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EObjectFlatComboViewerSamplePropertiesEditionComponent.java
@@ -89,7 +89,6 @@ public class EObjectFlatComboViewerSamplePropertiesEditionComponent extends Sing
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final EObjectFlatComboViewerSample eObjectFlatComboViewerSample = (EObjectFlatComboViewerSample)elt;
 			final EObjectFlatComboViewerSamplePropertiesEditionPart basePart = (EObjectFlatComboViewerSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -241,7 +240,6 @@ public class EObjectFlatComboViewerSamplePropertiesEditionComponent extends Sing
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			EObjectFlatComboViewerSamplePropertiesEditionPart basePart = (EObjectFlatComboViewerSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getEObjectFlatComboViewerSample_EobjectflatcomboviewerRequiredPropery().equals(msg.getFeature()) && basePart != null && isAccessible(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerRequiredPropery))
@@ -298,7 +296,4 @@ public class EObjectFlatComboViewerSamplePropertiesEditionComponent extends Sing
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/FlatReferenceTableSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/FlatReferenceTableSamplePropertiesEditionComponent.java
index aecc8b841..a1295dc54 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/FlatReferenceTableSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/FlatReferenceTableSamplePropertiesEditionComponent.java
@@ -83,7 +83,6 @@ public class FlatReferenceTableSamplePropertiesEditionComponent extends SinglePa
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final FlatReferencesTableSample flatReferencesTableSample = (FlatReferencesTableSample)elt;
 			final FlatReferenceTableSamplePropertiesEditionPart basePart = (FlatReferenceTableSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -211,7 +210,6 @@ public class FlatReferenceTableSamplePropertiesEditionComponent extends SinglePa
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			FlatReferenceTableSamplePropertiesEditionPart basePart = (FlatReferenceTableSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getFlatReferencesTableSample_FlatreferencestableRequiredProperty().equals(msg.getFeature()) && isAccessible(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableRequiredProperty))
@@ -268,7 +266,4 @@ public class FlatReferenceTableSamplePropertiesEditionComponent extends SinglePa
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/ImageViewerSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/ImageViewerSamplePropertiesEditionComponent.java
index 8aa430c1b..9bad7a4c1 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/ImageViewerSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/ImageViewerSamplePropertiesEditionComponent.java
@@ -67,19 +67,18 @@ public class ImageViewerSamplePropertiesEditionComponent extends SinglePartPrope
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final ImageViewerSample imageViewerSample = (ImageViewerSample)elt;
 			final ImageViewerSamplePropertiesEditionPart basePart = (ImageViewerSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerRequiredProperty)) {
+			if (imageViewerSample.getImageviewerRequiredProperty() != null && isAccessible(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerRequiredProperty)) {
 				basePart.initImageviewerRequiredProperty(EcoreUtil.getIdentification(imageViewerSample), imageViewerSample.getImageviewerRequiredProperty());
 			}
 			
-			if (isAccessible(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerOptionalProperty)) {
+			if (imageViewerSample.getImageviewerOptionalProperty() != null && isAccessible(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerOptionalProperty)) {
 				basePart.initImageviewerOptionalProperty(EcoreUtil.getIdentification(imageViewerSample), imageViewerSample.getImageviewerOptionalProperty());
 			}
 			
-			if (isAccessible(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerROProperty)) {
+			if (imageViewerSample.getImageviewerROProperty() != null && isAccessible(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerROProperty)) {
 				basePart.initImageviewerROProperty(EcoreUtil.getIdentification(imageViewerSample), imageViewerSample.getImageviewerROProperty());
 			}
 			
@@ -137,7 +136,6 @@ public class ImageViewerSamplePropertiesEditionComponent extends SinglePartPrope
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			ImageViewerSamplePropertiesEditionPart basePart = (ImageViewerSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getImageViewerSample_ImageviewerRequiredProperty().equals(msg.getFeature()) && isAccessible(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerRequiredProperty)){
@@ -233,7 +231,4 @@ public class ImageViewerSamplePropertiesEditionComponent extends SinglePartPrope
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/MultiValuedEditorSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/MultiValuedEditorSamplePropertiesEditionComponent.java
index e407affcc..d7036aa38 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/MultiValuedEditorSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/MultiValuedEditorSamplePropertiesEditionComponent.java
@@ -70,17 +70,16 @@ public class MultiValuedEditorSamplePropertiesEditionComponent extends SinglePar
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final MultiValuedEditorSample multiValuedEditorSample = (MultiValuedEditorSample)elt;
 			final MultiValuedEditorSamplePropertiesEditionPart basePart = (MultiValuedEditorSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorRequiredProperty))
+			if (multiValuedEditorSample.getMultivaluededitorRequiredProperty() != null && isAccessible(EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorRequiredProperty))
 				basePart.setMultivaluededitorRequiredProperty(multiValuedEditorSample.getMultivaluededitorRequiredProperty());
 			
-			if (isAccessible(EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorOptionalProperty))
+			if (multiValuedEditorSample.getMultivaluededitorOptionalProperty() != null && isAccessible(EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorOptionalProperty))
 				basePart.setMultivaluededitorOptionalProperty(multiValuedEditorSample.getMultivaluededitorOptionalProperty());
 			
-			if (isAccessible(EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorROProperty))
+			if (multiValuedEditorSample.getMultivaluededitorROProperty() != null && isAccessible(EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorROProperty))
 				basePart.setMultivaluededitorROProperty(multiValuedEditorSample.getMultivaluededitorROProperty());
 			
 			// init filters
@@ -143,7 +142,6 @@ public class MultiValuedEditorSamplePropertiesEditionComponent extends SinglePar
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			MultiValuedEditorSamplePropertiesEditionPart basePart = (MultiValuedEditorSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getMultiValuedEditorSample_MultivaluededitorRequiredProperty().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorRequiredProperty)) {
@@ -227,7 +225,4 @@ public class MultiValuedEditorSamplePropertiesEditionComponent extends SinglePar
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RadioSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RadioSamplePropertiesEditionComponent.java
index fec9a6339..e072de58f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RadioSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RadioSamplePropertiesEditionComponent.java
@@ -68,7 +68,6 @@ public class RadioSamplePropertiesEditionComponent extends SinglePartPropertiesE
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final RadioSample radioSample = (RadioSample)elt;
 			final RadioSamplePropertiesEditionPart basePart = (RadioSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -135,7 +134,6 @@ public class RadioSamplePropertiesEditionComponent extends SinglePartPropertiesE
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			RadioSamplePropertiesEditionPart basePart = (RadioSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getRadioSample_RadioRequiredProperty().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null  && isAccessible(EefnrViewsRepository.RadioSample.Properties.radioRequiredProperty))
@@ -216,7 +214,4 @@ public class RadioSamplePropertiesEditionComponent extends SinglePartPropertiesE
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/ReferencesTableSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/ReferencesTableSamplePropertiesEditionComponent.java
index e862429ab..149626a94 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/ReferencesTableSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/ReferencesTableSamplePropertiesEditionComponent.java
@@ -85,7 +85,6 @@ public class ReferencesTableSamplePropertiesEditionComponent extends SinglePartP
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final ReferencesTableSample referencesTableSample = (ReferencesTableSample)elt;
 			final ReferencesTableSamplePropertiesEditionPart basePart = (ReferencesTableSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -227,7 +226,6 @@ public class ReferencesTableSamplePropertiesEditionComponent extends SinglePartP
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			ReferencesTableSamplePropertiesEditionPart basePart = (ReferencesTableSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getReferencesTableSample_ReferencestableRequiredProperty().equals(msg.getFeature())  && isAccessible(EefnrViewsRepository.ReferencesTableSample.Properties.referencestableRequiredProperty))
@@ -284,7 +282,4 @@ public class ReferencesTableSamplePropertiesEditionComponent extends SinglePartP
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RootPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RootPropertiesEditionComponent.java
index 67086f7d9..fcb3cac35 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RootPropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RootPropertiesEditionComponent.java
@@ -79,7 +79,6 @@ public class RootPropertiesEditionComponent extends SinglePartPropertiesEditingC
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final Root root = (Root)elt;
 			final RootPropertiesEditionPart basePart = (RootPropertiesEditionPart)editingPart;
 			// init values
@@ -165,7 +164,6 @@ public class RootPropertiesEditionComponent extends SinglePartPropertiesEditingC
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			RootPropertiesEditionPart basePart = (RootPropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getRoot_Samples().equals(msg.getFeature()) && isAccessible(EefnrViewsRepository.Root.Properties.samples))
@@ -206,7 +204,4 @@ public class RootPropertiesEditionComponent extends SinglePartPropertiesEditingC
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SamplePropertiesEditionComponent.java
index 286949751..1584c3704 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SamplePropertiesEditionComponent.java
@@ -68,14 +68,13 @@ public class SamplePropertiesEditionComponent extends SinglePartPropertiesEditin
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final Sample sample = (Sample)elt;
 			final SamplePropertiesEditionPart basePart = (SamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(EefnrViewsRepository.Sample.Properties.textRequiredProperty))
+			if (sample.getTextRequiredProperty() != null && isAccessible(EefnrViewsRepository.Sample.Properties.textRequiredProperty))
 				basePart.setTextRequiredProperty(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, sample.getTextRequiredProperty()));
 			
-			if (isAccessible(EefnrViewsRepository.Sample.Properties.textOptionalProperty))
+			if (sample.getTextOptionalProperty() != null && isAccessible(EefnrViewsRepository.Sample.Properties.textOptionalProperty))
 				basePart.setTextOptionalProperty(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, sample.getTextOptionalProperty()));
 			
 			// init filters
@@ -127,7 +126,6 @@ public class SamplePropertiesEditionComponent extends SinglePartPropertiesEditin
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			SamplePropertiesEditionPart basePart = (SamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getSample_TextRequiredProperty().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(EefnrViewsRepository.Sample.Properties.textRequiredProperty)) {
@@ -205,7 +203,4 @@ public class SamplePropertiesEditionComponent extends SinglePartPropertiesEditin
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SelectionDialogSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SelectionDialogSamplePropertiesEditionComponent.java
index d0872a3a1..12472f49f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SelectionDialogSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SelectionDialogSamplePropertiesEditionComponent.java
@@ -67,19 +67,18 @@ public class SelectionDialogSamplePropertiesEditionComponent extends SinglePartP
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final SelectionDialogSample selectionDialogSample = (SelectionDialogSample)elt;
 			final SelectionDialogSamplePropertiesEditionPart basePart = (SelectionDialogSamplePropertiesEditionPart)editingPart;
 			// init values
-				if (isAccessible(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogRequiredProperty)) {
+				if (selectionDialogSample.getSelectionDialogRequiredProperty() != null && isAccessible(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogRequiredProperty)) {
 					basePart.setSelectionDialogRequiredProperty(EEFConverterUtil.convertToString(EefnrPackage.eINSTANCE.getSelectionDialogSample_SelectionDialogRequiredProperty().getEAttributeType(), selectionDialogSample.getSelectionDialogRequiredProperty()));
 				}
 			
-				if (isAccessible(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogOptionalProperty)) {
+				if (selectionDialogSample.getSelectionDialogOptionalProperty() != null && isAccessible(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogOptionalProperty)) {
 					basePart.setSelectionDialogOptionalProperty(EEFConverterUtil.convertToString(EefnrPackage.eINSTANCE.getSelectionDialogSample_SelectionDialogOptionalProperty().getEAttributeType(), selectionDialogSample.getSelectionDialogOptionalProperty()));
 				}
 			
-				if (isAccessible(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogROProperty)) {
+				if (selectionDialogSample.getSelectionDialogROProperty() != null && isAccessible(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogROProperty)) {
 					basePart.setSelectionDialogROProperty(EEFConverterUtil.convertToString(EefnrPackage.eINSTANCE.getSelectionDialogSample_SelectionDialogROProperty().getEAttributeType(), selectionDialogSample.getSelectionDialogROProperty()));
 				}
 			
@@ -137,7 +136,6 @@ public class SelectionDialogSamplePropertiesEditionComponent extends SinglePartP
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			SelectionDialogSamplePropertiesEditionPart basePart = (SelectionDialogSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getSelectionDialogSample_SelectionDialogRequiredProperty().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogRequiredProperty)) {
@@ -230,7 +228,4 @@ public class SelectionDialogSamplePropertiesEditionComponent extends SinglePartP
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SingleCompositionViewerSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SingleCompositionViewerSamplePropertiesEditionComponent.java
index 31313afaa..b5dfcde5d 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SingleCompositionViewerSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SingleCompositionViewerSamplePropertiesEditionComponent.java
@@ -64,7 +64,6 @@ public class SingleCompositionViewerSamplePropertiesEditionComponent extends Sin
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final SingleCompositionViewerSample singleCompositionViewerSample = (SingleCompositionViewerSample)elt;
 			final SingleCompositionViewerSamplePropertiesEditionPart basePart = (SingleCompositionViewerSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -143,7 +142,6 @@ public class SingleCompositionViewerSamplePropertiesEditionComponent extends Sin
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			SingleCompositionViewerSamplePropertiesEditionPart basePart = (SingleCompositionViewerSamplePropertiesEditionPart)editingPart;
 			//FIXME: Sorry this widget is deprecated for this version.
@@ -201,7 +199,4 @@ public class SingleCompositionViewerSamplePropertiesEditionComponent extends Sin
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionEditorSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionEditorSamplePropertiesEditionComponent.java
index ba1429f1c..95208625c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionEditorSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionEditorSamplePropertiesEditionComponent.java
@@ -89,7 +89,6 @@ public class TableCompositionEditorSamplePropertiesEditionComponent extends Sing
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final TableCompositionEditorSample tableCompositionEditorSample = (TableCompositionEditorSample)elt;
 			final TableCompositionEditorSamplePropertiesEditionPart basePart = (TableCompositionEditorSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -246,7 +245,6 @@ public class TableCompositionEditorSamplePropertiesEditionComponent extends Sing
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			TableCompositionEditorSamplePropertiesEditionPart basePart = (TableCompositionEditorSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getTableCompositionEditorSample_TablecompositionRequiredProperty().equals(msg.getFeature()) && isAccessible(EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty))
@@ -303,7 +301,4 @@ public class TableCompositionEditorSamplePropertiesEditionComponent extends Sing
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionExtensionEditorSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionExtensionEditorSamplePropertiesEditionComponent.java
index 6234b2eb6..40b81db47 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionExtensionEditorSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionExtensionEditorSamplePropertiesEditionComponent.java
@@ -84,7 +84,6 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionComponent ext
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final TableCompositionExtensionEditorSample tableCompositionExtensionEditorSample = (TableCompositionExtensionEditorSample)elt;
 			final TableCompositionExtensionEditorSamplePropertiesEditionPart basePart = (TableCompositionExtensionEditorSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -219,7 +218,6 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionComponent ext
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			TableCompositionExtensionEditorSamplePropertiesEditionPart basePart = (TableCompositionExtensionEditorSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getTableCompositionExtensionEditorSample_TablecompositionRequiredProperty().equals(msg.getFeature()) && isAccessible(EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.tablecompositionRequiredProperty))
@@ -280,7 +278,4 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionComponent ext
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSamplePropertiesEditionComponent.java
index cd53aa636..1ea463c03 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSamplePropertiesEditionComponent.java
@@ -68,17 +68,16 @@ public class TextSamplePropertiesEditionComponent extends SinglePartPropertiesEd
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final TextSample textSample = (TextSample)elt;
 			final TextSamplePropertiesEditionPart basePart = (TextSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(EefnrViewsRepository.TextSample.Properties.textRequiredProperty))
+			if (textSample.getTextRequiredProperty() != null && isAccessible(EefnrViewsRepository.TextSample.Properties.textRequiredProperty))
 				basePart.setTextRequiredProperty(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, textSample.getTextRequiredProperty()));
 			
-			if (isAccessible(EefnrViewsRepository.TextSample.Properties.textOptionalProperty))
+			if (textSample.getTextOptionalProperty() != null && isAccessible(EefnrViewsRepository.TextSample.Properties.textOptionalProperty))
 				basePart.setTextOptionalProperty(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, textSample.getTextOptionalProperty()));
 			
-			if (isAccessible(EefnrViewsRepository.TextSample.Properties.textROProperty))
+			if (textSample.getTextROProperty() != null && isAccessible(EefnrViewsRepository.TextSample.Properties.textROProperty))
 				basePart.setTextROProperty(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, textSample.getTextROProperty()));
 			
 			// init filters
@@ -135,7 +134,6 @@ public class TextSamplePropertiesEditionComponent extends SinglePartPropertiesEd
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			TextSamplePropertiesEditionPart basePart = (TextSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getTextSample_TextRequiredProperty().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(EefnrViewsRepository.TextSample.Properties.textRequiredProperty)) {
@@ -228,7 +226,4 @@ public class TextSamplePropertiesEditionComponent extends SinglePartPropertiesEd
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleFirstTabPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleFirstTabPropertiesEditionComponent.java
index 33b97cad7..7c5d8c6b7 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleFirstTabPropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleFirstTabPropertiesEditionComponent.java
@@ -68,14 +68,13 @@ public class TextSampleWithTwoTabsTextSampleFirstTabPropertiesEditionComponent e
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final TextSampleWithTwoTabs textSampleWithTwoTabs = (TextSampleWithTwoTabs)elt;
 			final TextSampleFirstTabPropertiesEditionPart textSampleFirstTabPart = (TextSampleFirstTabPropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(EefnrViewsRepository.TextSampleFirstTab.Properties.textOptionalPropertyInFirstTab))
+			if (textSampleWithTwoTabs.getTextOptionalPropertyInFirstTab() != null && isAccessible(EefnrViewsRepository.TextSampleFirstTab.Properties.textOptionalPropertyInFirstTab))
 				textSampleFirstTabPart.setTextOptionalPropertyInFirstTab(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, textSampleWithTwoTabs.getTextOptionalPropertyInFirstTab()));
 			
-			if (isAccessible(EefnrViewsRepository.TextSampleFirstTab.Properties.textRequiredPropertyInFirstTab))
+			if (textSampleWithTwoTabs.getTextRequiredPropertyInFirstTab() != null && isAccessible(EefnrViewsRepository.TextSampleFirstTab.Properties.textRequiredPropertyInFirstTab))
 				textSampleFirstTabPart.setTextRequiredPropertyInFirstTab(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, textSampleWithTwoTabs.getTextRequiredPropertyInFirstTab()));
 			
 			// init filters
@@ -127,7 +126,6 @@ public class TextSampleWithTwoTabsTextSampleFirstTabPropertiesEditionComponent e
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			TextSampleFirstTabPropertiesEditionPart textSampleFirstTabPart = (TextSampleFirstTabPropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getTextSampleWithTwoTabs_TextOptionalPropertyInFirstTab().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && textSampleFirstTabPart != null && isAccessible(EefnrViewsRepository.TextSampleFirstTab.Properties.textOptionalPropertyInFirstTab)) {
@@ -205,7 +203,4 @@ public class TextSampleWithTwoTabsTextSampleFirstTabPropertiesEditionComponent e
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleSecondTabPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleSecondTabPropertiesEditionComponent.java
index db56ad259..f0be73f54 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleSecondTabPropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleSecondTabPropertiesEditionComponent.java
@@ -68,14 +68,13 @@ public class TextSampleWithTwoTabsTextSampleSecondTabPropertiesEditionComponent
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final TextSampleWithTwoTabs textSampleWithTwoTabs = (TextSampleWithTwoTabs)elt;
 			final TextSampleSecondTabPropertiesEditionPart textSampleSecondTabPart = (TextSampleSecondTabPropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(EefnrViewsRepository.TextSampleSecondTab.Properties.textOptionalPropertyInSecondTab))
+			if (textSampleWithTwoTabs.getTextOptionalPropertyInSecondTab() != null && isAccessible(EefnrViewsRepository.TextSampleSecondTab.Properties.textOptionalPropertyInSecondTab))
 				textSampleSecondTabPart.setTextOptionalPropertyInSecondTab(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, textSampleWithTwoTabs.getTextOptionalPropertyInSecondTab()));
 			
-			if (isAccessible(EefnrViewsRepository.TextSampleSecondTab.Properties.textRequiredPropertyInSecondTab))
+			if (textSampleWithTwoTabs.getTextRequiredPropertyInSecondTab() != null && isAccessible(EefnrViewsRepository.TextSampleSecondTab.Properties.textRequiredPropertyInSecondTab))
 				textSampleSecondTabPart.setTextRequiredPropertyInSecondTab(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, textSampleWithTwoTabs.getTextRequiredPropertyInSecondTab()));
 			
 			// init filters
@@ -127,7 +126,6 @@ public class TextSampleWithTwoTabsTextSampleSecondTabPropertiesEditionComponent
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			TextSampleSecondTabPropertiesEditionPart textSampleSecondTabPart = (TextSampleSecondTabPropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getTextSampleWithTwoTabs_TextOptionalPropertyInSecondTab().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && textSampleSecondTabPart != null && isAccessible(EefnrViewsRepository.TextSampleSecondTab.Properties.textOptionalPropertyInSecondTab)) {
@@ -205,7 +203,4 @@ public class TextSampleWithTwoTabsTextSampleSecondTabPropertiesEditionComponent
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextareaSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextareaSamplePropertiesEditionComponent.java
index 752880f3e..467964599 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextareaSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextareaSamplePropertiesEditionComponent.java
@@ -68,15 +68,14 @@ public class TextareaSamplePropertiesEditionComponent extends SinglePartProperti
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final TextareaSample textareaSample = (TextareaSample)elt;
 			final TextareaSamplePropertiesEditionPart basePart = (TextareaSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(EefnrViewsRepository.TextareaSample.Properties.textareaRequiredProperty))
+			if (textareaSample.getTextareaRequiredProperty() != null && isAccessible(EefnrViewsRepository.TextareaSample.Properties.textareaRequiredProperty))
 				basePart.setTextareaRequiredProperty(EcoreUtil.convertToString(EcorePackage.Literals.ESTRING, textareaSample.getTextareaRequiredProperty()));
-			if (isAccessible(EefnrViewsRepository.TextareaSample.Properties.textareaOptionalProperty))
+			if (textareaSample.getTextareaOptionalProperty() != null && isAccessible(EefnrViewsRepository.TextareaSample.Properties.textareaOptionalProperty))
 				basePart.setTextareaOptionalProperty(EcoreUtil.convertToString(EcorePackage.Literals.ESTRING, textareaSample.getTextareaOptionalProperty()));
-			if (isAccessible(EefnrViewsRepository.TextareaSample.Properties.textareaROProperty))
+			if (textareaSample.getTextareaROProperty() != null && isAccessible(EefnrViewsRepository.TextareaSample.Properties.textareaROProperty))
 				basePart.setTextareaROProperty(EcoreUtil.convertToString(EcorePackage.Literals.ESTRING, textareaSample.getTextareaROProperty()));
 			// init filters
 			
@@ -132,7 +131,6 @@ public class TextareaSamplePropertiesEditionComponent extends SinglePartProperti
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			TextareaSamplePropertiesEditionPart basePart = (TextareaSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getTextareaSample_TextareaRequiredProperty().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(EefnrViewsRepository.TextareaSample.Properties.textareaRequiredProperty)){
@@ -225,7 +223,4 @@ public class TextareaSamplePropertiesEditionComponent extends SinglePartProperti
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TotalSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TotalSamplePropertiesEditionComponent.java
index 49bfb2954..bcbe448d5 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TotalSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TotalSamplePropertiesEditionComponent.java
@@ -150,14 +150,13 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final TotalSample totalSample = (TotalSample)elt;
 			final TotalSamplePropertiesEditionPart basePart = (TotalSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.textRequiredProperty))
+			if (totalSample.getTextRequiredProperty() != null && isAccessible(EefnrViewsRepository.TotalSample.Properties.textRequiredProperty))
 				basePart.setTextRequiredProperty(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, totalSample.getTextRequiredProperty()));
 			
-			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.textOptionalProperty))
+			if (totalSample.getTextOptionalProperty() != null && isAccessible(EefnrViewsRepository.TotalSample.Properties.textOptionalProperty))
 				basePart.setTextOptionalProperty(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, totalSample.getTextOptionalProperty()));
 			
 			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.checkboxRequiredProperty)) {
@@ -166,10 +165,10 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE
 			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.checkboxOptionalProperty)) {
 				basePart.setCheckboxOptionalProperty(totalSample.isCheckboxOptionalProperty());
 			}
-			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.textareaRequiredProperty))
+			if (totalSample.getTextareaRequiredProperty() != null && isAccessible(EefnrViewsRepository.TotalSample.Properties.textareaRequiredProperty))
 				basePart.setTextareaRequiredProperty(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, totalSample.getTextareaRequiredProperty()));
 			
-			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.textareaOptionalProperty))
+			if (totalSample.getTextareaOptionalProperty() != null && isAccessible(EefnrViewsRepository.TotalSample.Properties.textareaOptionalProperty))
 				basePart.setTextareaOptionalProperty(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, totalSample.getTextareaOptionalProperty()));
 			
 			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.radioRequiredProperty)) {
@@ -206,10 +205,10 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE
 			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerOptionalProperty)) {
 				basePart.initEmfcomboviewerOptionalProperty(EEFUtils.choiceOfValues(totalSample, EefnrPackage.eINSTANCE.getTotalSample_EmfcomboviewerOptionalProperty()), totalSample.getEmfcomboviewerOptionalProperty());
 			}
-			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.multivaluededitorRequiredProperty))
+			if (totalSample.getMultivaluededitorRequiredProperty() != null && isAccessible(EefnrViewsRepository.TotalSample.Properties.multivaluededitorRequiredProperty))
 				basePart.setMultivaluededitorRequiredProperty(totalSample.getMultivaluededitorRequiredProperty());
 			
-			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.multivaluededitorOptionalProperty))
+			if (totalSample.getMultivaluededitorOptionalProperty() != null && isAccessible(EefnrViewsRepository.TotalSample.Properties.multivaluededitorOptionalProperty))
 				basePart.setMultivaluededitorOptionalProperty(totalSample.getMultivaluededitorOptionalProperty());
 			
 			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty)) {
@@ -250,7 +249,7 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE
 				advancedtablecompositionOptionalPropertySettings = new ReferencesTableSettings(totalSample, EefnrPackage.eINSTANCE.getTotalSample_AdvancedtablecompositionOptionalProperty());
 				basePart.initAdvancedtablecompositionOptionalProperty(advancedtablecompositionOptionalPropertySettings);
 			}
-			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.name))
+			if (totalSample.getName() != null && isAccessible(EefnrViewsRepository.TotalSample.Properties.name))
 				basePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, totalSample.getName()));
 			
 			// Start of user code for custom command update
@@ -877,7 +876,6 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			TotalSamplePropertiesEditionPart basePart = (TotalSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getTotalSample_TextRequiredProperty().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(EefnrViewsRepository.TotalSample.Properties.textRequiredProperty)) {
@@ -1138,7 +1136,4 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceOwnerSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceOwnerSamplePropertiesEditionPartForm.java
index f666195f4..e9a788064 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceOwnerSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceOwnerSamplePropertiesEditionPartForm.java
@@ -391,14 +391,6 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionPartForm extends Secti
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(FiltersMessages.ConcreteReferenceOwnerSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
@@ -414,14 +406,6 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionPartForm extends Secti
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		abstractTarget.setContentProvider(contentProvider);
 		abstractTarget.setInput(settings);
-		boolean readOnly = isReadOnly(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.abstractTarget);
-		if (readOnly && abstractTarget.getTable().isEnabled()) {
-			abstractTarget.setEnabled(false);
-			abstractTarget.setToolTipText(FiltersMessages.ConcreteReferenceOwnerSample_ReadOnly);
-		} else if (!readOnly && !abstractTarget.getTable().isEnabled()) {
-			abstractTarget.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -477,14 +461,6 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionPartForm extends Secti
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		strictTyping.setContentProvider(contentProvider);
 		strictTyping.setInput(settings);
-		boolean readOnly = isReadOnly(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.strictTyping);
-		if (readOnly && strictTyping.isEnabled()) {
-			strictTyping.setEnabled(false);
-			strictTyping.setToolTipText(FiltersMessages.ConcreteReferenceOwnerSample_ReadOnly);
-		} else if (!readOnly && !strictTyping.isEnabled()) {
-			strictTyping.setEnabled(true);
-		}	
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample1PropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample1PropertiesEditionPartForm.java
index 7247dd267..7e97ab87a 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample1PropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample1PropertiesEditionPartForm.java
@@ -230,14 +230,6 @@ public class ConcreteReferenceTargetSample1PropertiesEditionPartForm extends Sec
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(FiltersViewsRepository.ConcreteReferenceTargetSample1.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(FiltersMessages.ConcreteReferenceTargetSample1_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample2PropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample2PropertiesEditionPartForm.java
index a40730bec..345e750df 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample2PropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample2PropertiesEditionPartForm.java
@@ -230,14 +230,6 @@ public class ConcreteReferenceTargetSample2PropertiesEditionPartForm extends Sec
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(FiltersViewsRepository.ConcreteReferenceTargetSample2.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(FiltersMessages.ConcreteReferenceTargetSample2_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceOwnerSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceOwnerSamplePropertiesEditionPartImpl.java
index bae5a5c82..4bfe81a3c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceOwnerSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceOwnerSamplePropertiesEditionPartImpl.java
@@ -361,14 +361,6 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionPartImpl extends Compo
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(FiltersMessages.ConcreteReferenceOwnerSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
@@ -384,14 +376,6 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionPartImpl extends Compo
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		abstractTarget.setContentProvider(contentProvider);
 		abstractTarget.setInput(settings);
-		boolean readOnly = isReadOnly(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.abstractTarget);
-		if (readOnly && abstractTarget.getTable().isEnabled()) {
-			abstractTarget.setEnabled(false);
-			abstractTarget.setToolTipText(FiltersMessages.ConcreteReferenceOwnerSample_ReadOnly);
-		} else if (!readOnly && !abstractTarget.getTable().isEnabled()) {
-			abstractTarget.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -447,14 +431,6 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionPartImpl extends Compo
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		strictTyping.setContentProvider(contentProvider);
 		strictTyping.setInput(settings);
-		boolean readOnly = isReadOnly(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.strictTyping);
-		if (readOnly && strictTyping.isEnabled()) {
-			strictTyping.setEnabled(false);
-			strictTyping.setToolTipText(FiltersMessages.ConcreteReferenceOwnerSample_ReadOnly);
-		} else if (!readOnly && !strictTyping.isEnabled()) {
-			strictTyping.setEnabled(true);
-		}	
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample1PropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample1PropertiesEditionPartImpl.java
index 84f5b6a19..03c22e241 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample1PropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample1PropertiesEditionPartImpl.java
@@ -199,14 +199,6 @@ public class ConcreteReferenceTargetSample1PropertiesEditionPartImpl extends Com
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(FiltersViewsRepository.ConcreteReferenceTargetSample1.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(FiltersMessages.ConcreteReferenceTargetSample1_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample2PropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample2PropertiesEditionPartImpl.java
index 79dbe5f33..3625dab1c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample2PropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample2PropertiesEditionPartImpl.java
@@ -199,14 +199,6 @@ public class ConcreteReferenceTargetSample2PropertiesEditionPartImpl extends Com
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(FiltersViewsRepository.ConcreteReferenceTargetSample2.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(FiltersMessages.ConcreteReferenceTargetSample2_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/interface_/parts/SimpleSamplePropertiesEditionPart.java.lost b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/interface_/parts/SimpleSamplePropertiesEditionPart.java.lost
index eadbcb9ee..2e96a0a9c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/interface_/parts/SimpleSamplePropertiesEditionPart.java.lost
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/interface_/parts/SimpleSamplePropertiesEditionPart.java.lost
@@ -806,3 +806,15 @@ Fri Nov 09 12:04:49 CET 2012
 Start of user code for additional methods
 	
 	// End of user code

+

+Thu Nov 15 12:09:41 CET 2012

+================================================================================

+Start of user code  for getters and setters declaration
+	
+	// End of user code

+

+Thu Nov 15 12:09:41 CET 2012

+================================================================================

+Start of user code for additional methods
+	
+	// End of user code

diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AnotherSubtypePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AnotherSubtypePropertiesEditionPartForm.java
index cc3077f0f..fbd3527e9 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AnotherSubtypePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AnotherSubtypePropertiesEditionPartForm.java
@@ -213,14 +213,6 @@ public class AnotherSubtypePropertiesEditionPartForm extends SectionPropertiesEd
 		} else {
 			anotherSpecialisationElement.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.AnotherSubtype.AnotherSpecialisation.anotherSpecialisationElement);
-		if (readOnly && anotherSpecialisationElement.isEnabled()) {
-			anotherSpecialisationElement.setEnabled(false);
-			anotherSpecialisationElement.setToolTipText(NavigationMessages.AnotherSubtype_ReadOnly);
-		} else if (!readOnly && !anotherSpecialisationElement.isEnabled()) {
-			anotherSpecialisationElement.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AttributeNavigationSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AttributeNavigationSamplePropertiesEditionPartForm.java
index ef2185150..586eb21da 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AttributeNavigationSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AttributeNavigationSamplePropertiesEditionPartForm.java
@@ -511,14 +511,6 @@ public class AttributeNavigationSamplePropertiesEditionPartForm extends SectionP
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.AttributeNavigationSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.AttributeNavigationSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -543,14 +535,6 @@ public class AttributeNavigationSamplePropertiesEditionPartForm extends SectionP
 		} else {
 			delegate1ForSingleValued.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate1ForSingleValued, ((AttributeNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getDelegate1ForSingleValuedSettings().getOrCreateSignificantObject());
-		if (readOnly && delegate1ForSingleValued.isEnabled()) {
-			delegate1ForSingleValued.setEnabled(false);
-			delegate1ForSingleValued.setToolTipText(NavigationMessages.AttributeNavigationSample_ReadOnly);
-		} else if (!readOnly && !delegate1ForSingleValued.isEnabled()) {
-			delegate1ForSingleValued.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -575,14 +559,6 @@ public class AttributeNavigationSamplePropertiesEditionPartForm extends SectionP
 		} else {
 			delegate2ForSingleValued.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate2ForSingleValued, ((AttributeNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getDelegate2ForSingleValuedSettings().getOrCreateSignificantObject());
-		if (readOnly && delegate2ForSingleValued.isEnabled()) {
-			delegate2ForSingleValued.setEnabled(false);
-			delegate2ForSingleValued.setToolTipText(NavigationMessages.AttributeNavigationSample_ReadOnly);
-		} else if (!readOnly && !delegate2ForSingleValued.isEnabled()) {
-			delegate2ForSingleValued.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -607,14 +583,6 @@ public class AttributeNavigationSamplePropertiesEditionPartForm extends SectionP
 		} else {
 			delegate1ForMultiValued.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate1ForMultiValued, ((AttributeNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getDelegate1ForMultiValuedSettings().getOrCreateSignificantObject());
-		if (readOnly && delegate1ForMultiValued.isEnabled()) {
-			delegate1ForMultiValued.setEnabled(false);
-			delegate1ForMultiValued.setToolTipText(NavigationMessages.AttributeNavigationSample_ReadOnly);
-		} else if (!readOnly && !delegate1ForMultiValued.isEnabled()) {
-			delegate1ForMultiValued.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -639,14 +607,6 @@ public class AttributeNavigationSamplePropertiesEditionPartForm extends SectionP
 		} else {
 			delegate2ForMultiValued.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate2ForMultiValued, ((AttributeNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getDelegate2ForMultiValuedSettings().getOrCreateSignificantObject());
-		if (readOnly && delegate2ForMultiValued.isEnabled()) {
-			delegate2ForMultiValued.setEnabled(false);
-			delegate2ForMultiValued.setToolTipText(NavigationMessages.AttributeNavigationSample_ReadOnly);
-		} else if (!readOnly && !delegate2ForMultiValued.isEnabled()) {
-			delegate2ForMultiValued.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedFlatReferencesTableSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedFlatReferencesTableSamplePropertiesEditionPartForm.java
index efff3a0e1..6cf1eb7e1 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedFlatReferencesTableSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedFlatReferencesTableSamplePropertiesEditionPartForm.java
@@ -216,6 +216,7 @@ public class DeferedFlatReferencesTableSamplePropertiesEditionPartForm extends S
 		createDescription(parent, NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.flatReferencesTableSampleEditor, NavigationMessages.DeferedFlatReferencesTableSamplePropertiesEditionPart_FlatReferencesTableSampleEditorLabel);
 		flatReferencesTableSampleEditor = new FlatReferencesTable(parent);
 		flatReferencesTableSampleEditor.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
 		flatReferencesTableSampleEditor.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -267,14 +268,6 @@ public class DeferedFlatReferencesTableSamplePropertiesEditionPartForm extends S
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.DeferedFlatReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
@@ -288,14 +281,6 @@ public class DeferedFlatReferencesTableSamplePropertiesEditionPartForm extends S
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
 		flatReferencesTableSampleEditor.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.flatReferencesTableSampleEditor);
-		if (readOnly && flatReferencesTableSampleEditor.isEnabled()) {
-			flatReferencesTableSampleEditor.setEnabled(false);
-			flatReferencesTableSampleEditor.setToolTipText(NavigationMessages.DeferedFlatReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !flatReferencesTableSampleEditor.isEnabled()) {
-			flatReferencesTableSampleEditor.setEnabled(true);
-		}	
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedReferencesTableSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedReferencesTableSamplePropertiesEditionPartForm.java
index d6828e63e..e544c2d8c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedReferencesTableSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedReferencesTableSamplePropertiesEditionPartForm.java
@@ -417,14 +417,6 @@ public class DeferedReferencesTableSamplePropertiesEditionPartForm extends Secti
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.DeferedReferencesTableSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.DeferedReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
@@ -440,20 +432,6 @@ public class DeferedReferencesTableSamplePropertiesEditionPartForm extends Secti
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		referencesTableSampleEditor.setContentProvider(contentProvider);
 		referencesTableSampleEditor.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.DeferedReferencesTableSample.Properties.referencesTableSampleEditor);
-		if (readOnly && referencesTableSampleEditor.getTable().isEnabled()) {
-			referencesTableSampleEditor.getTable().setEnabled(false);
-			referencesTableSampleEditor.getTable().setToolTipText(NavigationMessages.DeferedReferencesTableSample_ReadOnly);
-			addReferencesTableSampleEditor.setEnabled(false);
-			addReferencesTableSampleEditor.setToolTipText(NavigationMessages.DeferedReferencesTableSample_ReadOnly);
-			removeReferencesTableSampleEditor.setEnabled(false);
-			removeReferencesTableSampleEditor.setToolTipText(NavigationMessages.DeferedReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !referencesTableSampleEditor.getTable().isEnabled()) {
-			referencesTableSampleEditor.getTable().setEnabled(true);
-			addReferencesTableSampleEditor.setEnabled(true);
-			removeReferencesTableSampleEditor.setEnabled(true);
-		}
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/ElementPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/ElementPropertiesEditionPartForm.java
index 2e215b823..c2c7d3203 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/ElementPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/ElementPropertiesEditionPartForm.java
@@ -207,14 +207,6 @@ public class ElementPropertiesEditionPartForm extends SectionPropertiesEditingPa
 		} else {
 			isVisible.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Element.Properties.isVisible);
-		if (readOnly && isVisible.isEnabled()) {
-			isVisible.setEnabled(false);
-			isVisible.setToolTipText(NavigationMessages.Element_ReadOnly);
-		} else if (!readOnly && !isVisible.isEnabled()) {
-			isVisible.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/EventPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/EventPropertiesEditionPartForm.java
index 5cf6a3e77..498a9a87d 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/EventPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/EventPropertiesEditionPartForm.java
@@ -230,14 +230,6 @@ public class EventPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NamingViewsRepository.Event.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NamingMessages.Event_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/FirstNavigationSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/FirstNavigationSamplePropertiesEditionPartForm.java
index ada12891c..c387663d0 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/FirstNavigationSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/FirstNavigationSamplePropertiesEditionPartForm.java
@@ -243,14 +243,6 @@ public class FirstNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.FirstNavigationSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.FirstNavigationSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/NamedElementPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/NamedElementPropertiesEditionPartForm.java
index 484d6c876..333b2f058 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/NamedElementPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/NamedElementPropertiesEditionPartForm.java
@@ -230,14 +230,6 @@ public class NamedElementPropertiesEditionPartForm extends SectionPropertiesEdit
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.NamedElement.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.NamedElement_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/OwnerPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/OwnerPropertiesEditionPartForm.java
index 7d5bb0108..56ca32513 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/OwnerPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/OwnerPropertiesEditionPartForm.java
@@ -93,9 +93,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 	protected TableViewer multipleSampleForTableComposition;
 	protected List<ViewerFilter> multipleSampleForTableCompositionBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> multipleSampleForTableCompositionFilters = new ArrayList<ViewerFilter>();
-	protected Button addMultipleSampleForTableComposition;
-	protected Button removeMultipleSampleForTableComposition;
-	protected Button editMultipleSampleForTableComposition;
 	protected ReferencesTable multipleSampleForAdvancedTableComposition;
 	protected List<ViewerFilter> multipleSampleForAdvancedTableCompositionBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> multipleSampleForAdvancedTableCompositionFilters = new ArrayList<ViewerFilter>();
@@ -111,9 +108,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 	protected TableViewer singleSampleForTableComposition;
 	protected List<ViewerFilter> singleSampleForTableCompositionBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> singleSampleForTableCompositionFilters = new ArrayList<ViewerFilter>();
-	protected Button addSingleSampleForTableComposition;
-	protected Button removeSingleSampleForTableComposition;
-	protected Button editSingleSampleForTableComposition;
 	protected ReferencesTable singleSampleForAdvancedTableComposition;
 	protected List<ViewerFilter> singleSampleForAdvancedTableCompositionBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> singleSampleForAdvancedTableCompositionFilters = new ArrayList<ViewerFilter>();
@@ -434,7 +428,7 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		GridLayout multipleSampleForTableCompositionPanelLayout = new GridLayout();
 		multipleSampleForTableCompositionPanelLayout.numColumns = 1;
 		multipleSampleForTableCompositionPanel.setLayout(multipleSampleForTableCompositionPanelLayout);
-		addMultipleSampleForTableComposition = widgetFactory.createButton(multipleSampleForTableCompositionPanel, NavigationMessages.PropertiesEditionPart_AddTableViewerLabel, SWT.NONE);
+		Button addMultipleSampleForTableComposition = widgetFactory.createButton(multipleSampleForTableCompositionPanel, NavigationMessages.PropertiesEditionPart_AddTableViewerLabel, SWT.NONE);
 		GridData addMultipleSampleForTableCompositionData = new GridData(GridData.FILL_HORIZONTAL);
 		addMultipleSampleForTableComposition.setLayoutData(addMultipleSampleForTableCompositionData);
 		addMultipleSampleForTableComposition.addSelectionListener(new SelectionAdapter() {
@@ -452,7 +446,7 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		EditingUtils.setID(addMultipleSampleForTableComposition, NavigationViewsRepository.Owner.Properties.multipleSampleForTableComposition);
 		EditingUtils.setEEFtype(addMultipleSampleForTableComposition, "eef::TableComposition::addbutton"); //$NON-NLS-1$
-		removeMultipleSampleForTableComposition = widgetFactory.createButton(multipleSampleForTableCompositionPanel, NavigationMessages.PropertiesEditionPart_RemoveTableViewerLabel, SWT.NONE);
+		Button removeMultipleSampleForTableComposition = widgetFactory.createButton(multipleSampleForTableCompositionPanel, NavigationMessages.PropertiesEditionPart_RemoveTableViewerLabel, SWT.NONE);
 		GridData removeMultipleSampleForTableCompositionData = new GridData(GridData.FILL_HORIZONTAL);
 		removeMultipleSampleForTableComposition.setLayoutData(removeMultipleSampleForTableCompositionData);
 		removeMultipleSampleForTableComposition.addSelectionListener(new SelectionAdapter() {
@@ -477,7 +471,7 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		EditingUtils.setID(removeMultipleSampleForTableComposition, NavigationViewsRepository.Owner.Properties.multipleSampleForTableComposition);
 		EditingUtils.setEEFtype(removeMultipleSampleForTableComposition, "eef::TableComposition::removebutton"); //$NON-NLS-1$
-		editMultipleSampleForTableComposition = widgetFactory.createButton(multipleSampleForTableCompositionPanel, NavigationMessages.PropertiesEditionPart_EditTableViewerLabel, SWT.NONE);
+		Button editMultipleSampleForTableComposition = widgetFactory.createButton(multipleSampleForTableCompositionPanel, NavigationMessages.PropertiesEditionPart_EditTableViewerLabel, SWT.NONE);
 		GridData editMultipleSampleForTableCompositionData = new GridData(GridData.FILL_HORIZONTAL);
 		editMultipleSampleForTableComposition.setLayoutData(editMultipleSampleForTableCompositionData);
 		editMultipleSampleForTableComposition.addSelectionListener(new SelectionAdapter() {
@@ -798,6 +792,7 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		createDescription(parent, NavigationViewsRepository.Owner.Properties.multipleSampleForFlatReferencesTable, NavigationMessages.OwnerPropertiesEditionPart_MultipleSampleForFlatReferencesTableLabel);
 		multipleSampleForFlatReferencesTable = new FlatReferencesTable(parent);
 		multipleSampleForFlatReferencesTable.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
 		multipleSampleForFlatReferencesTable.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -913,7 +908,7 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		GridLayout singleSampleForTableCompositionPanelLayout = new GridLayout();
 		singleSampleForTableCompositionPanelLayout.numColumns = 1;
 		singleSampleForTableCompositionPanel.setLayout(singleSampleForTableCompositionPanelLayout);
-		addSingleSampleForTableComposition = widgetFactory.createButton(singleSampleForTableCompositionPanel, NavigationMessages.PropertiesEditionPart_AddTableViewerLabel, SWT.NONE);
+		Button addSingleSampleForTableComposition = widgetFactory.createButton(singleSampleForTableCompositionPanel, NavigationMessages.PropertiesEditionPart_AddTableViewerLabel, SWT.NONE);
 		GridData addSingleSampleForTableCompositionData = new GridData(GridData.FILL_HORIZONTAL);
 		addSingleSampleForTableComposition.setLayoutData(addSingleSampleForTableCompositionData);
 		addSingleSampleForTableComposition.addSelectionListener(new SelectionAdapter() {
@@ -931,7 +926,7 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		EditingUtils.setID(addSingleSampleForTableComposition, NavigationViewsRepository.Owner.Properties.singleSampleForTableComposition);
 		EditingUtils.setEEFtype(addSingleSampleForTableComposition, "eef::TableComposition::addbutton"); //$NON-NLS-1$
-		removeSingleSampleForTableComposition = widgetFactory.createButton(singleSampleForTableCompositionPanel, NavigationMessages.PropertiesEditionPart_RemoveTableViewerLabel, SWT.NONE);
+		Button removeSingleSampleForTableComposition = widgetFactory.createButton(singleSampleForTableCompositionPanel, NavigationMessages.PropertiesEditionPart_RemoveTableViewerLabel, SWT.NONE);
 		GridData removeSingleSampleForTableCompositionData = new GridData(GridData.FILL_HORIZONTAL);
 		removeSingleSampleForTableComposition.setLayoutData(removeSingleSampleForTableCompositionData);
 		removeSingleSampleForTableComposition.addSelectionListener(new SelectionAdapter() {
@@ -956,7 +951,7 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		EditingUtils.setID(removeSingleSampleForTableComposition, NavigationViewsRepository.Owner.Properties.singleSampleForTableComposition);
 		EditingUtils.setEEFtype(removeSingleSampleForTableComposition, "eef::TableComposition::removebutton"); //$NON-NLS-1$
-		editSingleSampleForTableComposition = widgetFactory.createButton(singleSampleForTableCompositionPanel, NavigationMessages.PropertiesEditionPart_EditTableViewerLabel, SWT.NONE);
+		Button editSingleSampleForTableComposition = widgetFactory.createButton(singleSampleForTableCompositionPanel, NavigationMessages.PropertiesEditionPart_EditTableViewerLabel, SWT.NONE);
 		GridData editSingleSampleForTableCompositionData = new GridData(GridData.FILL_HORIZONTAL);
 		editSingleSampleForTableComposition.setLayoutData(editSingleSampleForTableCompositionData);
 		editSingleSampleForTableComposition.addSelectionListener(new SelectionAdapter() {
@@ -1353,6 +1348,7 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		createDescription(parent, NavigationViewsRepository.Owner.Properties.singleSampleForFlatReferencesTable, NavigationMessages.OwnerPropertiesEditionPart_SingleSampleForFlatReferencesTableLabel);
 		singleSampleForFlatReferencesTable = new FlatReferencesTable(parent);
 		singleSampleForFlatReferencesTable.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
 		singleSampleForFlatReferencesTable.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -1526,14 +1522,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
@@ -1549,23 +1537,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		multipleSampleForTableComposition.setContentProvider(contentProvider);
 		multipleSampleForTableComposition.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.multipleSampleForTableComposition);
-		if (readOnly && multipleSampleForTableComposition.getTable().isEnabled()) {
-			multipleSampleForTableComposition.getTable().setEnabled(false);
-			multipleSampleForTableComposition.getTable().setToolTipText(NavigationMessages.Owner_ReadOnly);
-			addMultipleSampleForTableComposition.setEnabled(false);
-			addMultipleSampleForTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-			removeMultipleSampleForTableComposition.setEnabled(false);
-			removeMultipleSampleForTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-			editMultipleSampleForTableComposition.setEnabled(false);
-			editMultipleSampleForTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !multipleSampleForTableComposition.getTable().isEnabled()) {
-			multipleSampleForTableComposition.getTable().setEnabled(true);
-			addMultipleSampleForTableComposition.setEnabled(true);
-			removeMultipleSampleForTableComposition.setEnabled(true);
-			editMultipleSampleForTableComposition.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -1624,14 +1595,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		multipleSampleForAdvancedTableComposition.setContentProvider(contentProvider);
 		multipleSampleForAdvancedTableComposition.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.multipleSampleForAdvancedTableComposition);
-		if (readOnly && multipleSampleForAdvancedTableComposition.isEnabled()) {
-			multipleSampleForAdvancedTableComposition.setEnabled(false);
-			multipleSampleForAdvancedTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !multipleSampleForAdvancedTableComposition.isEnabled()) {
-			multipleSampleForAdvancedTableComposition.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1690,20 +1653,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		multipleSampleForReferencesTable.setContentProvider(contentProvider);
 		multipleSampleForReferencesTable.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.multipleSampleForReferencesTable);
-		if (readOnly && multipleSampleForReferencesTable.getTable().isEnabled()) {
-			multipleSampleForReferencesTable.getTable().setEnabled(false);
-			multipleSampleForReferencesTable.getTable().setToolTipText(NavigationMessages.Owner_ReadOnly);
-			addMultipleSampleForReferencesTable.setEnabled(false);
-			addMultipleSampleForReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-			removeMultipleSampleForReferencesTable.setEnabled(false);
-			removeMultipleSampleForReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !multipleSampleForReferencesTable.getTable().isEnabled()) {
-			multipleSampleForReferencesTable.getTable().setEnabled(true);
-			addMultipleSampleForReferencesTable.setEnabled(true);
-			removeMultipleSampleForReferencesTable.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -1759,14 +1708,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		multipleSampleForAdvancedReferencesTable.setContentProvider(contentProvider);
 		multipleSampleForAdvancedReferencesTable.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.multipleSampleForAdvancedReferencesTable);
-		if (readOnly && multipleSampleForAdvancedReferencesTable.getTable().isEnabled()) {
-			multipleSampleForAdvancedReferencesTable.setEnabled(false);
-			multipleSampleForAdvancedReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !multipleSampleForAdvancedReferencesTable.getTable().isEnabled()) {
-			multipleSampleForAdvancedReferencesTable.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -1820,14 +1761,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
 		multipleSampleForFlatReferencesTable.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.multipleSampleForFlatReferencesTable);
-		if (readOnly && multipleSampleForFlatReferencesTable.isEnabled()) {
-			multipleSampleForFlatReferencesTable.setEnabled(false);
-			multipleSampleForFlatReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !multipleSampleForFlatReferencesTable.isEnabled()) {
-			multipleSampleForFlatReferencesTable.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1883,23 +1816,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		singleSampleForTableComposition.setContentProvider(contentProvider);
 		singleSampleForTableComposition.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleSampleForTableComposition);
-		if (readOnly && singleSampleForTableComposition.getTable().isEnabled()) {
-			singleSampleForTableComposition.getTable().setEnabled(false);
-			singleSampleForTableComposition.getTable().setToolTipText(NavigationMessages.Owner_ReadOnly);
-			addSingleSampleForTableComposition.setEnabled(false);
-			addSingleSampleForTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-			removeSingleSampleForTableComposition.setEnabled(false);
-			removeSingleSampleForTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-			editSingleSampleForTableComposition.setEnabled(false);
-			editSingleSampleForTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleSampleForTableComposition.getTable().isEnabled()) {
-			singleSampleForTableComposition.getTable().setEnabled(true);
-			addSingleSampleForTableComposition.setEnabled(true);
-			removeSingleSampleForTableComposition.setEnabled(true);
-			editSingleSampleForTableComposition.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -1958,14 +1874,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		singleSampleForAdvancedTableComposition.setContentProvider(contentProvider);
 		singleSampleForAdvancedTableComposition.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleSampleForAdvancedTableComposition);
-		if (readOnly && singleSampleForAdvancedTableComposition.isEnabled()) {
-			singleSampleForAdvancedTableComposition.setEnabled(false);
-			singleSampleForAdvancedTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleSampleForAdvancedTableComposition.isEnabled()) {
-			singleSampleForAdvancedTableComposition.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2024,20 +1932,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		singleSampleForReferencesTable.setContentProvider(contentProvider);
 		singleSampleForReferencesTable.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleSampleForReferencesTable);
-		if (readOnly && singleSampleForReferencesTable.getTable().isEnabled()) {
-			singleSampleForReferencesTable.getTable().setEnabled(false);
-			singleSampleForReferencesTable.getTable().setToolTipText(NavigationMessages.Owner_ReadOnly);
-			addSingleSampleForReferencesTable.setEnabled(false);
-			addSingleSampleForReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-			removeSingleSampleForReferencesTable.setEnabled(false);
-			removeSingleSampleForReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleSampleForReferencesTable.getTable().isEnabled()) {
-			singleSampleForReferencesTable.getTable().setEnabled(true);
-			addSingleSampleForReferencesTable.setEnabled(true);
-			removeSingleSampleForReferencesTable.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2093,20 +1987,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		singleSampleForAdvancedReferencesTable.setContentProvider(contentProvider);
 		singleSampleForAdvancedReferencesTable.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleSampleForAdvancedReferencesTable);
-		if (readOnly && singleSampleForAdvancedReferencesTable.getTable().isEnabled()) {
-			singleSampleForAdvancedReferencesTable.getTable().setEnabled(false);
-			singleSampleForAdvancedReferencesTable.getTable().setToolTipText(NavigationMessages.Owner_ReadOnly);
-			addSingleSampleForAdvancedReferencesTable.setEnabled(false);
-			addSingleSampleForAdvancedReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-			removeSingleSampleForAdvancedReferencesTable.setEnabled(false);
-			removeSingleSampleForAdvancedReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleSampleForAdvancedReferencesTable.getTable().isEnabled()) {
-			singleSampleForAdvancedReferencesTable.getTable().setEnabled(true);
-			addSingleSampleForAdvancedReferencesTable.setEnabled(true);
-			removeSingleSampleForAdvancedReferencesTable.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2160,14 +2040,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
 		singleSampleForFlatReferencesTable.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleSampleForFlatReferencesTable);
-		if (readOnly && singleSampleForFlatReferencesTable.isEnabled()) {
-			singleSampleForFlatReferencesTable.setEnabled(false);
-			singleSampleForFlatReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleSampleForFlatReferencesTable.isEnabled()) {
-			singleSampleForFlatReferencesTable.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2235,14 +2107,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		if (current != null) {
 			singleContainmentForEObjectFlatComboViewer.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleContainmentForEObjectFlatComboViewer);
-		if (readOnly && singleContainmentForEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForEObjectFlatComboViewer.setEnabled(false);
-			singleContainmentForEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleContainmentForEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2257,14 +2121,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		} else {
 			singleContainmentForEObjectFlatComboViewer.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleContainmentForEObjectFlatComboViewer);
-		if (readOnly && singleContainmentForEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForEObjectFlatComboViewer.setEnabled(false);
-			singleContainmentForEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleContainmentForEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2321,14 +2177,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		if (current != null) {
 			singleReferencesForEObjectFlatComboViewer.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleReferencesForEObjectFlatComboViewer);
-		if (readOnly && singleReferencesForEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForEObjectFlatComboViewer.setEnabled(false);
-			singleReferencesForEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleReferencesForEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2343,14 +2191,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		} else {
 			singleReferencesForEObjectFlatComboViewer.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleReferencesForEObjectFlatComboViewer);
-		if (readOnly && singleReferencesForEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForEObjectFlatComboViewer.setEnabled(false);
-			singleReferencesForEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleReferencesForEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2402,14 +2242,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		if (current != null) {
 			singleContainmentForAdvancedEObjectFlatComboViewer.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleContainmentForAdvancedEObjectFlatComboViewer);
-		if (readOnly && singleContainmentForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForAdvancedEObjectFlatComboViewer.setEnabled(false);
-			singleContainmentForAdvancedEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleContainmentForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForAdvancedEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2424,14 +2256,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		} else {
 			singleContainmentForAdvancedEObjectFlatComboViewer.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleContainmentForAdvancedEObjectFlatComboViewer);
-		if (readOnly && singleContainmentForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForAdvancedEObjectFlatComboViewer.setEnabled(false);
-			singleContainmentForAdvancedEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleContainmentForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForAdvancedEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2483,14 +2307,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		if (current != null) {
 			singleReferencesForAdvancedEObjectFlatComboViewer.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleReferencesForAdvancedEObjectFlatComboViewer);
-		if (readOnly && singleReferencesForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForAdvancedEObjectFlatComboViewer.setEnabled(false);
-			singleReferencesForAdvancedEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleReferencesForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForAdvancedEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2505,14 +2321,6 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		} else {
 			singleReferencesForAdvancedEObjectFlatComboViewer.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleReferencesForAdvancedEObjectFlatComboViewer);
-		if (readOnly && singleReferencesForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForAdvancedEObjectFlatComboViewer.setEnabled(false);
-			singleReferencesForAdvancedEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleReferencesForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForAdvancedEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SecondNavigationSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SecondNavigationSamplePropertiesEditionPartForm.java
index 4950b03d3..ba970e383 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SecondNavigationSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SecondNavigationSamplePropertiesEditionPartForm.java
@@ -243,14 +243,6 @@ public class SecondNavigationSamplePropertiesEditionPartForm extends SectionProp
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SecondNavigationSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.SecondNavigationSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SmartNavigationSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SmartNavigationSamplePropertiesEditionPartForm.java
index b34b5a8ac..304ec6ebd 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SmartNavigationSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SmartNavigationSamplePropertiesEditionPartForm.java
@@ -734,14 +734,6 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -766,14 +758,6 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		} else {
 			firstModelNavigationSingleValue.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.firstModelNavigationSingleValue, ((SmartModelNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getFirstModelNavigationSingleValueSettings().getOrCreateSignificantObject());
-		if (readOnly && firstModelNavigationSingleValue.isEnabled()) {
-			firstModelNavigationSingleValue.setEnabled(false);
-			firstModelNavigationSingleValue.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !firstModelNavigationSingleValue.isEnabled()) {
-			firstModelNavigationSingleValue.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -798,14 +782,6 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		} else {
 			secondModelNavigationSingleValue.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationSingleValue, ((SmartModelNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getSecondMNSingleValueWithFirstMNSingleValueSettings().getOrCreateSignificantObject());
-		if (readOnly && secondModelNavigationSingleValue.isEnabled()) {
-			secondModelNavigationSingleValue.setEnabled(false);
-			secondModelNavigationSingleValue.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !secondModelNavigationSingleValue.isEnabled()) {
-			secondModelNavigationSingleValue.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -830,14 +806,6 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		} else {
 			firstModelNavigationMultiValue.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.firstModelNavigationMultiValue, ((SmartModelNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getFirstModelNavigationMultiValueSettings().getOrCreateSignificantObject());
-		if (readOnly && firstModelNavigationMultiValue.isEnabled()) {
-			firstModelNavigationMultiValue.setEnabled(false);
-			firstModelNavigationMultiValue.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !firstModelNavigationMultiValue.isEnabled()) {
-			firstModelNavigationMultiValue.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -862,14 +830,6 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		} else {
 			secondModelNavigationMultiValue.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValue, ((SmartModelNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getSecondMNSingleValueWithFirstMNMultiValueSettings().getOrCreateSignificantObject());
-		if (readOnly && secondModelNavigationMultiValue.isEnabled()) {
-			secondModelNavigationMultiValue.setEnabled(false);
-			secondModelNavigationMultiValue.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !secondModelNavigationMultiValue.isEnabled()) {
-			secondModelNavigationMultiValue.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -894,14 +854,6 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		} else {
 			secondModelNavigationSingleValue2.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationSingleValue2, ((SmartModelNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getSecondMNMultiValueWithFirstMNSingleValueSettings().getOrCreateSignificantObject());
-		if (readOnly && secondModelNavigationSingleValue2.isEnabled()) {
-			secondModelNavigationSingleValue2.setEnabled(false);
-			secondModelNavigationSingleValue2.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !secondModelNavigationSingleValue2.isEnabled()) {
-			secondModelNavigationSingleValue2.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -926,14 +878,6 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		} else {
 			secondModelNavigationMultiValue2.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValue2, ((SmartModelNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getSecondMNMultiValueWithFirstMNMultiValueSettings().getOrCreateSignificantObject());
-		if (readOnly && secondModelNavigationMultiValue2.isEnabled()) {
-			secondModelNavigationMultiValue2.setEnabled(false);
-			secondModelNavigationMultiValue2.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !secondModelNavigationMultiValue2.isEnabled()) {
-			secondModelNavigationMultiValue2.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -958,14 +902,6 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		} else {
 			secondModelNavigationMultiValueFilter.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValueFilter, ((SmartModelNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getSecondMNMultiValueWithFirstMNMultiValueWithFilterSettings().getOrCreateSignificantObject());
-		if (readOnly && secondModelNavigationMultiValueFilter.isEnabled()) {
-			secondModelNavigationMultiValueFilter.setEnabled(false);
-			secondModelNavigationMultiValueFilter.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !secondModelNavigationMultiValueFilter.isEnabled()) {
-			secondModelNavigationMultiValueFilter.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SubtypePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SubtypePropertiesEditionPartForm.java
index 6f0ed9127..33c518f11 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SubtypePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SubtypePropertiesEditionPartForm.java
@@ -212,14 +212,6 @@ public class SubtypePropertiesEditionPartForm extends SectionPropertiesEditingPa
 		} else {
 			specialisedElement.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Subtype.Specialisation.specialisedElement);
-		if (readOnly && specialisedElement.isEnabled()) {
-			specialisedElement.setEnabled(false);
-			specialisedElement.setToolTipText(NavigationMessages.Subtype_ReadOnly);
-		} else if (!readOnly && !specialisedElement.isEnabled()) {
-			specialisedElement.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AnotherSubtypePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AnotherSubtypePropertiesEditionPartImpl.java
index f877b6b3f..dd0d00f8d 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AnotherSubtypePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AnotherSubtypePropertiesEditionPartImpl.java
@@ -202,14 +202,6 @@ public class AnotherSubtypePropertiesEditionPartImpl extends CompositeProperties
 		} else {
 			anotherSpecialisationElement.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.AnotherSubtype.AnotherSpecialisation.anotherSpecialisationElement);
-		if (readOnly && anotherSpecialisationElement.isEnabled()) {
-			anotherSpecialisationElement.setEnabled(false);
-			anotherSpecialisationElement.setToolTipText(NavigationMessages.AnotherSubtype_ReadOnly);
-		} else if (!readOnly && !anotherSpecialisationElement.isEnabled()) {
-			anotherSpecialisationElement.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AttributeNavigationSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AttributeNavigationSamplePropertiesEditionPartImpl.java
index 28e9b5ae0..1cbc5cb42 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AttributeNavigationSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AttributeNavigationSamplePropertiesEditionPartImpl.java
@@ -404,14 +404,6 @@ public class AttributeNavigationSamplePropertiesEditionPartImpl extends Composit
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.AttributeNavigationSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.AttributeNavigationSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -436,14 +428,6 @@ public class AttributeNavigationSamplePropertiesEditionPartImpl extends Composit
 		} else {
 			delegate1ForSingleValued.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate1ForSingleValued, ((AttributeNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getDelegate1ForSingleValuedSettings().getOrCreateSignificantObject());
-		if (readOnly && delegate1ForSingleValued.isEnabled()) {
-			delegate1ForSingleValued.setEnabled(false);
-			delegate1ForSingleValued.setToolTipText(NavigationMessages.AttributeNavigationSample_ReadOnly);
-		} else if (!readOnly && !delegate1ForSingleValued.isEnabled()) {
-			delegate1ForSingleValued.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -468,14 +452,6 @@ public class AttributeNavigationSamplePropertiesEditionPartImpl extends Composit
 		} else {
 			delegate2ForSingleValued.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate2ForSingleValued, ((AttributeNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getDelegate2ForSingleValuedSettings().getOrCreateSignificantObject());
-		if (readOnly && delegate2ForSingleValued.isEnabled()) {
-			delegate2ForSingleValued.setEnabled(false);
-			delegate2ForSingleValued.setToolTipText(NavigationMessages.AttributeNavigationSample_ReadOnly);
-		} else if (!readOnly && !delegate2ForSingleValued.isEnabled()) {
-			delegate2ForSingleValued.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -500,14 +476,6 @@ public class AttributeNavigationSamplePropertiesEditionPartImpl extends Composit
 		} else {
 			delegate1ForMultiValued.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate1ForMultiValued, ((AttributeNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getDelegate1ForMultiValuedSettings().getOrCreateSignificantObject());
-		if (readOnly && delegate1ForMultiValued.isEnabled()) {
-			delegate1ForMultiValued.setEnabled(false);
-			delegate1ForMultiValued.setToolTipText(NavigationMessages.AttributeNavigationSample_ReadOnly);
-		} else if (!readOnly && !delegate1ForMultiValued.isEnabled()) {
-			delegate1ForMultiValued.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -532,14 +500,6 @@ public class AttributeNavigationSamplePropertiesEditionPartImpl extends Composit
 		} else {
 			delegate2ForMultiValued.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate2ForMultiValued, ((AttributeNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getDelegate2ForMultiValuedSettings().getOrCreateSignificantObject());
-		if (readOnly && delegate2ForMultiValued.isEnabled()) {
-			delegate2ForMultiValued.setEnabled(false);
-			delegate2ForMultiValued.setToolTipText(NavigationMessages.AttributeNavigationSample_ReadOnly);
-		} else if (!readOnly && !delegate2ForMultiValued.isEnabled()) {
-			delegate2ForMultiValued.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedFlatReferencesTableSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedFlatReferencesTableSamplePropertiesEditionPartImpl.java
index 8f489e3c4..078e9f108 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedFlatReferencesTableSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedFlatReferencesTableSamplePropertiesEditionPartImpl.java
@@ -185,6 +185,7 @@ public class DeferedFlatReferencesTableSamplePropertiesEditionPartImpl extends C
 		createDescription(parent, NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.flatReferencesTableSampleEditor, NavigationMessages.DeferedFlatReferencesTableSamplePropertiesEditionPart_FlatReferencesTableSampleEditorLabel);
 		flatReferencesTableSampleEditor = new FlatReferencesTable(parent);
 		flatReferencesTableSampleEditor.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
 		flatReferencesTableSampleEditor.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -236,14 +237,6 @@ public class DeferedFlatReferencesTableSamplePropertiesEditionPartImpl extends C
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.DeferedFlatReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
@@ -257,14 +250,6 @@ public class DeferedFlatReferencesTableSamplePropertiesEditionPartImpl extends C
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
 		flatReferencesTableSampleEditor.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.flatReferencesTableSampleEditor);
-		if (readOnly && flatReferencesTableSampleEditor.isEnabled()) {
-			flatReferencesTableSampleEditor.setEnabled(false);
-			flatReferencesTableSampleEditor.setToolTipText(NavigationMessages.DeferedFlatReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !flatReferencesTableSampleEditor.isEnabled()) {
-			flatReferencesTableSampleEditor.setEnabled(true);
-		}	
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedReferencesTableSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedReferencesTableSamplePropertiesEditionPartImpl.java
index 596078070..1e6bd5ea2 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedReferencesTableSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedReferencesTableSamplePropertiesEditionPartImpl.java
@@ -387,14 +387,6 @@ public class DeferedReferencesTableSamplePropertiesEditionPartImpl extends Compo
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.DeferedReferencesTableSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.DeferedReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
@@ -410,20 +402,6 @@ public class DeferedReferencesTableSamplePropertiesEditionPartImpl extends Compo
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		referencesTableSampleEditor.setContentProvider(contentProvider);
 		referencesTableSampleEditor.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.DeferedReferencesTableSample.Properties.referencesTableSampleEditor);
-		if (readOnly && referencesTableSampleEditor.getTable().isEnabled()) {
-			referencesTableSampleEditor.getTable().setEnabled(false);
-			referencesTableSampleEditor.getTable().setToolTipText(NavigationMessages.DeferedReferencesTableSample_ReadOnly);
-			addReferencesTableSampleEditor.setEnabled(false);
-			addReferencesTableSampleEditor.setToolTipText(NavigationMessages.DeferedReferencesTableSample_ReadOnly);
-			removeReferencesTableSampleEditor.setEnabled(false);
-			removeReferencesTableSampleEditor.setToolTipText(NavigationMessages.DeferedReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !referencesTableSampleEditor.getTable().isEnabled()) {
-			referencesTableSampleEditor.getTable().setEnabled(true);
-			addReferencesTableSampleEditor.setEnabled(true);
-			removeReferencesTableSampleEditor.setEnabled(true);
-		}
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/ElementPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/ElementPropertiesEditionPartImpl.java
index 552f79238..0588999ed 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/ElementPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/ElementPropertiesEditionPartImpl.java
@@ -195,14 +195,6 @@ public class ElementPropertiesEditionPartImpl extends CompositePropertiesEdition
 		} else {
 			isVisible.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Element.Properties.isVisible);
-		if (readOnly && isVisible.isEnabled()) {
-			isVisible.setEnabled(false);
-			isVisible.setToolTipText(NavigationMessages.Element_ReadOnly);
-		} else if (!readOnly && !isVisible.isEnabled()) {
-			isVisible.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/EventPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/EventPropertiesEditionPartImpl.java
index b66f4fc31..2eb0956f4 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/EventPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/EventPropertiesEditionPartImpl.java
@@ -199,14 +199,6 @@ public class EventPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NamingViewsRepository.Event.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NamingMessages.Event_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/FirstNavigationSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/FirstNavigationSamplePropertiesEditionPartImpl.java
index 2ed718d07..6e4252a9d 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/FirstNavigationSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/FirstNavigationSamplePropertiesEditionPartImpl.java
@@ -212,14 +212,6 @@ public class FirstNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.FirstNavigationSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.FirstNavigationSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/NamedElementPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/NamedElementPropertiesEditionPartImpl.java
index 31065c128..4c22228bf 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/NamedElementPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/NamedElementPropertiesEditionPartImpl.java
@@ -199,14 +199,6 @@ public class NamedElementPropertiesEditionPartImpl extends CompositePropertiesEd
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.NamedElement.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.NamedElement_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/OwnerPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/OwnerPropertiesEditionPartImpl.java
index f17449e08..fdbb4380b 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/OwnerPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/OwnerPropertiesEditionPartImpl.java
@@ -89,9 +89,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 	protected TableViewer multipleSampleForTableComposition;
 	protected List<ViewerFilter> multipleSampleForTableCompositionBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> multipleSampleForTableCompositionFilters = new ArrayList<ViewerFilter>();
-	protected Button addMultipleSampleForTableComposition;
-	protected Button removeMultipleSampleForTableComposition;
-	protected Button editMultipleSampleForTableComposition;
 	protected ReferencesTable multipleSampleForAdvancedTableComposition;
 	protected List<ViewerFilter> multipleSampleForAdvancedTableCompositionBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> multipleSampleForAdvancedTableCompositionFilters = new ArrayList<ViewerFilter>();
@@ -107,9 +104,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 	protected TableViewer singleSampleForTableComposition;
 	protected List<ViewerFilter> singleSampleForTableCompositionBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> singleSampleForTableCompositionFilters = new ArrayList<ViewerFilter>();
-	protected Button addSingleSampleForTableComposition;
-	protected Button removeSingleSampleForTableComposition;
-	protected Button editSingleSampleForTableComposition;
 	protected ReferencesTable singleSampleForAdvancedTableComposition;
 	protected List<ViewerFilter> singleSampleForAdvancedTableCompositionBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> singleSampleForAdvancedTableCompositionFilters = new ArrayList<ViewerFilter>();
@@ -402,7 +396,7 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		GridLayout multipleSampleForTableCompositionPanelLayout = new GridLayout();
 		multipleSampleForTableCompositionPanelLayout.numColumns = 1;
 		multipleSampleForTableCompositionPanel.setLayout(multipleSampleForTableCompositionPanelLayout);
-		addMultipleSampleForTableComposition = new Button(multipleSampleForTableCompositionPanel, SWT.NONE);
+		Button addMultipleSampleForTableComposition = new Button(multipleSampleForTableCompositionPanel, SWT.NONE);
 		addMultipleSampleForTableComposition.setText(NavigationMessages.PropertiesEditionPart_AddTableViewerLabel);
 		GridData addMultipleSampleForTableCompositionData = new GridData(GridData.FILL_HORIZONTAL);
 		addMultipleSampleForTableComposition.setLayoutData(addMultipleSampleForTableCompositionData);
@@ -421,7 +415,7 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		});
 		EditingUtils.setID(addMultipleSampleForTableComposition, NavigationViewsRepository.Owner.Properties.multipleSampleForTableComposition);
 		EditingUtils.setEEFtype(addMultipleSampleForTableComposition, "eef::TableComposition::addbutton"); //$NON-NLS-1$
-		removeMultipleSampleForTableComposition = new Button(multipleSampleForTableCompositionPanel, SWT.NONE);
+		Button removeMultipleSampleForTableComposition = new Button(multipleSampleForTableCompositionPanel, SWT.NONE);
 		removeMultipleSampleForTableComposition.setText(NavigationMessages.PropertiesEditionPart_RemoveTableViewerLabel);
 		GridData removeMultipleSampleForTableCompositionData = new GridData(GridData.FILL_HORIZONTAL);
 		removeMultipleSampleForTableComposition.setLayoutData(removeMultipleSampleForTableCompositionData);
@@ -447,7 +441,7 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		});
 		EditingUtils.setID(removeMultipleSampleForTableComposition, NavigationViewsRepository.Owner.Properties.multipleSampleForTableComposition);
 		EditingUtils.setEEFtype(removeMultipleSampleForTableComposition, "eef::TableComposition::removebutton"); //$NON-NLS-1$
-		editMultipleSampleForTableComposition = new Button(multipleSampleForTableCompositionPanel, SWT.NONE);
+		Button editMultipleSampleForTableComposition = new Button(multipleSampleForTableCompositionPanel, SWT.NONE);
 		editMultipleSampleForTableComposition.setText(NavigationMessages.PropertiesEditionPart_EditTableViewerLabel);
 		GridData editMultipleSampleForTableCompositionData = new GridData(GridData.FILL_HORIZONTAL);
 		editMultipleSampleForTableComposition.setLayoutData(editMultipleSampleForTableCompositionData);
@@ -771,6 +765,7 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		createDescription(parent, NavigationViewsRepository.Owner.Properties.multipleSampleForFlatReferencesTable, NavigationMessages.OwnerPropertiesEditionPart_MultipleSampleForFlatReferencesTableLabel);
 		multipleSampleForFlatReferencesTable = new FlatReferencesTable(parent);
 		multipleSampleForFlatReferencesTable.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
 		multipleSampleForFlatReferencesTable.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -885,7 +880,7 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		GridLayout singleSampleForTableCompositionPanelLayout = new GridLayout();
 		singleSampleForTableCompositionPanelLayout.numColumns = 1;
 		singleSampleForTableCompositionPanel.setLayout(singleSampleForTableCompositionPanelLayout);
-		addSingleSampleForTableComposition = new Button(singleSampleForTableCompositionPanel, SWT.NONE);
+		Button addSingleSampleForTableComposition = new Button(singleSampleForTableCompositionPanel, SWT.NONE);
 		addSingleSampleForTableComposition.setText(NavigationMessages.PropertiesEditionPart_AddTableViewerLabel);
 		GridData addSingleSampleForTableCompositionData = new GridData(GridData.FILL_HORIZONTAL);
 		addSingleSampleForTableComposition.setLayoutData(addSingleSampleForTableCompositionData);
@@ -904,7 +899,7 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		});
 		EditingUtils.setID(addSingleSampleForTableComposition, NavigationViewsRepository.Owner.Properties.singleSampleForTableComposition);
 		EditingUtils.setEEFtype(addSingleSampleForTableComposition, "eef::TableComposition::addbutton"); //$NON-NLS-1$
-		removeSingleSampleForTableComposition = new Button(singleSampleForTableCompositionPanel, SWT.NONE);
+		Button removeSingleSampleForTableComposition = new Button(singleSampleForTableCompositionPanel, SWT.NONE);
 		removeSingleSampleForTableComposition.setText(NavigationMessages.PropertiesEditionPart_RemoveTableViewerLabel);
 		GridData removeSingleSampleForTableCompositionData = new GridData(GridData.FILL_HORIZONTAL);
 		removeSingleSampleForTableComposition.setLayoutData(removeSingleSampleForTableCompositionData);
@@ -930,7 +925,7 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		});
 		EditingUtils.setID(removeSingleSampleForTableComposition, NavigationViewsRepository.Owner.Properties.singleSampleForTableComposition);
 		EditingUtils.setEEFtype(removeSingleSampleForTableComposition, "eef::TableComposition::removebutton"); //$NON-NLS-1$
-		editSingleSampleForTableComposition = new Button(singleSampleForTableCompositionPanel, SWT.NONE);
+		Button editSingleSampleForTableComposition = new Button(singleSampleForTableCompositionPanel, SWT.NONE);
 		editSingleSampleForTableComposition.setText(NavigationMessages.PropertiesEditionPart_EditTableViewerLabel);
 		GridData editSingleSampleForTableCompositionData = new GridData(GridData.FILL_HORIZONTAL);
 		editSingleSampleForTableComposition.setLayoutData(editSingleSampleForTableCompositionData);
@@ -1330,6 +1325,7 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		createDescription(parent, NavigationViewsRepository.Owner.Properties.singleSampleForFlatReferencesTable, NavigationMessages.OwnerPropertiesEditionPart_SingleSampleForFlatReferencesTableLabel);
 		singleSampleForFlatReferencesTable = new FlatReferencesTable(parent);
 		singleSampleForFlatReferencesTable.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
 		singleSampleForFlatReferencesTable.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -1483,14 +1479,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
@@ -1506,23 +1494,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		multipleSampleForTableComposition.setContentProvider(contentProvider);
 		multipleSampleForTableComposition.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.multipleSampleForTableComposition);
-		if (readOnly && multipleSampleForTableComposition.getTable().isEnabled()) {
-			multipleSampleForTableComposition.getTable().setEnabled(false);
-			multipleSampleForTableComposition.getTable().setToolTipText(NavigationMessages.Owner_ReadOnly);
-			addMultipleSampleForTableComposition.setEnabled(false);
-			addMultipleSampleForTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-			removeMultipleSampleForTableComposition.setEnabled(false);
-			removeMultipleSampleForTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-			editMultipleSampleForTableComposition.setEnabled(false);
-			editMultipleSampleForTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !multipleSampleForTableComposition.getTable().isEnabled()) {
-			multipleSampleForTableComposition.getTable().setEnabled(true);
-			addMultipleSampleForTableComposition.setEnabled(true);
-			removeMultipleSampleForTableComposition.setEnabled(true);
-			editMultipleSampleForTableComposition.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -1581,14 +1552,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		multipleSampleForAdvancedTableComposition.setContentProvider(contentProvider);
 		multipleSampleForAdvancedTableComposition.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.multipleSampleForAdvancedTableComposition);
-		if (readOnly && multipleSampleForAdvancedTableComposition.isEnabled()) {
-			multipleSampleForAdvancedTableComposition.setEnabled(false);
-			multipleSampleForAdvancedTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !multipleSampleForAdvancedTableComposition.isEnabled()) {
-			multipleSampleForAdvancedTableComposition.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1647,20 +1610,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		multipleSampleForReferencesTable.setContentProvider(contentProvider);
 		multipleSampleForReferencesTable.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.multipleSampleForReferencesTable);
-		if (readOnly && multipleSampleForReferencesTable.getTable().isEnabled()) {
-			multipleSampleForReferencesTable.getTable().setEnabled(false);
-			multipleSampleForReferencesTable.getTable().setToolTipText(NavigationMessages.Owner_ReadOnly);
-			addMultipleSampleForReferencesTable.setEnabled(false);
-			addMultipleSampleForReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-			removeMultipleSampleForReferencesTable.setEnabled(false);
-			removeMultipleSampleForReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !multipleSampleForReferencesTable.getTable().isEnabled()) {
-			multipleSampleForReferencesTable.getTable().setEnabled(true);
-			addMultipleSampleForReferencesTable.setEnabled(true);
-			removeMultipleSampleForReferencesTable.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -1716,14 +1665,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		multipleSampleForAdvancedReferencesTable.setContentProvider(contentProvider);
 		multipleSampleForAdvancedReferencesTable.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.multipleSampleForAdvancedReferencesTable);
-		if (readOnly && multipleSampleForAdvancedReferencesTable.getTable().isEnabled()) {
-			multipleSampleForAdvancedReferencesTable.setEnabled(false);
-			multipleSampleForAdvancedReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !multipleSampleForAdvancedReferencesTable.getTable().isEnabled()) {
-			multipleSampleForAdvancedReferencesTable.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -1777,14 +1718,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
 		multipleSampleForFlatReferencesTable.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.multipleSampleForFlatReferencesTable);
-		if (readOnly && multipleSampleForFlatReferencesTable.isEnabled()) {
-			multipleSampleForFlatReferencesTable.setEnabled(false);
-			multipleSampleForFlatReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !multipleSampleForFlatReferencesTable.isEnabled()) {
-			multipleSampleForFlatReferencesTable.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1840,23 +1773,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		singleSampleForTableComposition.setContentProvider(contentProvider);
 		singleSampleForTableComposition.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleSampleForTableComposition);
-		if (readOnly && singleSampleForTableComposition.getTable().isEnabled()) {
-			singleSampleForTableComposition.getTable().setEnabled(false);
-			singleSampleForTableComposition.getTable().setToolTipText(NavigationMessages.Owner_ReadOnly);
-			addSingleSampleForTableComposition.setEnabled(false);
-			addSingleSampleForTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-			removeSingleSampleForTableComposition.setEnabled(false);
-			removeSingleSampleForTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-			editSingleSampleForTableComposition.setEnabled(false);
-			editSingleSampleForTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleSampleForTableComposition.getTable().isEnabled()) {
-			singleSampleForTableComposition.getTable().setEnabled(true);
-			addSingleSampleForTableComposition.setEnabled(true);
-			removeSingleSampleForTableComposition.setEnabled(true);
-			editSingleSampleForTableComposition.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -1915,14 +1831,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		singleSampleForAdvancedTableComposition.setContentProvider(contentProvider);
 		singleSampleForAdvancedTableComposition.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleSampleForAdvancedTableComposition);
-		if (readOnly && singleSampleForAdvancedTableComposition.isEnabled()) {
-			singleSampleForAdvancedTableComposition.setEnabled(false);
-			singleSampleForAdvancedTableComposition.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleSampleForAdvancedTableComposition.isEnabled()) {
-			singleSampleForAdvancedTableComposition.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1981,20 +1889,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		singleSampleForReferencesTable.setContentProvider(contentProvider);
 		singleSampleForReferencesTable.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleSampleForReferencesTable);
-		if (readOnly && singleSampleForReferencesTable.getTable().isEnabled()) {
-			singleSampleForReferencesTable.getTable().setEnabled(false);
-			singleSampleForReferencesTable.getTable().setToolTipText(NavigationMessages.Owner_ReadOnly);
-			addSingleSampleForReferencesTable.setEnabled(false);
-			addSingleSampleForReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-			removeSingleSampleForReferencesTable.setEnabled(false);
-			removeSingleSampleForReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleSampleForReferencesTable.getTable().isEnabled()) {
-			singleSampleForReferencesTable.getTable().setEnabled(true);
-			addSingleSampleForReferencesTable.setEnabled(true);
-			removeSingleSampleForReferencesTable.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2050,20 +1944,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		singleSampleForAdvancedReferencesTable.setContentProvider(contentProvider);
 		singleSampleForAdvancedReferencesTable.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleSampleForAdvancedReferencesTable);
-		if (readOnly && singleSampleForAdvancedReferencesTable.getTable().isEnabled()) {
-			singleSampleForAdvancedReferencesTable.getTable().setEnabled(false);
-			singleSampleForAdvancedReferencesTable.getTable().setToolTipText(NavigationMessages.Owner_ReadOnly);
-			addSingleSampleForAdvancedReferencesTable.setEnabled(false);
-			addSingleSampleForAdvancedReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-			removeSingleSampleForAdvancedReferencesTable.setEnabled(false);
-			removeSingleSampleForAdvancedReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleSampleForAdvancedReferencesTable.getTable().isEnabled()) {
-			singleSampleForAdvancedReferencesTable.getTable().setEnabled(true);
-			addSingleSampleForAdvancedReferencesTable.setEnabled(true);
-			removeSingleSampleForAdvancedReferencesTable.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2117,14 +1997,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
 		singleSampleForFlatReferencesTable.setInput(settings);
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleSampleForFlatReferencesTable);
-		if (readOnly && singleSampleForFlatReferencesTable.isEnabled()) {
-			singleSampleForFlatReferencesTable.setEnabled(false);
-			singleSampleForFlatReferencesTable.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleSampleForFlatReferencesTable.isEnabled()) {
-			singleSampleForFlatReferencesTable.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2192,14 +2064,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		if (current != null) {
 			singleContainmentForEObjectFlatComboViewer.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleContainmentForEObjectFlatComboViewer);
-		if (readOnly && singleContainmentForEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForEObjectFlatComboViewer.setEnabled(false);
-			singleContainmentForEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleContainmentForEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2214,14 +2078,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		} else {
 			singleContainmentForEObjectFlatComboViewer.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleContainmentForEObjectFlatComboViewer);
-		if (readOnly && singleContainmentForEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForEObjectFlatComboViewer.setEnabled(false);
-			singleContainmentForEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleContainmentForEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2278,14 +2134,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		if (current != null) {
 			singleReferencesForEObjectFlatComboViewer.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleReferencesForEObjectFlatComboViewer);
-		if (readOnly && singleReferencesForEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForEObjectFlatComboViewer.setEnabled(false);
-			singleReferencesForEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleReferencesForEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2300,14 +2148,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		} else {
 			singleReferencesForEObjectFlatComboViewer.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleReferencesForEObjectFlatComboViewer);
-		if (readOnly && singleReferencesForEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForEObjectFlatComboViewer.setEnabled(false);
-			singleReferencesForEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleReferencesForEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2359,14 +2199,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		if (current != null) {
 			singleContainmentForAdvancedEObjectFlatComboViewer.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleContainmentForAdvancedEObjectFlatComboViewer);
-		if (readOnly && singleContainmentForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForAdvancedEObjectFlatComboViewer.setEnabled(false);
-			singleContainmentForAdvancedEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleContainmentForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForAdvancedEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2381,14 +2213,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		} else {
 			singleContainmentForAdvancedEObjectFlatComboViewer.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleContainmentForAdvancedEObjectFlatComboViewer);
-		if (readOnly && singleContainmentForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForAdvancedEObjectFlatComboViewer.setEnabled(false);
-			singleContainmentForAdvancedEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleContainmentForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleContainmentForAdvancedEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2440,14 +2264,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		if (current != null) {
 			singleReferencesForAdvancedEObjectFlatComboViewer.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleReferencesForAdvancedEObjectFlatComboViewer);
-		if (readOnly && singleReferencesForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForAdvancedEObjectFlatComboViewer.setEnabled(false);
-			singleReferencesForAdvancedEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleReferencesForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForAdvancedEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2462,14 +2278,6 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		} else {
 			singleReferencesForAdvancedEObjectFlatComboViewer.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Owner.Properties.singleReferencesForAdvancedEObjectFlatComboViewer);
-		if (readOnly && singleReferencesForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForAdvancedEObjectFlatComboViewer.setEnabled(false);
-			singleReferencesForAdvancedEObjectFlatComboViewer.setToolTipText(NavigationMessages.Owner_ReadOnly);
-		} else if (!readOnly && !singleReferencesForAdvancedEObjectFlatComboViewer.isEnabled()) {
-			singleReferencesForAdvancedEObjectFlatComboViewer.setEnabled(true);
-		}	
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SecondNavigationSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SecondNavigationSamplePropertiesEditionPartImpl.java
index 5d3caeaee..7f37d7178 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SecondNavigationSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SecondNavigationSamplePropertiesEditionPartImpl.java
@@ -212,14 +212,6 @@ public class SecondNavigationSamplePropertiesEditionPartImpl extends CompositePr
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SecondNavigationSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.SecondNavigationSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SmartNavigationSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SmartNavigationSamplePropertiesEditionPartImpl.java
index 674e1f0c0..bc0ec84cf 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SmartNavigationSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SmartNavigationSamplePropertiesEditionPartImpl.java
@@ -570,14 +570,6 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -602,14 +594,6 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		} else {
 			firstModelNavigationSingleValue.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.firstModelNavigationSingleValue, ((SmartModelNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getFirstModelNavigationSingleValueSettings().getOrCreateSignificantObject());
-		if (readOnly && firstModelNavigationSingleValue.isEnabled()) {
-			firstModelNavigationSingleValue.setEnabled(false);
-			firstModelNavigationSingleValue.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !firstModelNavigationSingleValue.isEnabled()) {
-			firstModelNavigationSingleValue.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -634,14 +618,6 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		} else {
 			secondModelNavigationSingleValue.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationSingleValue, ((SmartModelNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getSecondMNSingleValueWithFirstMNSingleValueSettings().getOrCreateSignificantObject());
-		if (readOnly && secondModelNavigationSingleValue.isEnabled()) {
-			secondModelNavigationSingleValue.setEnabled(false);
-			secondModelNavigationSingleValue.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !secondModelNavigationSingleValue.isEnabled()) {
-			secondModelNavigationSingleValue.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -666,14 +642,6 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		} else {
 			firstModelNavigationMultiValue.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.firstModelNavigationMultiValue, ((SmartModelNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getFirstModelNavigationMultiValueSettings().getOrCreateSignificantObject());
-		if (readOnly && firstModelNavigationMultiValue.isEnabled()) {
-			firstModelNavigationMultiValue.setEnabled(false);
-			firstModelNavigationMultiValue.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !firstModelNavigationMultiValue.isEnabled()) {
-			firstModelNavigationMultiValue.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -698,14 +666,6 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		} else {
 			secondModelNavigationMultiValue.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValue, ((SmartModelNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getSecondMNSingleValueWithFirstMNMultiValueSettings().getOrCreateSignificantObject());
-		if (readOnly && secondModelNavigationMultiValue.isEnabled()) {
-			secondModelNavigationMultiValue.setEnabled(false);
-			secondModelNavigationMultiValue.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !secondModelNavigationMultiValue.isEnabled()) {
-			secondModelNavigationMultiValue.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -730,14 +690,6 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		} else {
 			secondModelNavigationSingleValue2.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationSingleValue2, ((SmartModelNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getSecondMNMultiValueWithFirstMNSingleValueSettings().getOrCreateSignificantObject());
-		if (readOnly && secondModelNavigationSingleValue2.isEnabled()) {
-			secondModelNavigationSingleValue2.setEnabled(false);
-			secondModelNavigationSingleValue2.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !secondModelNavigationSingleValue2.isEnabled()) {
-			secondModelNavigationSingleValue2.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -762,14 +714,6 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		} else {
 			secondModelNavigationMultiValue2.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValue2, ((SmartModelNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getSecondMNMultiValueWithFirstMNMultiValueSettings().getOrCreateSignificantObject());
-		if (readOnly && secondModelNavigationMultiValue2.isEnabled()) {
-			secondModelNavigationMultiValue2.setEnabled(false);
-			secondModelNavigationMultiValue2.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !secondModelNavigationMultiValue2.isEnabled()) {
-			secondModelNavigationMultiValue2.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -794,14 +738,6 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		} else {
 			secondModelNavigationMultiValueFilter.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValueFilter, ((SmartModelNavigationSamplePropertiesEditionComponent) propertiesEditionComponent).getSecondMNMultiValueWithFirstMNMultiValueWithFilterSettings().getOrCreateSignificantObject());
-		if (readOnly && secondModelNavigationMultiValueFilter.isEnabled()) {
-			secondModelNavigationMultiValueFilter.setEnabled(false);
-			secondModelNavigationMultiValueFilter.setToolTipText(NavigationMessages.SmartNavigationSample_ReadOnly);
-		} else if (!readOnly && !secondModelNavigationMultiValueFilter.isEnabled()) {
-			secondModelNavigationMultiValueFilter.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SubtypePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SubtypePropertiesEditionPartImpl.java
index 72792afe7..89235962f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SubtypePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SubtypePropertiesEditionPartImpl.java
@@ -201,14 +201,6 @@ public class SubtypePropertiesEditionPartImpl extends CompositePropertiesEdition
 		} else {
 			specialisedElement.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(NavigationViewsRepository.Subtype.Specialisation.specialisedElement);
-		if (readOnly && specialisedElement.isEnabled()) {
-			specialisedElement.setEnabled(false);
-			specialisedElement.setToolTipText(NavigationMessages.Subtype_ReadOnly);
-		} else if (!readOnly && !specialisedElement.isEnabled()) {
-			specialisedElement.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart.java
index 798a2c06c..a9debe320 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart.java
@@ -167,6 +167,100 @@ public interface AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart {
 	public void addBusinessFilterToAdvancedeobjectflatcomboviewerROProperty(ViewerFilter filter);
 
 
+	/**
+	 * @return the advancedeobjectflatcomboviewerCompoRequiredProperty
+	 * 
+	 */
+	public EObject getAdvancedeobjectflatcomboviewerCompoRequiredProperty();
+
+	/**
+	 * Init the advancedeobjectflatcomboviewerCompoRequiredProperty
+	 * @param settings the combo setting
+	 */
+	public void initAdvancedeobjectflatcomboviewerCompoRequiredProperty(EObjectFlatComboSettings settings);
+
+	/**
+	 * Defines a new advancedeobjectflatcomboviewerCompoRequiredProperty
+	 * @param newValue the new advancedeobjectflatcomboviewerCompoRequiredProperty to set
+	 * 
+	 */
+	public void setAdvancedeobjectflatcomboviewerCompoRequiredProperty(EObject newValue);
+
+	/**
+	 * Defines the button mode
+	 * @param newValue the new mode to set
+	 * 
+	 */
+	public void setAdvancedeobjectflatcomboviewerCompoRequiredPropertyButtonMode(ButtonsModeEnum newValue);
+
+	/**
+	 * Adds the given filter to the advancedeobjectflatcomboviewerCompoRequiredProperty edition editor.
+	 * 
+	 * @param filter
+	 *            a viewer filter
+	 * @see org.eclipse.jface.viewers.StructuredViewer#addFilter(ViewerFilter)
+	 * 
+	 */
+	public void addFilterToAdvancedeobjectflatcomboviewerCompoRequiredProperty(ViewerFilter filter);
+
+	/**
+	 * Adds the given filter to the advancedeobjectflatcomboviewerCompoRequiredProperty edition editor.
+	 * 
+	 * @param filter
+	 *            a viewer filter
+	 * @see org.eclipse.jface.viewers.StructuredViewer#addFilter(ViewerFilter)
+	 * 
+	 */
+	public void addBusinessFilterToAdvancedeobjectflatcomboviewerCompoRequiredProperty(ViewerFilter filter);
+
+
+	/**
+	 * @return the advancedeobjectflatcomboviewerCompoOptionalProperty
+	 * 
+	 */
+	public EObject getAdvancedeobjectflatcomboviewerCompoOptionalProperty();
+
+	/**
+	 * Init the advancedeobjectflatcomboviewerCompoOptionalProperty
+	 * @param settings the combo setting
+	 */
+	public void initAdvancedeobjectflatcomboviewerCompoOptionalProperty(EObjectFlatComboSettings settings);
+
+	/**
+	 * Defines a new advancedeobjectflatcomboviewerCompoOptionalProperty
+	 * @param newValue the new advancedeobjectflatcomboviewerCompoOptionalProperty to set
+	 * 
+	 */
+	public void setAdvancedeobjectflatcomboviewerCompoOptionalProperty(EObject newValue);
+
+	/**
+	 * Defines the button mode
+	 * @param newValue the new mode to set
+	 * 
+	 */
+	public void setAdvancedeobjectflatcomboviewerCompoOptionalPropertyButtonMode(ButtonsModeEnum newValue);
+
+	/**
+	 * Adds the given filter to the advancedeobjectflatcomboviewerCompoOptionalProperty edition editor.
+	 * 
+	 * @param filter
+	 *            a viewer filter
+	 * @see org.eclipse.jface.viewers.StructuredViewer#addFilter(ViewerFilter)
+	 * 
+	 */
+	public void addFilterToAdvancedeobjectflatcomboviewerCompoOptionalProperty(ViewerFilter filter);
+
+	/**
+	 * Adds the given filter to the advancedeobjectflatcomboviewerCompoOptionalProperty edition editor.
+	 * 
+	 * @param filter
+	 *            a viewer filter
+	 * @see org.eclipse.jface.viewers.StructuredViewer#addFilter(ViewerFilter)
+	 * 
+	 */
+	public void addBusinessFilterToAdvancedeobjectflatcomboviewerCompoOptionalProperty(ViewerFilter filter);
+
+
 
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/EefnrViewsRepository.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/EefnrViewsRepository.java
index 39b68943b..4756f3bdb 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/EefnrViewsRepository.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/EefnrViewsRepository.java
@@ -353,6 +353,12 @@ public class EefnrViewsRepository {
 			
 			public static String advancedeobjectflatcomboviewerROProperty = "eefnr::AdvancedEObjectFlatComboViewerSample::properties::advancedeobjectflatcomboviewerROProperty";
 			
+			
+			public static String advancedeobjectflatcomboviewerCompoRequiredProperty = "eefnr::AdvancedEObjectFlatComboViewerSample::properties::advancedeobjectflatcomboviewerCompoRequiredProperty";
+			
+			
+			public static String advancedeobjectflatcomboviewerCompoOptionalProperty = "eefnr::AdvancedEObjectFlatComboViewerSample::properties::advancedeobjectflatcomboviewerCompoOptionalProperty";
+			
 	
 		}
 	
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm.java
index 135644288..3527822f5 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm.java
@@ -55,6 +55,10 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 	protected ViewerFilter advancedeobjectflatcomboviewerOptionalPropertyFilter;
 	protected AdvancedEObjectFlatComboViewer advancedeobjectflatcomboviewerROProperty;
 	protected ViewerFilter advancedeobjectflatcomboviewerROPropertyFilter;
+	protected AdvancedEObjectFlatComboViewer advancedeobjectflatcomboviewerCompoRequiredProperty;
+	protected ViewerFilter advancedeobjectflatcomboviewerCompoRequiredPropertyFilter;
+	protected AdvancedEObjectFlatComboViewer advancedeobjectflatcomboviewerCompoOptionalProperty;
+	protected ViewerFilter advancedeobjectflatcomboviewerCompoOptionalPropertyFilter;
 
 
 
@@ -103,6 +107,8 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 		propertiesStep.addStep(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty);
 		propertiesStep.addStep(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerOptionalProperty);
 		propertiesStep.addStep(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerROProperty);
+		propertiesStep.addStep(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty);
+		propertiesStep.addStep(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty);
 		
 		
 		composer = new PartComposer(advancedEObjectFlatComboViewerSampleStep) {
@@ -121,6 +127,12 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 				if (key == EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerROProperty) {
 					return createAdvancedeobjectflatcomboviewerROPropertyFlatComboViewer(parent, widgetFactory);
 				}
+				if (key == EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty) {
+					return createAdvancedeobjectflatcomboviewerCompoRequiredPropertyFlatComboViewer(parent, widgetFactory);
+				}
+				if (key == EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty) {
+					return createAdvancedeobjectflatcomboviewerCompoOptionalPropertyFlatComboViewer(parent, widgetFactory);
+				}
 				return parent;
 			}
 		};
@@ -228,6 +240,8 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 		//create widget
 		advancedeobjectflatcomboviewerROProperty = new AdvancedEObjectFlatComboViewer(EefnrMessages.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerROPropertyLabel, resourceSet, advancedeobjectflatcomboviewerROPropertyFilter, propertiesEditionComponent.getEditingContext().getAdapterFactory(), listener);
 		advancedeobjectflatcomboviewerROProperty.createControls(parent, widgetFactory);
+		advancedeobjectflatcomboviewerROProperty.setEnabled(false);
+		advancedeobjectflatcomboviewerROProperty.setToolTipText(EefnrMessages.AdvancedEObjectFlatComboViewerSample_ReadOnly);
 		GridData advancedeobjectflatcomboviewerROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		advancedeobjectflatcomboviewerROProperty.setLayoutData(advancedeobjectflatcomboviewerROPropertyData);
 		advancedeobjectflatcomboviewerROProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerROProperty);
@@ -236,6 +250,68 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 	}
 
 
+	/**
+	 * @param parent the parent composite
+	 * @param widgetFactory factory to use to instanciante widget of the form
+	 * 
+	 */
+	protected Composite createAdvancedeobjectflatcomboviewerCompoRequiredPropertyFlatComboViewer(Composite parent, FormToolkit widgetFactory) {
+		createDescription(parent, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty, EefnrMessages.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerCompoRequiredPropertyLabel);
+		// create callback listener
+		EObjectFlatComboViewerListener listener = new EObjectFlatComboViewerListener(){
+			public void handleSet(EObject element){
+				propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm.this, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, element)); 
+			}
+			public void navigateTo(EObject element){ }
+
+			public EObject handleCreate() {
+				propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm.this, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.ADD, null, null)); 
+				return null;
+			}
+
+		};
+		//create widget
+		advancedeobjectflatcomboviewerCompoRequiredProperty = new AdvancedEObjectFlatComboViewer(EefnrMessages.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerCompoRequiredPropertyLabel, resourceSet, advancedeobjectflatcomboviewerCompoRequiredPropertyFilter, propertiesEditionComponent.getEditingContext().getAdapterFactory(), listener);
+		advancedeobjectflatcomboviewerCompoRequiredProperty.createControls(parent, widgetFactory);
+		GridData advancedeobjectflatcomboviewerCompoRequiredPropertyData = new GridData(GridData.FILL_HORIZONTAL);
+		advancedeobjectflatcomboviewerCompoRequiredProperty.setLayoutData(advancedeobjectflatcomboviewerCompoRequiredPropertyData);
+		advancedeobjectflatcomboviewerCompoRequiredProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty);
+		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		return parent;
+	}
+
+
+	/**
+	 * @param parent the parent composite
+	 * @param widgetFactory factory to use to instanciante widget of the form
+	 * 
+	 */
+	protected Composite createAdvancedeobjectflatcomboviewerCompoOptionalPropertyFlatComboViewer(Composite parent, FormToolkit widgetFactory) {
+		createDescription(parent, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty, EefnrMessages.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerCompoOptionalPropertyLabel);
+		// create callback listener
+		EObjectFlatComboViewerListener listener = new EObjectFlatComboViewerListener(){
+			public void handleSet(EObject element){
+				propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm.this, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, element)); 
+			}
+			public void navigateTo(EObject element){ }
+
+			public EObject handleCreate() {
+				propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm.this, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.ADD, null, null)); 
+				return null;
+			}
+
+		};
+		//create widget
+		advancedeobjectflatcomboviewerCompoOptionalProperty = new AdvancedEObjectFlatComboViewer(EefnrMessages.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerCompoOptionalPropertyLabel, resourceSet, advancedeobjectflatcomboviewerCompoOptionalPropertyFilter, propertiesEditionComponent.getEditingContext().getAdapterFactory(), listener);
+		advancedeobjectflatcomboviewerCompoOptionalProperty.createControls(parent, widgetFactory);
+		GridData advancedeobjectflatcomboviewerCompoOptionalPropertyData = new GridData(GridData.FILL_HORIZONTAL);
+		advancedeobjectflatcomboviewerCompoOptionalProperty.setLayoutData(advancedeobjectflatcomboviewerCompoOptionalPropertyData);
+		advancedeobjectflatcomboviewerCompoOptionalProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty);
+		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		return parent;
+	}
+
+
 
 	/**
 	 * {@inheritDoc}
@@ -269,14 +345,6 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 		if (current != null) {
 			advancedeobjectflatcomboviewerRequiredProperty.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty);
-		if (readOnly && advancedeobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredProperty.setEnabled(false);
-			advancedeobjectflatcomboviewerRequiredProperty.setToolTipText(EefnrMessages.AdvancedEObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -291,14 +359,6 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 		} else {
 			advancedeobjectflatcomboviewerRequiredProperty.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty);
-		if (readOnly && advancedeobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredProperty.setEnabled(false);
-			advancedeobjectflatcomboviewerRequiredProperty.setToolTipText(EefnrMessages.AdvancedEObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -350,14 +410,6 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 		if (current != null) {
 			advancedeobjectflatcomboviewerOptionalProperty.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerOptionalProperty);
-		if (readOnly && advancedeobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalProperty.setEnabled(false);
-			advancedeobjectflatcomboviewerOptionalProperty.setToolTipText(EefnrMessages.AdvancedEObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -372,14 +424,6 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 		} else {
 			advancedeobjectflatcomboviewerOptionalProperty.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerOptionalProperty);
-		if (readOnly && advancedeobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalProperty.setEnabled(false);
-			advancedeobjectflatcomboviewerOptionalProperty.setToolTipText(EefnrMessages.AdvancedEObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -431,9 +475,6 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 		if (current != null) {
 			advancedeobjectflatcomboviewerROProperty.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		advancedeobjectflatcomboviewerROProperty.setEnabled(false);
-		advancedeobjectflatcomboviewerROProperty.setToolTipText(EefnrMessages.AdvancedEObjectFlatComboViewerSample_ReadOnly);
-		
 	}
 
 	/**
@@ -448,9 +489,6 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 		} else {
 			advancedeobjectflatcomboviewerROProperty.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		advancedeobjectflatcomboviewerROProperty.setEnabled(false);
-		advancedeobjectflatcomboviewerROProperty.setToolTipText(EefnrMessages.AdvancedEObjectFlatComboViewerSample_ReadOnly);
-		
 	}
 
 	/**
@@ -482,6 +520,136 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 		advancedeobjectflatcomboviewerROProperty.addBusinessRuleFilter(filter);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#getAdvancedeobjectflatcomboviewerCompoRequiredProperty()
+	 * 
+	 */
+	public EObject getAdvancedeobjectflatcomboviewerCompoRequiredProperty() {
+		return advancedeobjectflatcomboviewerCompoRequiredProperty.getSelection();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#initAdvancedeobjectflatcomboviewerCompoRequiredProperty(EObjectFlatComboSettings)
+	 */
+	public void initAdvancedeobjectflatcomboviewerCompoRequiredProperty(EObjectFlatComboSettings settings) {
+		advancedeobjectflatcomboviewerCompoRequiredProperty.setInput(settings);
+		if (current != null) {
+			advancedeobjectflatcomboviewerCompoRequiredProperty.setSelection(new StructuredSelection(settings.getValue()));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#setAdvancedeobjectflatcomboviewerCompoRequiredProperty(EObject newValue)
+	 * 
+	 */
+	public void setAdvancedeobjectflatcomboviewerCompoRequiredProperty(EObject newValue) {
+		if (newValue != null) {
+			advancedeobjectflatcomboviewerCompoRequiredProperty.setSelection(new StructuredSelection(newValue));
+		} else {
+			advancedeobjectflatcomboviewerCompoRequiredProperty.setSelection(new StructuredSelection()); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#setAdvancedeobjectflatcomboviewerCompoRequiredPropertyButtonMode(ButtonsModeEnum newValue)
+	 */
+	public void setAdvancedeobjectflatcomboviewerCompoRequiredPropertyButtonMode(ButtonsModeEnum newValue) {
+		advancedeobjectflatcomboviewerCompoRequiredProperty.setButtonMode(newValue);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#addFilterAdvancedeobjectflatcomboviewerCompoRequiredProperty(ViewerFilter filter)
+	 * 
+	 */
+	public void addFilterToAdvancedeobjectflatcomboviewerCompoRequiredProperty(ViewerFilter filter) {
+		advancedeobjectflatcomboviewerCompoRequiredProperty.addFilter(filter);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#addBusinessFilterAdvancedeobjectflatcomboviewerCompoRequiredProperty(ViewerFilter filter)
+	 * 
+	 */
+	public void addBusinessFilterToAdvancedeobjectflatcomboviewerCompoRequiredProperty(ViewerFilter filter) {
+		advancedeobjectflatcomboviewerCompoRequiredProperty.addBusinessRuleFilter(filter);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#getAdvancedeobjectflatcomboviewerCompoOptionalProperty()
+	 * 
+	 */
+	public EObject getAdvancedeobjectflatcomboviewerCompoOptionalProperty() {
+		return advancedeobjectflatcomboviewerCompoOptionalProperty.getSelection();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#initAdvancedeobjectflatcomboviewerCompoOptionalProperty(EObjectFlatComboSettings)
+	 */
+	public void initAdvancedeobjectflatcomboviewerCompoOptionalProperty(EObjectFlatComboSettings settings) {
+		advancedeobjectflatcomboviewerCompoOptionalProperty.setInput(settings);
+		if (current != null) {
+			advancedeobjectflatcomboviewerCompoOptionalProperty.setSelection(new StructuredSelection(settings.getValue()));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#setAdvancedeobjectflatcomboviewerCompoOptionalProperty(EObject newValue)
+	 * 
+	 */
+	public void setAdvancedeobjectflatcomboviewerCompoOptionalProperty(EObject newValue) {
+		if (newValue != null) {
+			advancedeobjectflatcomboviewerCompoOptionalProperty.setSelection(new StructuredSelection(newValue));
+		} else {
+			advancedeobjectflatcomboviewerCompoOptionalProperty.setSelection(new StructuredSelection()); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#setAdvancedeobjectflatcomboviewerCompoOptionalPropertyButtonMode(ButtonsModeEnum newValue)
+	 */
+	public void setAdvancedeobjectflatcomboviewerCompoOptionalPropertyButtonMode(ButtonsModeEnum newValue) {
+		advancedeobjectflatcomboviewerCompoOptionalProperty.setButtonMode(newValue);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#addFilterAdvancedeobjectflatcomboviewerCompoOptionalProperty(ViewerFilter filter)
+	 * 
+	 */
+	public void addFilterToAdvancedeobjectflatcomboviewerCompoOptionalProperty(ViewerFilter filter) {
+		advancedeobjectflatcomboviewerCompoOptionalProperty.addFilter(filter);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#addBusinessFilterAdvancedeobjectflatcomboviewerCompoOptionalProperty(ViewerFilter filter)
+	 * 
+	 */
+	public void addBusinessFilterToAdvancedeobjectflatcomboviewerCompoOptionalProperty(ViewerFilter filter) {
+		advancedeobjectflatcomboviewerCompoOptionalProperty.addBusinessRuleFilter(filter);
+	}
+
 
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedReferencesTableSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedReferencesTableSamplePropertiesEditionPartForm.java
index 9035c3ac3..e2ca6809b 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedReferencesTableSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedReferencesTableSamplePropertiesEditionPartForm.java
@@ -339,6 +339,8 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Sect
 			}
 			
 		});
+		advancedreferencestableROProperty.setEnabled(false);
+		advancedreferencestableROProperty.setToolTipText(EefnrMessages.AdvancedReferencesTableSample_ReadOnly);
 		GridData advancedreferencestableROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		advancedreferencestableROPropertyData.horizontalSpan = 3;
 		this.advancedreferencestableROProperty.setLayoutData(advancedreferencestableROPropertyData);
@@ -424,14 +426,6 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Sect
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedreferencestableRequiredProperty.setContentProvider(contentProvider);
 		advancedreferencestableRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableRequiredProperty);
-		if (readOnly && advancedreferencestableRequiredProperty.getTable().isEnabled()) {
-			advancedreferencestableRequiredProperty.setEnabled(false);
-			advancedreferencestableRequiredProperty.setToolTipText(EefnrMessages.AdvancedReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !advancedreferencestableRequiredProperty.getTable().isEnabled()) {
-			advancedreferencestableRequiredProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -487,14 +481,6 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Sect
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedreferencestableOptionalProperty.setContentProvider(contentProvider);
 		advancedreferencestableOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableOptionalProperty);
-		if (readOnly && advancedreferencestableOptionalProperty.getTable().isEnabled()) {
-			advancedreferencestableOptionalProperty.setEnabled(false);
-			advancedreferencestableOptionalProperty.setToolTipText(EefnrMessages.AdvancedReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !advancedreferencestableOptionalProperty.getTable().isEnabled()) {
-			advancedreferencestableOptionalProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -550,9 +536,6 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Sect
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedreferencestableROProperty.setContentProvider(contentProvider);
 		advancedreferencestableROProperty.setInput(settings);
-		advancedreferencestableROProperty.setEnabled(false);
-		advancedreferencestableROProperty.setToolTipText(EefnrMessages.AdvancedReferencesTableSample_ReadOnly);
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.java
index 8634838b8..50631a250 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.java
@@ -284,6 +284,8 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten
 			}
 			
 		});
+		advancedtablecompositionROProperty.setEnabled(false);
+		advancedtablecompositionROProperty.setToolTipText(EefnrMessages.AdvancedTableCompositionEditorSample_ReadOnly);
 		GridData advancedtablecompositionROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		advancedtablecompositionROPropertyData.horizontalSpan = 3;
 		this.advancedtablecompositionROProperty.setLayoutData(advancedtablecompositionROPropertyData);
@@ -320,14 +322,6 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedtablecompositionRequiredProperty.setContentProvider(contentProvider);
 		advancedtablecompositionRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionRequiredProperty);
-		if (readOnly && advancedtablecompositionRequiredProperty.isEnabled()) {
-			advancedtablecompositionRequiredProperty.setEnabled(false);
-			advancedtablecompositionRequiredProperty.setToolTipText(EefnrMessages.AdvancedTableCompositionEditorSample_ReadOnly);
-		} else if (!readOnly && !advancedtablecompositionRequiredProperty.isEnabled()) {
-			advancedtablecompositionRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -386,14 +380,6 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedtablecompositionOptionalProperty.setContentProvider(contentProvider);
 		advancedtablecompositionOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionOptionalProperty);
-		if (readOnly && advancedtablecompositionOptionalProperty.isEnabled()) {
-			advancedtablecompositionOptionalProperty.setEnabled(false);
-			advancedtablecompositionOptionalProperty.setToolTipText(EefnrMessages.AdvancedTableCompositionEditorSample_ReadOnly);
-		} else if (!readOnly && !advancedtablecompositionOptionalProperty.isEnabled()) {
-			advancedtablecompositionOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -452,9 +438,6 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedtablecompositionROProperty.setContentProvider(contentProvider);
 		advancedtablecompositionROProperty.setInput(settings);
-		advancedtablecompositionROProperty.setEnabled(false);
-		advancedtablecompositionROProperty.setToolTipText(EefnrMessages.AdvancedTableCompositionEditorSample_ReadOnly);
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/CheckboxSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/CheckboxSamplePropertiesEditionPartForm.java
index 5984c6dea..7de58a9f5 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/CheckboxSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/CheckboxSamplePropertiesEditionPartForm.java
@@ -193,6 +193,8 @@ public class CheckboxSamplePropertiesEditionPartForm extends SectionPropertiesEd
 	
 	protected Composite createCheckboxROPropertyCheckbox(FormToolkit widgetFactory, Composite parent) {
 		checkboxROProperty = widgetFactory.createButton(parent, getDescription(EefnrViewsRepository.CheckboxSample.Properties.checkboxROProperty, EefnrMessages.CheckboxSamplePropertiesEditionPart_CheckboxROPropertyLabel), SWT.CHECK);
+		checkboxROProperty.setEnabled(false);
+		checkboxROProperty.setToolTipText(EefnrMessages.CheckboxSample_ReadOnly);
 		checkboxROProperty.addSelectionListener(new SelectionAdapter() {
 
 			/**
@@ -251,14 +253,6 @@ public class CheckboxSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		} else {
 			checkboxRequiredProperty.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.CheckboxSample.Properties.checkboxRequiredProperty);
-		if (readOnly && checkboxRequiredProperty.isEnabled()) {
-			checkboxRequiredProperty.setEnabled(false);
-			checkboxRequiredProperty.setToolTipText(EefnrMessages.CheckboxSample_ReadOnly);
-		} else if (!readOnly && !checkboxRequiredProperty.isEnabled()) {
-			checkboxRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -283,14 +277,6 @@ public class CheckboxSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		} else {
 			checkboxOptionalProperty.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.CheckboxSample.Properties.checkboxOptionalProperty);
-		if (readOnly && checkboxOptionalProperty.isEnabled()) {
-			checkboxOptionalProperty.setEnabled(false);
-			checkboxOptionalProperty.setToolTipText(EefnrMessages.CheckboxSample_ReadOnly);
-		} else if (!readOnly && !checkboxOptionalProperty.isEnabled()) {
-			checkboxOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -315,9 +301,6 @@ public class CheckboxSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		} else {
 			checkboxROProperty.setSelection(false);
 		}
-		checkboxROProperty.setEnabled(false);
-		checkboxROProperty.setToolTipText(EefnrMessages.CheckboxSample_ReadOnly);
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EMFComboViewerSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EMFComboViewerSamplePropertiesEditionPartForm.java
index 305b52c93..614575f0b 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EMFComboViewerSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EMFComboViewerSamplePropertiesEditionPartForm.java
@@ -201,6 +201,8 @@ public class EMFComboViewerSamplePropertiesEditionPartForm extends SectionProper
 		emfcomboviewerROProperty = new EMFComboViewer(parent);
 		emfcomboviewerROProperty.setContentProvider(new ArrayContentProvider());
 		emfcomboviewerROProperty.setLabelProvider(new AdapterFactoryLabelProvider(EEFRuntimePlugin.getDefault().getAdapterFactory()));
+		emfcomboviewerROProperty.setEnabled(false);
+		emfcomboviewerROProperty.setToolTipText(EefnrMessages.EMFComboViewerSample_ReadOnly);
 		GridData emfcomboviewerROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		emfcomboviewerROProperty.getCombo().setLayoutData(emfcomboviewerROPropertyData);
 		emfcomboviewerROProperty.addSelectionChangedListener(new ISelectionChangedListener() {
@@ -254,14 +256,6 @@ public class EMFComboViewerSamplePropertiesEditionPartForm extends SectionProper
 	public void initEmfcomboviewerRequiredProperty(Object input, Enumerator current) {
 		emfcomboviewerRequiredProperty.setInput(input);
 		emfcomboviewerRequiredProperty.modelUpdating(new StructuredSelection(current));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerRequiredProperty);
-		if (readOnly && emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(false);
-			emfcomboviewerRequiredProperty.setToolTipText(EefnrMessages.EMFComboViewerSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -272,14 +266,6 @@ public class EMFComboViewerSamplePropertiesEditionPartForm extends SectionProper
 	 */
 	public void setEmfcomboviewerRequiredProperty(Enumerator newValue) {
 		emfcomboviewerRequiredProperty.modelUpdating(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerRequiredProperty);
-		if (readOnly && emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(false);
-			emfcomboviewerRequiredProperty.setToolTipText(EefnrMessages.EMFComboViewerSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -301,14 +287,6 @@ public class EMFComboViewerSamplePropertiesEditionPartForm extends SectionProper
 	public void initEmfcomboviewerOptionalProperty(Object input, Enumerator current) {
 		emfcomboviewerOptionalProperty.setInput(input);
 		emfcomboviewerOptionalProperty.modelUpdating(new StructuredSelection(current));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerOptionalProperty);
-		if (readOnly && emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(false);
-			emfcomboviewerOptionalProperty.setToolTipText(EefnrMessages.EMFComboViewerSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -319,14 +297,6 @@ public class EMFComboViewerSamplePropertiesEditionPartForm extends SectionProper
 	 */
 	public void setEmfcomboviewerOptionalProperty(Enumerator newValue) {
 		emfcomboviewerOptionalProperty.modelUpdating(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerOptionalProperty);
-		if (readOnly && emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(false);
-			emfcomboviewerOptionalProperty.setToolTipText(EefnrMessages.EMFComboViewerSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -348,9 +318,6 @@ public class EMFComboViewerSamplePropertiesEditionPartForm extends SectionProper
 	public void initEmfcomboviewerROProperty(Object input, Enumerator current) {
 		emfcomboviewerROProperty.setInput(input);
 		emfcomboviewerROProperty.modelUpdating(new StructuredSelection(current));
-		emfcomboviewerROProperty.setEnabled(false);
-		emfcomboviewerROProperty.setToolTipText(EefnrMessages.EMFComboViewerSample_ReadOnly);
-		
 	}
 
 	/**
@@ -361,9 +328,6 @@ public class EMFComboViewerSamplePropertiesEditionPartForm extends SectionProper
 	 */
 	public void setEmfcomboviewerROProperty(Enumerator newValue) {
 		emfcomboviewerROProperty.modelUpdating(new StructuredSelection(newValue));
-		emfcomboviewerROProperty.setEnabled(false);
-		emfcomboviewerROProperty.setToolTipText(EefnrMessages.EMFComboViewerSample_ReadOnly);
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EObjectFlatComboViewerSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EObjectFlatComboViewerSamplePropertiesEditionPartForm.java
index 2f8363eb8..42f5729d7 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EObjectFlatComboViewerSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EObjectFlatComboViewerSamplePropertiesEditionPartForm.java
@@ -212,6 +212,8 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartForm extends Secti
 		eobjectflatcomboviewerROPropery = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerROPropery, EefnrViewsRepository.FORM_KIND));
 		widgetFactory.adapt(eobjectflatcomboviewerROPropery);
 		eobjectflatcomboviewerROPropery.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+		eobjectflatcomboviewerROPropery.setEnabled(false);
+		eobjectflatcomboviewerROPropery.setToolTipText(EefnrMessages.EObjectFlatComboViewerSample_ReadOnly);
 		GridData eobjectflatcomboviewerROProperyData = new GridData(GridData.FILL_HORIZONTAL);
 		eobjectflatcomboviewerROPropery.setLayoutData(eobjectflatcomboviewerROProperyData);
 		eobjectflatcomboviewerROPropery.addSelectionChangedListener(new ISelectionChangedListener() {
@@ -270,14 +272,6 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartForm extends Secti
 		if (current != null) {
 			eobjectflatcomboviewerRequiredPropery.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerRequiredPropery);
-		if (readOnly && eobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			eobjectflatcomboviewerRequiredPropery.setEnabled(false);
-			eobjectflatcomboviewerRequiredPropery.setToolTipText(EefnrMessages.EObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			eobjectflatcomboviewerRequiredPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -292,14 +286,6 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartForm extends Secti
 		} else {
 			eobjectflatcomboviewerRequiredPropery.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerRequiredPropery);
-		if (readOnly && eobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			eobjectflatcomboviewerRequiredPropery.setEnabled(false);
-			eobjectflatcomboviewerRequiredPropery.setToolTipText(EefnrMessages.EObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			eobjectflatcomboviewerRequiredPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -356,14 +342,6 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartForm extends Secti
 		if (current != null) {
 			eobjectflatcomboviewerOptionalPropery.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerOptionalPropery);
-		if (readOnly && eobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			eobjectflatcomboviewerOptionalPropery.setEnabled(false);
-			eobjectflatcomboviewerOptionalPropery.setToolTipText(EefnrMessages.EObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			eobjectflatcomboviewerOptionalPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -378,14 +356,6 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartForm extends Secti
 		} else {
 			eobjectflatcomboviewerOptionalPropery.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerOptionalPropery);
-		if (readOnly && eobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			eobjectflatcomboviewerOptionalPropery.setEnabled(false);
-			eobjectflatcomboviewerOptionalPropery.setToolTipText(EefnrMessages.EObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			eobjectflatcomboviewerOptionalPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -442,9 +412,6 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartForm extends Secti
 		if (current != null) {
 			eobjectflatcomboviewerROPropery.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		eobjectflatcomboviewerROPropery.setEnabled(false);
-		eobjectflatcomboviewerROPropery.setToolTipText(EefnrMessages.EObjectFlatComboViewerSample_ReadOnly);
-		
 	}
 
 	/**
@@ -459,9 +426,6 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartForm extends Secti
 		} else {
 			eobjectflatcomboviewerROPropery.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		eobjectflatcomboviewerROPropery.setEnabled(false);
-		eobjectflatcomboviewerROPropery.setToolTipText(EefnrMessages.EObjectFlatComboViewerSample_ReadOnly);
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/FlatReferenceTableSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/FlatReferenceTableSamplePropertiesEditionPartForm.java
index b18590e15..9cde4ce69 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/FlatReferenceTableSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/FlatReferenceTableSamplePropertiesEditionPartForm.java
@@ -149,6 +149,7 @@ public class FlatReferenceTableSamplePropertiesEditionPartForm extends SectionPr
 		createDescription(parent, EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableRequiredProperty, EefnrMessages.FlatReferenceTableSamplePropertiesEditionPart_FlatreferencetableRequiredPropertyLabel);
 		flatreferencetableRequiredProperty = new FlatReferencesTable(parent);
 		flatreferencetableRequiredProperty.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
 		flatreferencetableRequiredProperty.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -173,6 +174,7 @@ public class FlatReferenceTableSamplePropertiesEditionPartForm extends SectionPr
 		createDescription(parent, EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableOptionalProperty, EefnrMessages.FlatReferenceTableSamplePropertiesEditionPart_FlatreferencetableOptionalPropertyLabel);
 		flatreferencetableOptionalProperty = new FlatReferencesTable(parent);
 		flatreferencetableOptionalProperty.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
 		flatreferencetableOptionalProperty.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -197,6 +199,9 @@ public class FlatReferenceTableSamplePropertiesEditionPartForm extends SectionPr
 		createDescription(parent, EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableROProperty, EefnrMessages.FlatReferenceTableSamplePropertiesEditionPart_FlatreferencetableROPropertyLabel);
 		flatreferencetableROProperty = new FlatReferencesTable(parent);
 		flatreferencetableROProperty.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+		flatreferencetableROProperty.setEnabled(false);
+		flatreferencetableROProperty.setToolTipText(EefnrMessages.FlatReferenceTableSample_ReadOnly);
+
 		flatreferencetableROProperty.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -237,14 +242,6 @@ public class FlatReferenceTableSamplePropertiesEditionPartForm extends SectionPr
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
 		flatreferencetableRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableRequiredProperty);
-		if (readOnly && flatreferencetableRequiredProperty.isEnabled()) {
-			flatreferencetableRequiredProperty.setEnabled(false);
-			flatreferencetableRequiredProperty.setToolTipText(EefnrMessages.FlatReferenceTableSample_ReadOnly);
-		} else if (!readOnly && !flatreferencetableRequiredProperty.isEnabled()) {
-			flatreferencetableRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -298,14 +295,6 @@ public class FlatReferenceTableSamplePropertiesEditionPartForm extends SectionPr
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
 		flatreferencetableOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableOptionalProperty);
-		if (readOnly && flatreferencetableOptionalProperty.isEnabled()) {
-			flatreferencetableOptionalProperty.setEnabled(false);
-			flatreferencetableOptionalProperty.setToolTipText(EefnrMessages.FlatReferenceTableSample_ReadOnly);
-		} else if (!readOnly && !flatreferencetableOptionalProperty.isEnabled()) {
-			flatreferencetableOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -359,9 +348,6 @@ public class FlatReferenceTableSamplePropertiesEditionPartForm extends SectionPr
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
 		flatreferencetableROProperty.setInput(settings);
-		flatreferencetableROProperty.setEnabled(false);
-		flatreferencetableROProperty.setToolTipText(EefnrMessages.FlatReferenceTableSample_ReadOnly);
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ImageViewerSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ImageViewerSamplePropertiesEditionPartForm.java
index 9caddcf78..2cea7854a 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ImageViewerSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ImageViewerSamplePropertiesEditionPartForm.java
@@ -197,6 +197,8 @@ public class ImageViewerSamplePropertiesEditionPartForm extends SectionPropertie
 	protected Composite createImageviewerROPropertyImageViewer(FormToolkit widgetFactory, Composite parent) {
 		createDescription(parent, EefnrViewsRepository.ImageViewerSample.Properties.imageviewerROProperty, EefnrMessages.ImageViewerSamplePropertiesEditionPart_ImageviewerROPropertyLabel);
 		imageviewerROProperty = new EEFImageViewer(parent, SWT.BORDER);
+		imageviewerROProperty.setEnabled(false);
+		imageviewerROProperty.setToolTipText(EefnrMessages.ImageViewerSample_ReadOnly);
 		GridData imageviewerROPropertyData = new GridData();
 		// Start of user code  for imageviewerROProperty layout data customization
 				imageviewerROPropertyData.widthHint = 200;
@@ -255,14 +257,6 @@ public class ImageViewerSamplePropertiesEditionPartForm extends SectionPropertie
 		} else {
 			imageviewerRequiredProperty.initViewer(key, ""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerRequiredProperty);
-		if (readOnly && imageviewerRequiredProperty.isEnabled()) {
-			imageviewerRequiredProperty.setEnabled(false);
-			imageviewerRequiredProperty.setToolTipText(EefnrMessages.ImageViewerSample_ReadOnly);
-		} else if (!readOnly && !imageviewerRequiredProperty.isEnabled()) {
-			imageviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -277,14 +271,6 @@ public class ImageViewerSamplePropertiesEditionPartForm extends SectionPropertie
 		} else {
 			imageviewerRequiredProperty.setSelection(new StructuredSelection("")); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerRequiredProperty);
-		if (readOnly && imageviewerRequiredProperty.isEnabled()) {
-			imageviewerRequiredProperty.setEnabled(false);
-			imageviewerRequiredProperty.setToolTipText(EefnrMessages.ImageViewerSample_ReadOnly);
-		} else if (!readOnly && !imageviewerRequiredProperty.isEnabled()) {
-			imageviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -312,14 +298,6 @@ public class ImageViewerSamplePropertiesEditionPartForm extends SectionPropertie
 		} else {
 			imageviewerOptionalProperty.initViewer(key, ""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerOptionalProperty);
-		if (readOnly && imageviewerOptionalProperty.isEnabled()) {
-			imageviewerOptionalProperty.setEnabled(false);
-			imageviewerOptionalProperty.setToolTipText(EefnrMessages.ImageViewerSample_ReadOnly);
-		} else if (!readOnly && !imageviewerOptionalProperty.isEnabled()) {
-			imageviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -334,14 +312,6 @@ public class ImageViewerSamplePropertiesEditionPartForm extends SectionPropertie
 		} else {
 			imageviewerOptionalProperty.setSelection(new StructuredSelection("")); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerOptionalProperty);
-		if (readOnly && imageviewerOptionalProperty.isEnabled()) {
-			imageviewerOptionalProperty.setEnabled(false);
-			imageviewerOptionalProperty.setToolTipText(EefnrMessages.ImageViewerSample_ReadOnly);
-		} else if (!readOnly && !imageviewerOptionalProperty.isEnabled()) {
-			imageviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -369,9 +339,6 @@ public class ImageViewerSamplePropertiesEditionPartForm extends SectionPropertie
 		} else {
 			imageviewerROProperty.initViewer(key, ""); //$NON-NLS-1$
 		}
-		imageviewerROProperty.setEnabled(false);
-		imageviewerROProperty.setToolTipText(EefnrMessages.ImageViewerSample_ReadOnly);
-		
 	}
 
 	/**
@@ -386,9 +353,6 @@ public class ImageViewerSamplePropertiesEditionPartForm extends SectionPropertie
 		} else {
 			imageviewerROProperty.setSelection(new StructuredSelection("")); //$NON-NLS-1$
 		}
-		imageviewerROProperty.setEnabled(false);
-		imageviewerROProperty.setToolTipText(EefnrMessages.ImageViewerSample_ReadOnly);
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/MultiValuedEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/MultiValuedEditorSamplePropertiesEditionPartForm.java
index c3691d2eb..d0bdb8b6c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/MultiValuedEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/MultiValuedEditorSamplePropertiesEditionPartForm.java
@@ -241,13 +241,14 @@ public class MultiValuedEditorSamplePropertiesEditionPartForm extends SectionPro
 	 */
 	protected Composite createMultivaluededitorROPropertyMultiValuedEditor(FormToolkit widgetFactory, Composite parent) {
 		multivaluededitorROProperty = widgetFactory.createText(parent, "", SWT.READ_ONLY); //$NON-NLS-1$
+		multivaluededitorROProperty.setEnabled(false);
+		multivaluededitorROProperty.setToolTipText(EefnrMessages.MultiValuedEditorSample_ReadOnly);
 		GridData multivaluededitorROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		multivaluededitorROPropertyData.horizontalSpan = 2;
 		multivaluededitorROProperty.setLayoutData(multivaluededitorROPropertyData);
 		EditingUtils.setID(multivaluededitorROProperty, EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorROProperty);
 		EditingUtils.setEEFtype(multivaluededitorROProperty, "eef::MultiValuedEditor::field"); //$NON-NLS-1$
 		editMultivaluededitorROProperty = widgetFactory.createButton(parent, getDescription(EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorROProperty, EefnrMessages.MultiValuedEditorSamplePropertiesEditionPart_MultivaluededitorROPropertyLabel), SWT.NONE);
-		editMultivaluededitorROProperty.setEnabled(false);
 		GridData editMultivaluededitorROPropertyData = new GridData();
 		editMultivaluededitorROProperty.setLayoutData(editMultivaluededitorROPropertyData);
 		editMultivaluededitorROProperty.addSelectionListener(new SelectionAdapter() {
@@ -316,14 +317,6 @@ public class MultiValuedEditorSamplePropertiesEditionPartForm extends SectionPro
 		} else {
 			multivaluededitorRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorRequiredProperty);
-		if (readOnly && multivaluededitorRequiredProperty.isEnabled()) {
-			multivaluededitorRequiredProperty.setEnabled(false);
-			multivaluededitorRequiredProperty.setToolTipText(EefnrMessages.MultiValuedEditorSample_ReadOnly);
-		} else if (!readOnly && !multivaluededitorRequiredProperty.isEnabled()) {
-			multivaluededitorRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	public void addToMultivaluededitorRequiredProperty(Object newValue) {
@@ -367,14 +360,6 @@ public class MultiValuedEditorSamplePropertiesEditionPartForm extends SectionPro
 		} else {
 			multivaluededitorOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorOptionalProperty);
-		if (readOnly && multivaluededitorOptionalProperty.isEnabled()) {
-			multivaluededitorOptionalProperty.setEnabled(false);
-			multivaluededitorOptionalProperty.setToolTipText(EefnrMessages.MultiValuedEditorSample_ReadOnly);
-		} else if (!readOnly && !multivaluededitorOptionalProperty.isEnabled()) {
-			multivaluededitorOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	public void addToMultivaluededitorOptionalProperty(Object newValue) {
@@ -418,9 +403,6 @@ public class MultiValuedEditorSamplePropertiesEditionPartForm extends SectionPro
 		} else {
 			multivaluededitorROProperty.setText(""); //$NON-NLS-1$
 		}
-		multivaluededitorROProperty.setEnabled(false);
-		multivaluededitorROProperty.setToolTipText(EefnrMessages.MultiValuedEditorSample_ReadOnly);
-		
 	}
 
 	public void addToMultivaluededitorROProperty(Object newValue) {
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RadioSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RadioSamplePropertiesEditionPartForm.java
index 972489a65..57d09425a 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RadioSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RadioSamplePropertiesEditionPartForm.java
@@ -184,6 +184,8 @@ public class RadioSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 	 */
 	protected Composite createRadioROPropertyRadioViewer(Composite parent) {
 		radioROPropertyRadioViewer = new RadioViewer(parent, SWT.CHECK);
+		radioROPropertyRadioViewer.setEnabled(false);
+		radioROPropertyRadioViewer.setToolTipText(EefnrMessages.RadioSample_ReadOnly);
 		GridData radioROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		radioROPropertyData.horizontalSpan = 2;
 		radioROPropertyRadioViewer.setLayoutData(radioROPropertyData);
@@ -244,14 +246,6 @@ public class RadioSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 	 */
 	public void setRadioRequiredProperty(Object newValue) {
 		radioRequiredPropertyRadioViewer.setSelection(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.RadioSample.Properties.radioRequiredProperty);
-		if (readOnly && radioRequiredPropertyRadioViewer.isEnabled()) {
-			radioRequiredPropertyRadioViewer.setEnabled(false);
-			radioRequiredPropertyRadioViewer.setToolTipText(EefnrMessages.RadioSample_ReadOnly);
-		} else if (!readOnly && !radioRequiredPropertyRadioViewer.isEnabled()) {
-			radioRequiredPropertyRadioViewer.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -286,14 +280,6 @@ public class RadioSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 	 */
 	public void setRadioOptionalProperty(Object newValue) {
 		radioOptionalPropertyRadioViewer.setSelection(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.RadioSample.Properties.radioOptionalProperty);
-		if (readOnly && radioOptionalPropertyRadioViewer.isEnabled()) {
-			radioOptionalPropertyRadioViewer.setEnabled(false);
-			radioOptionalPropertyRadioViewer.setToolTipText(EefnrMessages.RadioSample_ReadOnly);
-		} else if (!readOnly && !radioOptionalPropertyRadioViewer.isEnabled()) {
-			radioOptionalPropertyRadioViewer.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -328,9 +314,6 @@ public class RadioSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 	 */
 	public void setRadioROProperty(Object newValue) {
 		radioROPropertyRadioViewer.setSelection(new StructuredSelection(newValue));
-		radioROPropertyRadioViewer.setEnabled(false);
-		radioROPropertyRadioViewer.setToolTipText(EefnrMessages.RadioSample_ReadOnly);
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ReferencesTableSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ReferencesTableSamplePropertiesEditionPartForm.java
index a8951dc56..cd3c129ad 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ReferencesTableSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ReferencesTableSamplePropertiesEditionPartForm.java
@@ -507,6 +507,8 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 	protected TableViewer createReferencestableROPropertyViewer(Composite container, FormToolkit widgetFactory, AdapterFactory adapter) {
 		org.eclipse.swt.widgets.Table table = widgetFactory.createTable(container, SWT.FULL_SELECTION);
 		table.setHeaderVisible(true);
+		table.setEnabled(false);
+		table.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
 		GridData gd = new GridData();
 		gd.grabExcessHorizontalSpace = true;
 		gd.horizontalAlignment = GridData.FILL;
@@ -569,6 +571,8 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 		layout.numColumns = 1;
 		result.setLayout(layout);
 		addReferencestableROProperty = widgetFactory.createButton(result, EefnrMessages.PropertiesEditionPart_AddListViewerLabel, SWT.NONE);
+		addReferencestableROProperty.setEnabled(false);
+		addReferencestableROProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
 		GridData addData = new GridData(GridData.FILL_HORIZONTAL);
 		addReferencestableROProperty.setLayoutData(addData);
 		addReferencestableROProperty.addSelectionListener(new SelectionAdapter() {
@@ -587,6 +591,8 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 		EditingUtils.setID(addReferencestableROProperty, EefnrViewsRepository.ReferencesTableSample.Properties.referencestableROProperty);
 		EditingUtils.setEEFtype(addReferencestableROProperty, "eef::ReferencesTable::addbutton"); //$NON-NLS-1$
 		removeReferencestableROProperty = widgetFactory.createButton(result, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, SWT.NONE);
+		removeReferencestableROProperty.setEnabled(false);
+		removeReferencestableROProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
 		GridData removeData = new GridData(GridData.FILL_HORIZONTAL);
 		removeReferencestableROProperty.setLayoutData(removeData);
 		removeReferencestableROProperty.addSelectionListener(new SelectionAdapter() {
@@ -664,20 +670,6 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		referencestableRequiredProperty.setContentProvider(contentProvider);
 		referencestableRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.ReferencesTableSample.Properties.referencestableRequiredProperty);
-		if (readOnly && referencestableRequiredProperty.getTable().isEnabled()) {
-			referencestableRequiredProperty.getTable().setEnabled(false);
-			referencestableRequiredProperty.getTable().setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-			addReferencestableRequiredProperty.setEnabled(false);
-			addReferencestableRequiredProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-			removeReferencestableRequiredProperty.setEnabled(false);
-			removeReferencestableRequiredProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !referencestableRequiredProperty.getTable().isEnabled()) {
-			referencestableRequiredProperty.getTable().setEnabled(true);
-			addReferencestableRequiredProperty.setEnabled(true);
-			removeReferencestableRequiredProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -733,20 +725,6 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		referencestableOptionalProperty.setContentProvider(contentProvider);
 		referencestableOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.ReferencesTableSample.Properties.referencestableOptionalProperty);
-		if (readOnly && referencestableOptionalProperty.getTable().isEnabled()) {
-			referencestableOptionalProperty.getTable().setEnabled(false);
-			referencestableOptionalProperty.getTable().setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-			addReferencestableOptionalProperty.setEnabled(false);
-			addReferencestableOptionalProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-			removeReferencestableOptionalProperty.setEnabled(false);
-			removeReferencestableOptionalProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !referencestableOptionalProperty.getTable().isEnabled()) {
-			referencestableOptionalProperty.getTable().setEnabled(true);
-			addReferencestableOptionalProperty.setEnabled(true);
-			removeReferencestableOptionalProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -802,13 +780,6 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		referencestableROProperty.setContentProvider(contentProvider);
 		referencestableROProperty.setInput(settings);
-		referencestableROProperty.getTable().setEnabled(false);
-		referencestableROProperty.getTable().setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-		addReferencestableROProperty.setEnabled(false);
-		addReferencestableROProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-		removeReferencestableROProperty.setEnabled(false);
-		removeReferencestableROProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java
index 002a21085..3f891f474 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java
@@ -210,14 +210,6 @@ public class RootPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		samples.setContentProvider(contentProvider);
 		samples.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.Root.Properties.samples);
-		if (readOnly && samples.isEnabled()) {
-			samples.setEnabled(false);
-			samples.setToolTipText(EefnrMessages.Root_ReadOnly);
-		} else if (!readOnly && !samples.isEnabled()) {
-			samples.setEnabled(true);
-		}	
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SamplePropertiesEditionPartForm.java
index d33ea1a8f..b8abe5370 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SamplePropertiesEditionPartForm.java
@@ -300,14 +300,6 @@ public class SamplePropertiesEditionPartForm extends SectionPropertiesEditingPar
 		} else {
 			textRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.Sample.Properties.textRequiredProperty);
-		if (readOnly && textRequiredProperty.isEnabled()) {
-			textRequiredProperty.setEnabled(false);
-			textRequiredProperty.setToolTipText(EefnrMessages.Sample_ReadOnly);
-		} else if (!readOnly && !textRequiredProperty.isEnabled()) {
-			textRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -332,14 +324,6 @@ public class SamplePropertiesEditionPartForm extends SectionPropertiesEditingPar
 		} else {
 			textOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.Sample.Properties.textOptionalProperty);
-		if (readOnly && textOptionalProperty.isEnabled()) {
-			textOptionalProperty.setEnabled(false);
-			textOptionalProperty.setToolTipText(EefnrMessages.Sample_ReadOnly);
-		} else if (!readOnly && !textOptionalProperty.isEnabled()) {
-			textOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SelectionDialogSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SelectionDialogSamplePropertiesEditionPartForm.java
index 96c1ff819..cbe97a969 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SelectionDialogSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SelectionDialogSamplePropertiesEditionPartForm.java
@@ -149,6 +149,7 @@ public class SelectionDialogSamplePropertiesEditionPartForm extends SectionPrope
 	protected Composite createSelectionDialogRequiredPropertySelectionDialog(FormToolkit widgetFactory, Composite parent) {
 		createDescription(parent, EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogRequiredProperty, EefnrMessages.SelectionDialogSamplePropertiesEditionPart_SelectionDialogRequiredPropertyLabel);
 		selectionDialogRequiredProperty = new SelectionDialog(parent, SWT.NONE, widgetFactory);
+
 		GridData generatorData = new GridData(GridData.FILL_HORIZONTAL);
 		selectionDialogRequiredProperty.setLayoutData(generatorData);
 
@@ -206,6 +207,7 @@ public class SelectionDialogSamplePropertiesEditionPartForm extends SectionPrope
 	protected Composite createSelectionDialogOptionalPropertySelectionDialog(FormToolkit widgetFactory, Composite parent) {
 		createDescription(parent, EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogOptionalProperty, EefnrMessages.SelectionDialogSamplePropertiesEditionPart_SelectionDialogOptionalPropertyLabel);
 		selectionDialogOptionalProperty = new SelectionDialog(parent, SWT.NONE, widgetFactory);
+
 		GridData generatorData = new GridData(GridData.FILL_HORIZONTAL);
 		selectionDialogOptionalProperty.setLayoutData(generatorData);
 
@@ -263,6 +265,7 @@ public class SelectionDialogSamplePropertiesEditionPartForm extends SectionPrope
 	protected Composite createSelectionDialogROPropertySelectionDialog(FormToolkit widgetFactory, Composite parent) {
 		createDescription(parent, EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogROProperty, EefnrMessages.SelectionDialogSamplePropertiesEditionPart_SelectionDialogROPropertyLabel);
 		selectionDialogROProperty = new SelectionDialog(parent, SWT.NONE, widgetFactory);
+
 		GridData generatorData = new GridData(GridData.FILL_HORIZONTAL);
 		selectionDialogROProperty.setLayoutData(generatorData);
 
@@ -351,14 +354,6 @@ public class SelectionDialogSamplePropertiesEditionPartForm extends SectionPrope
 		} else {
 			selectionDialogRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogRequiredProperty);
-		if (readOnly && selectionDialogRequiredProperty.isEnabled()) {
-			selectionDialogRequiredProperty.setEnabled(false);
-			selectionDialogRequiredProperty.setToolTipText(EefnrMessages.SelectionDialogSample_ReadOnly);
-		} else if (!readOnly && !selectionDialogRequiredProperty.isEnabled()) {
-			selectionDialogRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -383,14 +378,6 @@ public class SelectionDialogSamplePropertiesEditionPartForm extends SectionPrope
 		} else {
 			selectionDialogOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogOptionalProperty);
-		if (readOnly && selectionDialogOptionalProperty.isEnabled()) {
-			selectionDialogOptionalProperty.setEnabled(false);
-			selectionDialogOptionalProperty.setToolTipText(EefnrMessages.SelectionDialogSample_ReadOnly);
-		} else if (!readOnly && !selectionDialogOptionalProperty.isEnabled()) {
-			selectionDialogOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -415,9 +402,6 @@ public class SelectionDialogSamplePropertiesEditionPartForm extends SectionPrope
 		} else {
 			selectionDialogROProperty.setText(""); //$NON-NLS-1$
 		}
-		selectionDialogROProperty.setEnabled(false);
-		selectionDialogROProperty.setToolTipText(EefnrMessages.SelectionDialogSample_ReadOnly);
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SingleCompositionViewerSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SingleCompositionViewerSamplePropertiesEditionPartForm.java
index c7aac7611..2761788fa 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SingleCompositionViewerSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SingleCompositionViewerSamplePropertiesEditionPartForm.java
@@ -363,14 +363,6 @@ public class SingleCompositionViewerSamplePropertiesEditionPartForm extends Sect
 	 */
 	public void setSinglecompositionviewerSingleRequiredProperty(EObject newValue) {
 		singlecompositionviewerSingleRequiredProperty.update(newValue);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.SingleCompositionViewerSample.Properties.singlecompositionviewerSingleRequiredProperty);
-		if (readOnly && singlecompositionviewerSingleRequiredProperty.isEnabled()) {
-			singlecompositionviewerSingleRequiredProperty.setEnabled(false);
-			singlecompositionviewerSingleRequiredProperty.setToolTipText(EefnrMessages.SingleCompositionViewerSample_ReadOnly);
-		} else if (!readOnly && !singlecompositionviewerSingleRequiredProperty.isEnabled()) {
-			singlecompositionviewerSingleRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -415,14 +407,6 @@ public class SingleCompositionViewerSamplePropertiesEditionPartForm extends Sect
 	 */
 	public void setSinglecompositionviewerSingleOptionalProperty(EObject newValue) {
 		singlecompositionviewerSingleOptionalProperty.update(newValue);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.SingleCompositionViewerSample.Properties.singlecompositionviewerSingleOptionalProperty);
-		if (readOnly && singlecompositionviewerSingleOptionalProperty.isEnabled()) {
-			singlecompositionviewerSingleOptionalProperty.setEnabled(false);
-			singlecompositionviewerSingleOptionalProperty.setToolTipText(EefnrMessages.SingleCompositionViewerSample_ReadOnly);
-		} else if (!readOnly && !singlecompositionviewerSingleOptionalProperty.isEnabled()) {
-			singlecompositionviewerSingleOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -467,14 +451,6 @@ public class SingleCompositionViewerSamplePropertiesEditionPartForm extends Sect
 	 */
 	public void setSinglecompositionviewerMultiRequiredProperty(EObject newValue) {
 		singlecompositionviewerMultiRequiredProperty.update(newValue);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.SingleCompositionViewerSample.Properties.singlecompositionviewerMultiRequiredProperty);
-		if (readOnly && singlecompositionviewerMultiRequiredProperty.isEnabled()) {
-			singlecompositionviewerMultiRequiredProperty.setEnabled(false);
-			singlecompositionviewerMultiRequiredProperty.setToolTipText(EefnrMessages.SingleCompositionViewerSample_ReadOnly);
-		} else if (!readOnly && !singlecompositionviewerMultiRequiredProperty.isEnabled()) {
-			singlecompositionviewerMultiRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -519,14 +495,6 @@ public class SingleCompositionViewerSamplePropertiesEditionPartForm extends Sect
 	 */
 	public void setSinglecompositionviewerMultiOptionalProperty(EObject newValue) {
 		singlecompositionviewerMultiOptionalProperty.update(newValue);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.SingleCompositionViewerSample.Properties.singlecompositionviewerMultiOptionalProperty);
-		if (readOnly && singlecompositionviewerMultiOptionalProperty.isEnabled()) {
-			singlecompositionviewerMultiOptionalProperty.setEnabled(false);
-			singlecompositionviewerMultiOptionalProperty.setToolTipText(EefnrMessages.SingleCompositionViewerSample_ReadOnly);
-		} else if (!readOnly && !singlecompositionviewerMultiOptionalProperty.isEnabled()) {
-			singlecompositionviewerMultiOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -571,9 +539,6 @@ public class SingleCompositionViewerSamplePropertiesEditionPartForm extends Sect
 	 */
 	public void setSinglecompositionviewerSingleROProperty(EObject newValue) {
 		singlecompositionviewerSingleROProperty.update(newValue);
-		singlecompositionviewerSingleROProperty.setEnabled(false);
-		singlecompositionviewerSingleROProperty.setToolTipText(EefnrMessages.SingleCompositionViewerSample_ReadOnly);
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionEditorSamplePropertiesEditionPartForm.java
index e64879f56..c562b6e96 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionEditorSamplePropertiesEditionPartForm.java
@@ -67,21 +67,12 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 	protected TableViewer tablecompositionRequiredProperty;
 	protected List<ViewerFilter> tablecompositionRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> tablecompositionRequiredPropertyFilters = new ArrayList<ViewerFilter>();
-	protected Button addTablecompositionRequiredProperty;
-	protected Button removeTablecompositionRequiredProperty;
-	protected Button editTablecompositionRequiredProperty;
 	protected TableViewer tablecompositionOptionalProperty;
 	protected List<ViewerFilter> tablecompositionOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new ArrayList<ViewerFilter>();
-	protected Button addTablecompositionOptionalProperty;
-	protected Button removeTablecompositionOptionalProperty;
-	protected Button editTablecompositionOptionalProperty;
 	protected TableViewer tablecompositionROProperty;
 	protected List<ViewerFilter> tablecompositionROPropertyBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> tablecompositionROPropertyFilters = new ArrayList<ViewerFilter>();
-	protected Button addTablecompositionROProperty;
-	protected Button removeTablecompositionROProperty;
-	protected Button editTablecompositionROProperty;
 
 
 
@@ -269,7 +260,7 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		GridLayout tablecompositionRequiredPropertyPanelLayout = new GridLayout();
 		tablecompositionRequiredPropertyPanelLayout.numColumns = 1;
 		tablecompositionRequiredPropertyPanel.setLayout(tablecompositionRequiredPropertyPanelLayout);
-		addTablecompositionRequiredProperty = widgetFactory.createButton(tablecompositionRequiredPropertyPanel, EefnrMessages.PropertiesEditionPart_AddTableViewerLabel, SWT.NONE);
+		Button addTablecompositionRequiredProperty = widgetFactory.createButton(tablecompositionRequiredPropertyPanel, EefnrMessages.PropertiesEditionPart_AddTableViewerLabel, SWT.NONE);
 		GridData addTablecompositionRequiredPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		addTablecompositionRequiredProperty.setLayoutData(addTablecompositionRequiredPropertyData);
 		addTablecompositionRequiredProperty.addSelectionListener(new SelectionAdapter() {
@@ -287,7 +278,7 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		});
 		EditingUtils.setID(addTablecompositionRequiredProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(addTablecompositionRequiredProperty, "eef::TableComposition::addbutton"); //$NON-NLS-1$
-		removeTablecompositionRequiredProperty = widgetFactory.createButton(tablecompositionRequiredPropertyPanel, EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel, SWT.NONE);
+		Button removeTablecompositionRequiredProperty = widgetFactory.createButton(tablecompositionRequiredPropertyPanel, EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel, SWT.NONE);
 		GridData removeTablecompositionRequiredPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		removeTablecompositionRequiredProperty.setLayoutData(removeTablecompositionRequiredPropertyData);
 		removeTablecompositionRequiredProperty.addSelectionListener(new SelectionAdapter() {
@@ -312,7 +303,7 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		});
 		EditingUtils.setID(removeTablecompositionRequiredProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(removeTablecompositionRequiredProperty, "eef::TableComposition::removebutton"); //$NON-NLS-1$
-		editTablecompositionRequiredProperty = widgetFactory.createButton(tablecompositionRequiredPropertyPanel, EefnrMessages.PropertiesEditionPart_EditTableViewerLabel, SWT.NONE);
+		Button editTablecompositionRequiredProperty = widgetFactory.createButton(tablecompositionRequiredPropertyPanel, EefnrMessages.PropertiesEditionPart_EditTableViewerLabel, SWT.NONE);
 		GridData editTablecompositionRequiredPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		editTablecompositionRequiredProperty.setLayoutData(editTablecompositionRequiredPropertyData);
 		editTablecompositionRequiredProperty.addSelectionListener(new SelectionAdapter() {
@@ -438,7 +429,7 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		GridLayout tablecompositionOptionalPropertyPanelLayout = new GridLayout();
 		tablecompositionOptionalPropertyPanelLayout.numColumns = 1;
 		tablecompositionOptionalPropertyPanel.setLayout(tablecompositionOptionalPropertyPanelLayout);
-		addTablecompositionOptionalProperty = widgetFactory.createButton(tablecompositionOptionalPropertyPanel, EefnrMessages.PropertiesEditionPart_AddTableViewerLabel, SWT.NONE);
+		Button addTablecompositionOptionalProperty = widgetFactory.createButton(tablecompositionOptionalPropertyPanel, EefnrMessages.PropertiesEditionPart_AddTableViewerLabel, SWT.NONE);
 		GridData addTablecompositionOptionalPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		addTablecompositionOptionalProperty.setLayoutData(addTablecompositionOptionalPropertyData);
 		addTablecompositionOptionalProperty.addSelectionListener(new SelectionAdapter() {
@@ -456,7 +447,7 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		});
 		EditingUtils.setID(addTablecompositionOptionalProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(addTablecompositionOptionalProperty, "eef::TableComposition::addbutton"); //$NON-NLS-1$
-		removeTablecompositionOptionalProperty = widgetFactory.createButton(tablecompositionOptionalPropertyPanel, EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel, SWT.NONE);
+		Button removeTablecompositionOptionalProperty = widgetFactory.createButton(tablecompositionOptionalPropertyPanel, EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel, SWT.NONE);
 		GridData removeTablecompositionOptionalPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		removeTablecompositionOptionalProperty.setLayoutData(removeTablecompositionOptionalPropertyData);
 		removeTablecompositionOptionalProperty.addSelectionListener(new SelectionAdapter() {
@@ -481,7 +472,7 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		});
 		EditingUtils.setID(removeTablecompositionOptionalProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(removeTablecompositionOptionalProperty, "eef::TableComposition::removebutton"); //$NON-NLS-1$
-		editTablecompositionOptionalProperty = widgetFactory.createButton(tablecompositionOptionalPropertyPanel, EefnrMessages.PropertiesEditionPart_EditTableViewerLabel, SWT.NONE);
+		Button editTablecompositionOptionalProperty = widgetFactory.createButton(tablecompositionOptionalPropertyPanel, EefnrMessages.PropertiesEditionPart_EditTableViewerLabel, SWT.NONE);
 		GridData editTablecompositionOptionalPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		editTablecompositionOptionalProperty.setLayoutData(editTablecompositionOptionalPropertyData);
 		editTablecompositionOptionalProperty.addSelectionListener(new SelectionAdapter() {
@@ -522,6 +513,8 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		tableContainer.setLayout(tableContainerLayout);
 		org.eclipse.swt.widgets.Table tableTablecompositionROProperty = widgetFactory.createTable(tableContainer, SWT.FULL_SELECTION | SWT.BORDER);
 		tableTablecompositionROProperty.setHeaderVisible(true);
+		tableTablecompositionROProperty.setEnabled(false);
+		tableTablecompositionROProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
 		GridData gdTablecompositionROProperty = new GridData();
 		gdTablecompositionROProperty.grabExcessHorizontalSpace = true;
 		gdTablecompositionROProperty.horizontalAlignment = GridData.FILL;
@@ -606,7 +599,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		GridLayout tablecompositionROPropertyPanelLayout = new GridLayout();
 		tablecompositionROPropertyPanelLayout.numColumns = 1;
 		tablecompositionROPropertyPanel.setLayout(tablecompositionROPropertyPanelLayout);
-		addTablecompositionROProperty = widgetFactory.createButton(tablecompositionROPropertyPanel, EefnrMessages.PropertiesEditionPart_AddTableViewerLabel, SWT.NONE);
+		Button addTablecompositionROProperty = widgetFactory.createButton(tablecompositionROPropertyPanel, EefnrMessages.PropertiesEditionPart_AddTableViewerLabel, SWT.NONE);
+		addTablecompositionROProperty.setEnabled(false);
+		addTablecompositionROProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
 		GridData addTablecompositionROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		addTablecompositionROProperty.setLayoutData(addTablecompositionROPropertyData);
 		addTablecompositionROProperty.addSelectionListener(new SelectionAdapter() {
@@ -624,7 +619,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		});
 		EditingUtils.setID(addTablecompositionROProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionROProperty);
 		EditingUtils.setEEFtype(addTablecompositionROProperty, "eef::TableComposition::addbutton"); //$NON-NLS-1$
-		removeTablecompositionROProperty = widgetFactory.createButton(tablecompositionROPropertyPanel, EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel, SWT.NONE);
+		Button removeTablecompositionROProperty = widgetFactory.createButton(tablecompositionROPropertyPanel, EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel, SWT.NONE);
+		removeTablecompositionROProperty.setEnabled(false);
+		removeTablecompositionROProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
 		GridData removeTablecompositionROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		removeTablecompositionROProperty.setLayoutData(removeTablecompositionROPropertyData);
 		removeTablecompositionROProperty.addSelectionListener(new SelectionAdapter() {
@@ -649,7 +646,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		});
 		EditingUtils.setID(removeTablecompositionROProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionROProperty);
 		EditingUtils.setEEFtype(removeTablecompositionROProperty, "eef::TableComposition::removebutton"); //$NON-NLS-1$
-		editTablecompositionROProperty = widgetFactory.createButton(tablecompositionROPropertyPanel, EefnrMessages.PropertiesEditionPart_EditTableViewerLabel, SWT.NONE);
+		Button editTablecompositionROProperty = widgetFactory.createButton(tablecompositionROPropertyPanel, EefnrMessages.PropertiesEditionPart_EditTableViewerLabel, SWT.NONE);
+		editTablecompositionROProperty.setEnabled(false);
+		editTablecompositionROProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
 		GridData editTablecompositionROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		editTablecompositionROProperty.setLayoutData(editTablecompositionROPropertyData);
 		editTablecompositionROProperty.addSelectionListener(new SelectionAdapter() {
@@ -702,23 +701,6 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		tablecompositionRequiredProperty.setContentProvider(contentProvider);
 		tablecompositionRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty);
-		if (readOnly && tablecompositionRequiredProperty.getTable().isEnabled()) {
-			tablecompositionRequiredProperty.getTable().setEnabled(false);
-			tablecompositionRequiredProperty.getTable().setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-			addTablecompositionRequiredProperty.setEnabled(false);
-			addTablecompositionRequiredProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-			removeTablecompositionRequiredProperty.setEnabled(false);
-			removeTablecompositionRequiredProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-			editTablecompositionRequiredProperty.setEnabled(false);
-			editTablecompositionRequiredProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-		} else if (!readOnly && !tablecompositionRequiredProperty.getTable().isEnabled()) {
-			tablecompositionRequiredProperty.getTable().setEnabled(true);
-			addTablecompositionRequiredProperty.setEnabled(true);
-			removeTablecompositionRequiredProperty.setEnabled(true);
-			editTablecompositionRequiredProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -777,23 +759,6 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		tablecompositionOptionalProperty.setContentProvider(contentProvider);
 		tablecompositionOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionOptionalProperty);
-		if (readOnly && tablecompositionOptionalProperty.getTable().isEnabled()) {
-			tablecompositionOptionalProperty.getTable().setEnabled(false);
-			tablecompositionOptionalProperty.getTable().setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-			addTablecompositionOptionalProperty.setEnabled(false);
-			addTablecompositionOptionalProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-			removeTablecompositionOptionalProperty.setEnabled(false);
-			removeTablecompositionOptionalProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-			editTablecompositionOptionalProperty.setEnabled(false);
-			editTablecompositionOptionalProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-		} else if (!readOnly && !tablecompositionOptionalProperty.getTable().isEnabled()) {
-			tablecompositionOptionalProperty.getTable().setEnabled(true);
-			addTablecompositionOptionalProperty.setEnabled(true);
-			removeTablecompositionOptionalProperty.setEnabled(true);
-			editTablecompositionOptionalProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -852,15 +817,6 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		tablecompositionROProperty.setContentProvider(contentProvider);
 		tablecompositionROProperty.setInput(settings);
-		tablecompositionROProperty.getTable().setEnabled(false);
-		tablecompositionROProperty.getTable().setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-		addTablecompositionROProperty.setEnabled(false);
-		addTablecompositionROProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-		removeTablecompositionROProperty.setEnabled(false);
-		removeTablecompositionROProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-		editTablecompositionROProperty.setEnabled(false);
-		editTablecompositionROProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionExtensionEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionExtensionEditorSamplePropertiesEditionPartForm.java
index b586f7092..1f32c91f1 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionExtensionEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionExtensionEditorSamplePropertiesEditionPartForm.java
@@ -352,14 +352,6 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm exte
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(EefnrMessages.TableCompositionExtensionEditorSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
@@ -375,14 +367,6 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm exte
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		tablecompositionRequiredProperty.setContentProvider(contentProvider);
 		tablecompositionRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.tablecompositionRequiredProperty);
-		if (readOnly && tablecompositionRequiredProperty.isEnabled()) {
-			tablecompositionRequiredProperty.setEnabled(false);
-			tablecompositionRequiredProperty.setToolTipText(EefnrMessages.TableCompositionExtensionEditorSample_ReadOnly);
-		} else if (!readOnly && !tablecompositionRequiredProperty.isEnabled()) {
-			tablecompositionRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -441,14 +425,6 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm exte
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		tablecompositionOptionalProperty.setContentProvider(contentProvider);
 		tablecompositionOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.tablecompositionOptionalProperty);
-		if (readOnly && tablecompositionOptionalProperty.isEnabled()) {
-			tablecompositionOptionalProperty.setEnabled(false);
-			tablecompositionOptionalProperty.setToolTipText(EefnrMessages.TableCompositionExtensionEditorSample_ReadOnly);
-		} else if (!readOnly && !tablecompositionOptionalProperty.isEnabled()) {
-			tablecompositionOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleFirstTabPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleFirstTabPropertiesEditionPartForm.java
index bd1e59b51..afdfe496f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleFirstTabPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleFirstTabPropertiesEditionPartForm.java
@@ -300,14 +300,6 @@ public class TextSampleFirstTabPropertiesEditionPartForm extends SectionProperti
 		} else {
 			textRequiredPropertyInFirstTab.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextSampleFirstTab.Properties.textRequiredPropertyInFirstTab);
-		if (readOnly && textRequiredPropertyInFirstTab.isEnabled()) {
-			textRequiredPropertyInFirstTab.setEnabled(false);
-			textRequiredPropertyInFirstTab.setToolTipText(EefnrMessages.TextSampleFirstTab_ReadOnly);
-		} else if (!readOnly && !textRequiredPropertyInFirstTab.isEnabled()) {
-			textRequiredPropertyInFirstTab.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -332,14 +324,6 @@ public class TextSampleFirstTabPropertiesEditionPartForm extends SectionProperti
 		} else {
 			textOptionalPropertyInFirstTab.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextSampleFirstTab.Properties.textOptionalPropertyInFirstTab);
-		if (readOnly && textOptionalPropertyInFirstTab.isEnabled()) {
-			textOptionalPropertyInFirstTab.setEnabled(false);
-			textOptionalPropertyInFirstTab.setToolTipText(EefnrMessages.TextSampleFirstTab_ReadOnly);
-		} else if (!readOnly && !textOptionalPropertyInFirstTab.isEnabled()) {
-			textOptionalPropertyInFirstTab.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSamplePropertiesEditionPartForm.java
index c1cb24607..a3a77e7b1 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSamplePropertiesEditionPartForm.java
@@ -274,6 +274,8 @@ public class TextSamplePropertiesEditionPartForm extends SectionPropertiesEditin
 	protected Composite createTextROPropertyText(FormToolkit widgetFactory, Composite parent) {
 		createDescription(parent, EefnrViewsRepository.TextSample.Properties.textROProperty, EefnrMessages.TextSamplePropertiesEditionPart_TextROPropertyLabel);
 		textROProperty = widgetFactory.createText(parent, ""); //$NON-NLS-1$
+		textROProperty.setEnabled(false);
+		textROProperty.setToolTipText(EefnrMessages.TextSample_ReadOnly);
 		textROProperty.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
 		widgetFactory.paintBordersFor(parent);
 		GridData textROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
@@ -370,14 +372,6 @@ public class TextSamplePropertiesEditionPartForm extends SectionPropertiesEditin
 		} else {
 			textRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextSample.Properties.textRequiredProperty);
-		if (readOnly && textRequiredProperty.isEnabled()) {
-			textRequiredProperty.setEnabled(false);
-			textRequiredProperty.setToolTipText(EefnrMessages.TextSample_ReadOnly);
-		} else if (!readOnly && !textRequiredProperty.isEnabled()) {
-			textRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -402,14 +396,6 @@ public class TextSamplePropertiesEditionPartForm extends SectionPropertiesEditin
 		} else {
 			textOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextSample.Properties.textOptionalProperty);
-		if (readOnly && textOptionalProperty.isEnabled()) {
-			textOptionalProperty.setEnabled(false);
-			textOptionalProperty.setToolTipText(EefnrMessages.TextSample_ReadOnly);
-		} else if (!readOnly && !textOptionalProperty.isEnabled()) {
-			textOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -434,9 +420,6 @@ public class TextSamplePropertiesEditionPartForm extends SectionPropertiesEditin
 		} else {
 			textROProperty.setText(""); //$NON-NLS-1$
 		}
-		textROProperty.setEnabled(false);
-		textROProperty.setToolTipText(EefnrMessages.TextSample_ReadOnly);
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleSecondTabPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleSecondTabPropertiesEditionPartForm.java
index 817037f8e..bfb5e380a 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleSecondTabPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleSecondTabPropertiesEditionPartForm.java
@@ -300,14 +300,6 @@ public class TextSampleSecondTabPropertiesEditionPartForm extends SectionPropert
 		} else {
 			textRequiredPropertyInSecondTab.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextSampleSecondTab.Properties.textRequiredPropertyInSecondTab);
-		if (readOnly && textRequiredPropertyInSecondTab.isEnabled()) {
-			textRequiredPropertyInSecondTab.setEnabled(false);
-			textRequiredPropertyInSecondTab.setToolTipText(EefnrMessages.TextSampleSecondTab_ReadOnly);
-		} else if (!readOnly && !textRequiredPropertyInSecondTab.isEnabled()) {
-			textRequiredPropertyInSecondTab.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -332,14 +324,6 @@ public class TextSampleSecondTabPropertiesEditionPartForm extends SectionPropert
 		} else {
 			textOptionalPropertyInSecondTab.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextSampleSecondTab.Properties.textOptionalPropertyInSecondTab);
-		if (readOnly && textOptionalPropertyInSecondTab.isEnabled()) {
-			textOptionalPropertyInSecondTab.setEnabled(false);
-			textOptionalPropertyInSecondTab.setToolTipText(EefnrMessages.TextSampleSecondTab_ReadOnly);
-		} else if (!readOnly && !textOptionalPropertyInSecondTab.isEnabled()) {
-			textOptionalPropertyInSecondTab.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextareaSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextareaSamplePropertiesEditionPartForm.java
index f40363381..01190afaf 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextareaSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextareaSamplePropertiesEditionPartForm.java
@@ -258,6 +258,8 @@ public class TextareaSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		textareaROPropertyLabelData.horizontalSpan = 3;
 		textareaROPropertyLabel.setLayoutData(textareaROPropertyLabelData);
 		textareaROProperty = widgetFactory.createText(parent, "", SWT.BORDER | SWT.WRAP | SWT.MULTI | SWT.V_SCROLL); //$NON-NLS-1$
+		textareaROProperty.setEnabled(false);
+		textareaROProperty.setToolTipText(EefnrMessages.TextareaSample_ReadOnly);
 		GridData textareaROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		textareaROPropertyData.horizontalSpan = 2;
 		textareaROPropertyData.heightHint = 80;
@@ -342,15 +344,6 @@ public class TextareaSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		} else {
 			textareaRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextareaSample.Properties.textareaRequiredProperty);
-		if (readOnly && textareaRequiredProperty.isEnabled()) {
-			textareaRequiredProperty.setEnabled(false);
-			textareaRequiredProperty.setBackground(textareaRequiredProperty.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-			textareaRequiredProperty.setToolTipText(EefnrMessages.TextareaSample_ReadOnly);
-		} else if (!readOnly && !textareaRequiredProperty.isEnabled()) {
-			textareaRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -375,15 +368,6 @@ public class TextareaSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		} else {
 			textareaOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextareaSample.Properties.textareaOptionalProperty);
-		if (readOnly && textareaOptionalProperty.isEnabled()) {
-			textareaOptionalProperty.setEnabled(false);
-			textareaOptionalProperty.setBackground(textareaOptionalProperty.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-			textareaOptionalProperty.setToolTipText(EefnrMessages.TextareaSample_ReadOnly);
-		} else if (!readOnly && !textareaOptionalProperty.isEnabled()) {
-			textareaOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -408,10 +392,6 @@ public class TextareaSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		} else {
 			textareaROProperty.setText(""); //$NON-NLS-1$
 		}
-		textareaROProperty.setEnabled(false);
-		textareaROProperty.setBackground(textareaROProperty.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-		textareaROProperty.setToolTipText(EefnrMessages.TextareaSample_ReadOnly);
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TotalSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TotalSamplePropertiesEditionPartForm.java
index 47155f009..6f9303cee 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TotalSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TotalSamplePropertiesEditionPartForm.java
@@ -126,15 +126,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 	protected TableViewer tablecompositionRequiredProperty;
 	protected List<ViewerFilter> tablecompositionRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> tablecompositionRequiredPropertyFilters = new ArrayList<ViewerFilter>();
-	protected Button addTablecompositionRequiredProperty;
-	protected Button removeTablecompositionRequiredProperty;
-	protected Button editTablecompositionRequiredProperty;
 	protected TableViewer tablecompositionOptionalProperty;
 	protected List<ViewerFilter> tablecompositionOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new ArrayList<ViewerFilter>();
-	protected Button addTablecompositionOptionalProperty;
-	protected Button removeTablecompositionOptionalProperty;
-	protected Button editTablecompositionOptionalProperty;
 	protected ReferencesTable advancedreferencestableRequiredProperty;
 	protected List<ViewerFilter> advancedreferencestableRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> advancedreferencestableRequiredPropertyFilters = new ArrayList<ViewerFilter>();
@@ -1161,7 +1155,7 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		GridLayout tablecompositionRequiredPropertyPanelLayout = new GridLayout();
 		tablecompositionRequiredPropertyPanelLayout.numColumns = 1;
 		tablecompositionRequiredPropertyPanel.setLayout(tablecompositionRequiredPropertyPanelLayout);
-		addTablecompositionRequiredProperty = widgetFactory.createButton(tablecompositionRequiredPropertyPanel, EefnrMessages.PropertiesEditionPart_AddTableViewerLabel, SWT.NONE);
+		Button addTablecompositionRequiredProperty = widgetFactory.createButton(tablecompositionRequiredPropertyPanel, EefnrMessages.PropertiesEditionPart_AddTableViewerLabel, SWT.NONE);
 		GridData addTablecompositionRequiredPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		addTablecompositionRequiredProperty.setLayoutData(addTablecompositionRequiredPropertyData);
 		addTablecompositionRequiredProperty.addSelectionListener(new SelectionAdapter() {
@@ -1179,7 +1173,7 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		});
 		EditingUtils.setID(addTablecompositionRequiredProperty, EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(addTablecompositionRequiredProperty, "eef::TableComposition::addbutton"); //$NON-NLS-1$
-		removeTablecompositionRequiredProperty = widgetFactory.createButton(tablecompositionRequiredPropertyPanel, EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel, SWT.NONE);
+		Button removeTablecompositionRequiredProperty = widgetFactory.createButton(tablecompositionRequiredPropertyPanel, EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel, SWT.NONE);
 		GridData removeTablecompositionRequiredPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		removeTablecompositionRequiredProperty.setLayoutData(removeTablecompositionRequiredPropertyData);
 		removeTablecompositionRequiredProperty.addSelectionListener(new SelectionAdapter() {
@@ -1204,7 +1198,7 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		});
 		EditingUtils.setID(removeTablecompositionRequiredProperty, EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(removeTablecompositionRequiredProperty, "eef::TableComposition::removebutton"); //$NON-NLS-1$
-		editTablecompositionRequiredProperty = widgetFactory.createButton(tablecompositionRequiredPropertyPanel, EefnrMessages.PropertiesEditionPart_EditTableViewerLabel, SWT.NONE);
+		Button editTablecompositionRequiredProperty = widgetFactory.createButton(tablecompositionRequiredPropertyPanel, EefnrMessages.PropertiesEditionPart_EditTableViewerLabel, SWT.NONE);
 		GridData editTablecompositionRequiredPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		editTablecompositionRequiredProperty.setLayoutData(editTablecompositionRequiredPropertyData);
 		editTablecompositionRequiredProperty.addSelectionListener(new SelectionAdapter() {
@@ -1330,7 +1324,7 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		GridLayout tablecompositionOptionalPropertyPanelLayout = new GridLayout();
 		tablecompositionOptionalPropertyPanelLayout.numColumns = 1;
 		tablecompositionOptionalPropertyPanel.setLayout(tablecompositionOptionalPropertyPanelLayout);
-		addTablecompositionOptionalProperty = widgetFactory.createButton(tablecompositionOptionalPropertyPanel, EefnrMessages.PropertiesEditionPart_AddTableViewerLabel, SWT.NONE);
+		Button addTablecompositionOptionalProperty = widgetFactory.createButton(tablecompositionOptionalPropertyPanel, EefnrMessages.PropertiesEditionPart_AddTableViewerLabel, SWT.NONE);
 		GridData addTablecompositionOptionalPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		addTablecompositionOptionalProperty.setLayoutData(addTablecompositionOptionalPropertyData);
 		addTablecompositionOptionalProperty.addSelectionListener(new SelectionAdapter() {
@@ -1348,7 +1342,7 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		});
 		EditingUtils.setID(addTablecompositionOptionalProperty, EefnrViewsRepository.TotalSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(addTablecompositionOptionalProperty, "eef::TableComposition::addbutton"); //$NON-NLS-1$
-		removeTablecompositionOptionalProperty = widgetFactory.createButton(tablecompositionOptionalPropertyPanel, EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel, SWT.NONE);
+		Button removeTablecompositionOptionalProperty = widgetFactory.createButton(tablecompositionOptionalPropertyPanel, EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel, SWT.NONE);
 		GridData removeTablecompositionOptionalPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		removeTablecompositionOptionalProperty.setLayoutData(removeTablecompositionOptionalPropertyData);
 		removeTablecompositionOptionalProperty.addSelectionListener(new SelectionAdapter() {
@@ -1373,7 +1367,7 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		});
 		EditingUtils.setID(removeTablecompositionOptionalProperty, EefnrViewsRepository.TotalSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(removeTablecompositionOptionalProperty, "eef::TableComposition::removebutton"); //$NON-NLS-1$
-		editTablecompositionOptionalProperty = widgetFactory.createButton(tablecompositionOptionalPropertyPanel, EefnrMessages.PropertiesEditionPart_EditTableViewerLabel, SWT.NONE);
+		Button editTablecompositionOptionalProperty = widgetFactory.createButton(tablecompositionOptionalPropertyPanel, EefnrMessages.PropertiesEditionPart_EditTableViewerLabel, SWT.NONE);
 		GridData editTablecompositionOptionalPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		editTablecompositionOptionalProperty.setLayoutData(editTablecompositionOptionalPropertyData);
 		editTablecompositionOptionalProperty.addSelectionListener(new SelectionAdapter() {
@@ -1818,14 +1812,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		} else {
 			textRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.textRequiredProperty);
-		if (readOnly && textRequiredProperty.isEnabled()) {
-			textRequiredProperty.setEnabled(false);
-			textRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !textRequiredProperty.isEnabled()) {
-			textRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1850,14 +1836,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		} else {
 			textOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.textOptionalProperty);
-		if (readOnly && textOptionalProperty.isEnabled()) {
-			textOptionalProperty.setEnabled(false);
-			textOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !textOptionalProperty.isEnabled()) {
-			textOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1882,14 +1860,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		} else {
 			checkboxRequiredProperty.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.checkboxRequiredProperty);
-		if (readOnly && checkboxRequiredProperty.isEnabled()) {
-			checkboxRequiredProperty.setEnabled(false);
-			checkboxRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !checkboxRequiredProperty.isEnabled()) {
-			checkboxRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1914,14 +1884,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		} else {
 			checkboxOptionalProperty.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.checkboxOptionalProperty);
-		if (readOnly && checkboxOptionalProperty.isEnabled()) {
-			checkboxOptionalProperty.setEnabled(false);
-			checkboxOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !checkboxOptionalProperty.isEnabled()) {
-			checkboxOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1946,14 +1908,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		} else {
 			textareaRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.textareaRequiredProperty);
-		if (readOnly && textareaRequiredProperty.isEnabled()) {
-			textareaRequiredProperty.setEnabled(false);
-			textareaRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !textareaRequiredProperty.isEnabled()) {
-			textareaRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1978,14 +1932,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		} else {
 			textareaOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.textareaOptionalProperty);
-		if (readOnly && textareaOptionalProperty.isEnabled()) {
-			textareaOptionalProperty.setEnabled(false);
-			textareaOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !textareaOptionalProperty.isEnabled()) {
-			textareaOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2007,14 +1953,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 	public void initRadioRequiredProperty(Object input, Enumerator current) {
 		radioRequiredProperty.setInput(input);
 		radioRequiredProperty.modelUpdating(new StructuredSelection(current));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.radioRequiredProperty);
-		if (readOnly && radioRequiredProperty.isEnabled()) {
-			radioRequiredProperty.setEnabled(false);
-			radioRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !radioRequiredProperty.isEnabled()) {
-			radioRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2025,14 +1963,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 	 */
 	public void setRadioRequiredProperty(Enumerator newValue) {
 		radioRequiredProperty.modelUpdating(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.radioRequiredProperty);
-		if (readOnly && radioRequiredProperty.isEnabled()) {
-			radioRequiredProperty.setEnabled(false);
-			radioRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !radioRequiredProperty.isEnabled()) {
-			radioRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2054,14 +1984,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 	public void initRadioOptionalProperty(Object input, Enumerator current) {
 		radioOptionalProperty.setInput(input);
 		radioOptionalProperty.modelUpdating(new StructuredSelection(current));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.radioOptionalProperty);
-		if (readOnly && radioOptionalProperty.isEnabled()) {
-			radioOptionalProperty.setEnabled(false);
-			radioOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !radioOptionalProperty.isEnabled()) {
-			radioOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2072,14 +1994,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 	 */
 	public void setRadioOptionalProperty(Enumerator newValue) {
 		radioOptionalProperty.modelUpdating(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.radioOptionalProperty);
-		if (readOnly && radioOptionalProperty.isEnabled()) {
-			radioOptionalProperty.setEnabled(false);
-			radioOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !radioOptionalProperty.isEnabled()) {
-			radioOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2107,14 +2021,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		if (current != null) {
 			eobjectflatcomboviewerRequiredProperty.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerRequiredProperty);
-		if (readOnly && eobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			eobjectflatcomboviewerRequiredProperty.setEnabled(false);
-			eobjectflatcomboviewerRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			eobjectflatcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2129,14 +2035,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		} else {
 			eobjectflatcomboviewerRequiredProperty.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerRequiredProperty);
-		if (readOnly && eobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			eobjectflatcomboviewerRequiredProperty.setEnabled(false);
-			eobjectflatcomboviewerRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			eobjectflatcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2193,14 +2091,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		if (current != null) {
 			eobjectflatcomboviewerOptionalProperty.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerOptionalProperty);
-		if (readOnly && eobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			eobjectflatcomboviewerOptionalProperty.setEnabled(false);
-			eobjectflatcomboviewerOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			eobjectflatcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2215,14 +2105,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		} else {
 			eobjectflatcomboviewerOptionalProperty.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerOptionalProperty);
-		if (readOnly && eobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			eobjectflatcomboviewerOptionalProperty.setEnabled(false);
-			eobjectflatcomboviewerOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			eobjectflatcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2267,14 +2149,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		referencestableRequiredProperty.setContentProvider(contentProvider);
 		referencestableRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.referencestableRequiredProperty);
-		if (readOnly && referencestableRequiredProperty.getTable().isEnabled()) {
-			referencestableRequiredProperty.setEnabled(false);
-			referencestableRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !referencestableRequiredProperty.getTable().isEnabled()) {
-			referencestableRequiredProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2330,14 +2204,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		referencestableOptionalProperty.setContentProvider(contentProvider);
 		referencestableOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.referencestableOptionalProperty);
-		if (readOnly && referencestableOptionalProperty.getTable().isEnabled()) {
-			referencestableOptionalProperty.setEnabled(false);
-			referencestableOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !referencestableOptionalProperty.getTable().isEnabled()) {
-			referencestableOptionalProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2399,14 +2265,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 	public void initEmfcomboviewerRequiredProperty(Object input, Enumerator current) {
 		emfcomboviewerRequiredProperty.setInput(input);
 		emfcomboviewerRequiredProperty.modelUpdating(new StructuredSelection(current));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerRequiredProperty);
-		if (readOnly && emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(false);
-			emfcomboviewerRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2417,14 +2275,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 	 */
 	public void setEmfcomboviewerRequiredProperty(Enumerator newValue) {
 		emfcomboviewerRequiredProperty.modelUpdating(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerRequiredProperty);
-		if (readOnly && emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(false);
-			emfcomboviewerRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2446,14 +2296,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 	public void initEmfcomboviewerOptionalProperty(Object input, Enumerator current) {
 		emfcomboviewerOptionalProperty.setInput(input);
 		emfcomboviewerOptionalProperty.modelUpdating(new StructuredSelection(current));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerOptionalProperty);
-		if (readOnly && emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(false);
-			emfcomboviewerOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2464,14 +2306,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 	 */
 	public void setEmfcomboviewerOptionalProperty(Enumerator newValue) {
 		emfcomboviewerOptionalProperty.modelUpdating(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerOptionalProperty);
-		if (readOnly && emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(false);
-			emfcomboviewerOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2497,14 +2331,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		} else {
 			multivaluededitorRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.multivaluededitorRequiredProperty);
-		if (readOnly && multivaluededitorRequiredProperty.isEnabled()) {
-			multivaluededitorRequiredProperty.setEnabled(false);
-			multivaluededitorRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !multivaluededitorRequiredProperty.isEnabled()) {
-			multivaluededitorRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	public void addToMultivaluededitorRequiredProperty(Object newValue) {
@@ -2548,14 +2374,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		} else {
 			multivaluededitorOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.multivaluededitorOptionalProperty);
-		if (readOnly && multivaluededitorOptionalProperty.isEnabled()) {
-			multivaluededitorOptionalProperty.setEnabled(false);
-			multivaluededitorOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !multivaluededitorOptionalProperty.isEnabled()) {
-			multivaluededitorOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	public void addToMultivaluededitorOptionalProperty(Object newValue) {
@@ -2589,23 +2407,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		tablecompositionRequiredProperty.setContentProvider(contentProvider);
 		tablecompositionRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty);
-		if (readOnly && tablecompositionRequiredProperty.getTable().isEnabled()) {
-			tablecompositionRequiredProperty.getTable().setEnabled(false);
-			tablecompositionRequiredProperty.getTable().setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-			addTablecompositionRequiredProperty.setEnabled(false);
-			addTablecompositionRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-			removeTablecompositionRequiredProperty.setEnabled(false);
-			removeTablecompositionRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-			editTablecompositionRequiredProperty.setEnabled(false);
-			editTablecompositionRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !tablecompositionRequiredProperty.getTable().isEnabled()) {
-			tablecompositionRequiredProperty.getTable().setEnabled(true);
-			addTablecompositionRequiredProperty.setEnabled(true);
-			removeTablecompositionRequiredProperty.setEnabled(true);
-			editTablecompositionRequiredProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2664,23 +2465,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		tablecompositionOptionalProperty.setContentProvider(contentProvider);
 		tablecompositionOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.tablecompositionOptionalProperty);
-		if (readOnly && tablecompositionOptionalProperty.getTable().isEnabled()) {
-			tablecompositionOptionalProperty.getTable().setEnabled(false);
-			tablecompositionOptionalProperty.getTable().setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-			addTablecompositionOptionalProperty.setEnabled(false);
-			addTablecompositionOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-			removeTablecompositionOptionalProperty.setEnabled(false);
-			removeTablecompositionOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-			editTablecompositionOptionalProperty.setEnabled(false);
-			editTablecompositionOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !tablecompositionOptionalProperty.getTable().isEnabled()) {
-			tablecompositionOptionalProperty.getTable().setEnabled(true);
-			addTablecompositionOptionalProperty.setEnabled(true);
-			removeTablecompositionOptionalProperty.setEnabled(true);
-			editTablecompositionOptionalProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2739,14 +2523,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedreferencestableRequiredProperty.setContentProvider(contentProvider);
 		advancedreferencestableRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedreferencestableRequiredProperty);
-		if (readOnly && advancedreferencestableRequiredProperty.getTable().isEnabled()) {
-			advancedreferencestableRequiredProperty.setEnabled(false);
-			advancedreferencestableRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedreferencestableRequiredProperty.getTable().isEnabled()) {
-			advancedreferencestableRequiredProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2802,14 +2578,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedreferencestableOptionalProperty.setContentProvider(contentProvider);
 		advancedreferencestableOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedreferencestableOptionalProperty);
-		if (readOnly && advancedreferencestableOptionalProperty.getTable().isEnabled()) {
-			advancedreferencestableOptionalProperty.setEnabled(false);
-			advancedreferencestableOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedreferencestableOptionalProperty.getTable().isEnabled()) {
-			advancedreferencestableOptionalProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2877,14 +2645,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		if (current != null) {
 			advancedeobjectflatcomboviewerRequiredPropery.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerRequiredPropery);
-		if (readOnly && advancedeobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredPropery.setEnabled(false);
-			advancedeobjectflatcomboviewerRequiredPropery.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2899,14 +2659,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		} else {
 			advancedeobjectflatcomboviewerRequiredPropery.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerRequiredPropery);
-		if (readOnly && advancedeobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredPropery.setEnabled(false);
-			advancedeobjectflatcomboviewerRequiredPropery.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2963,14 +2715,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		if (current != null) {
 			advancedeobjectflatcomboviewerOptionalPropery.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerOptionalPropery);
-		if (readOnly && advancedeobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalPropery.setEnabled(false);
-			advancedeobjectflatcomboviewerOptionalPropery.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2985,14 +2729,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		} else {
 			advancedeobjectflatcomboviewerOptionalPropery.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerOptionalPropery);
-		if (readOnly && advancedeobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalPropery.setEnabled(false);
-			advancedeobjectflatcomboviewerOptionalPropery.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -3037,14 +2773,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedtablecompositionRequiredProperty.setContentProvider(contentProvider);
 		advancedtablecompositionRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionRequiredProperty);
-		if (readOnly && advancedtablecompositionRequiredProperty.isEnabled()) {
-			advancedtablecompositionRequiredProperty.setEnabled(false);
-			advancedtablecompositionRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedtablecompositionRequiredProperty.isEnabled()) {
-			advancedtablecompositionRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -3103,14 +2831,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedtablecompositionOptionalProperty.setContentProvider(contentProvider);
 		advancedtablecompositionOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionOptionalProperty);
-		if (readOnly && advancedtablecompositionOptionalProperty.isEnabled()) {
-			advancedtablecompositionOptionalProperty.setEnabled(false);
-			advancedtablecompositionOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedtablecompositionOptionalProperty.isEnabled()) {
-			advancedtablecompositionOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -3178,14 +2898,6 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl.java
index da44fb8b3..0ed3f2c6a 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl.java
@@ -52,6 +52,10 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 	protected ViewerFilter advancedeobjectflatcomboviewerOptionalPropertyFilter;
 	private AdvancedEObjectFlatComboViewer advancedeobjectflatcomboviewerROProperty;
 	protected ViewerFilter advancedeobjectflatcomboviewerROPropertyFilter;
+	private AdvancedEObjectFlatComboViewer advancedeobjectflatcomboviewerCompoRequiredProperty;
+	protected ViewerFilter advancedeobjectflatcomboviewerCompoRequiredPropertyFilter;
+	private AdvancedEObjectFlatComboViewer advancedeobjectflatcomboviewerCompoOptionalProperty;
+	protected ViewerFilter advancedeobjectflatcomboviewerCompoOptionalPropertyFilter;
 
 
 
@@ -93,6 +97,8 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		propertiesStep.addStep(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty);
 		propertiesStep.addStep(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerOptionalProperty);
 		propertiesStep.addStep(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerROProperty);
+		propertiesStep.addStep(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty);
+		propertiesStep.addStep(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty);
 		
 		
 		composer = new PartComposer(advancedEObjectFlatComboViewerSampleStep) {
@@ -111,6 +117,12 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 				if (key == EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerROProperty) {
 					return createAdvancedeobjectflatcomboviewerROPropertyAdvancedFlatComboViewer(parent);
 				}
+				if (key == EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty) {
+					return createAdvancedeobjectflatcomboviewerCompoRequiredPropertyAdvancedFlatComboViewer(parent);
+				}
+				if (key == EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty) {
+					return createAdvancedeobjectflatcomboviewerCompoOptionalPropertyAdvancedFlatComboViewer(parent);
+				}
 				return parent;
 			}
 		};
@@ -209,6 +221,8 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		//create widget
 		advancedeobjectflatcomboviewerROProperty = new AdvancedEObjectFlatComboViewer(getDescription(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerROProperty, EefnrMessages.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerROPropertyLabel), resourceSet, advancedeobjectflatcomboviewerROPropertyFilter, propertiesEditionComponent.getEditingContext().getAdapterFactory(), listener);
 		advancedeobjectflatcomboviewerROProperty.createControls(parent);
+		advancedeobjectflatcomboviewerROProperty.setEnabled(false);
+		advancedeobjectflatcomboviewerROProperty.setToolTipText(EefnrMessages.AdvancedEObjectFlatComboViewerSample_ReadOnly);
 		GridData advancedeobjectflatcomboviewerROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		advancedeobjectflatcomboviewerROProperty.setLayoutData(advancedeobjectflatcomboviewerROPropertyData);
 		advancedeobjectflatcomboviewerROProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerROProperty);
@@ -216,6 +230,62 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		return parent;
 	}
 
+	/**
+	 * @param parent the parent composite
+	 * 
+	 */
+	protected Composite createAdvancedeobjectflatcomboviewerCompoRequiredPropertyAdvancedFlatComboViewer(Composite parent) {
+		createDescription(parent, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty, EefnrMessages.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerCompoRequiredPropertyLabel);
+		// create callback listener
+		EObjectFlatComboViewerListener listener = new EObjectFlatComboViewerListener(){
+			public void handleSet(EObject element){
+				propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, element)); 
+			}
+			public void navigateTo(EObject element){ }
+
+			public EObject handleCreate() {
+				propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.ADD, null, null)); 
+				return null;
+			}
+		};
+		//create widget
+		advancedeobjectflatcomboviewerCompoRequiredProperty = new AdvancedEObjectFlatComboViewer(getDescription(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty, EefnrMessages.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerCompoRequiredPropertyLabel), resourceSet, advancedeobjectflatcomboviewerCompoRequiredPropertyFilter, propertiesEditionComponent.getEditingContext().getAdapterFactory(), listener);
+		advancedeobjectflatcomboviewerCompoRequiredProperty.createControls(parent);
+		GridData advancedeobjectflatcomboviewerCompoRequiredPropertyData = new GridData(GridData.FILL_HORIZONTAL);
+		advancedeobjectflatcomboviewerCompoRequiredProperty.setLayoutData(advancedeobjectflatcomboviewerCompoRequiredPropertyData);
+		advancedeobjectflatcomboviewerCompoRequiredProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty);
+		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		return parent;
+	}
+
+	/**
+	 * @param parent the parent composite
+	 * 
+	 */
+	protected Composite createAdvancedeobjectflatcomboviewerCompoOptionalPropertyAdvancedFlatComboViewer(Composite parent) {
+		createDescription(parent, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty, EefnrMessages.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerCompoOptionalPropertyLabel);
+		// create callback listener
+		EObjectFlatComboViewerListener listener = new EObjectFlatComboViewerListener(){
+			public void handleSet(EObject element){
+				propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, element)); 
+			}
+			public void navigateTo(EObject element){ }
+
+			public EObject handleCreate() {
+				propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.ADD, null, null)); 
+				return null;
+			}
+		};
+		//create widget
+		advancedeobjectflatcomboviewerCompoOptionalProperty = new AdvancedEObjectFlatComboViewer(getDescription(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty, EefnrMessages.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerCompoOptionalPropertyLabel), resourceSet, advancedeobjectflatcomboviewerCompoOptionalPropertyFilter, propertiesEditionComponent.getEditingContext().getAdapterFactory(), listener);
+		advancedeobjectflatcomboviewerCompoOptionalProperty.createControls(parent);
+		GridData advancedeobjectflatcomboviewerCompoOptionalPropertyData = new GridData(GridData.FILL_HORIZONTAL);
+		advancedeobjectflatcomboviewerCompoOptionalProperty.setLayoutData(advancedeobjectflatcomboviewerCompoOptionalPropertyData);
+		advancedeobjectflatcomboviewerCompoOptionalProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty);
+		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		return parent;
+	}
+
 
 	/**
 	 * {@inheritDoc}
@@ -249,14 +319,6 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		if (current != null) {
 			advancedeobjectflatcomboviewerRequiredProperty.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty);
-		if (readOnly && advancedeobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredProperty.setEnabled(false);
-			advancedeobjectflatcomboviewerRequiredProperty.setToolTipText(EefnrMessages.AdvancedEObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -271,14 +333,6 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		} else {
 			advancedeobjectflatcomboviewerRequiredProperty.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty);
-		if (readOnly && advancedeobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredProperty.setEnabled(false);
-			advancedeobjectflatcomboviewerRequiredProperty.setToolTipText(EefnrMessages.AdvancedEObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -330,14 +384,6 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		if (current != null) {
 			advancedeobjectflatcomboviewerOptionalProperty.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerOptionalProperty);
-		if (readOnly && advancedeobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalProperty.setEnabled(false);
-			advancedeobjectflatcomboviewerOptionalProperty.setToolTipText(EefnrMessages.AdvancedEObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -352,14 +398,6 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		} else {
 			advancedeobjectflatcomboviewerOptionalProperty.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerOptionalProperty);
-		if (readOnly && advancedeobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalProperty.setEnabled(false);
-			advancedeobjectflatcomboviewerOptionalProperty.setToolTipText(EefnrMessages.AdvancedEObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -411,9 +449,6 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		if (current != null) {
 			advancedeobjectflatcomboviewerROProperty.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		advancedeobjectflatcomboviewerROProperty.setEnabled(false);
-		advancedeobjectflatcomboviewerROProperty.setToolTipText(EefnrMessages.AdvancedEObjectFlatComboViewerSample_ReadOnly);
-		
 	}
 
 	/**
@@ -428,9 +463,6 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		} else {
 			advancedeobjectflatcomboviewerROProperty.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		advancedeobjectflatcomboviewerROProperty.setEnabled(false);
-		advancedeobjectflatcomboviewerROProperty.setToolTipText(EefnrMessages.AdvancedEObjectFlatComboViewerSample_ReadOnly);
-		
 	}
 
 	/**
@@ -462,6 +494,136 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		advancedeobjectflatcomboviewerROProperty.addBusinessRuleFilter(filter);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#getAdvancedeobjectflatcomboviewerCompoRequiredProperty()
+	 * 
+	 */
+	public EObject getAdvancedeobjectflatcomboviewerCompoRequiredProperty() {
+		return advancedeobjectflatcomboviewerCompoRequiredProperty.getSelection();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#initAdvancedeobjectflatcomboviewerCompoRequiredProperty(EObjectFlatComboSettings)
+	 */
+	public void initAdvancedeobjectflatcomboviewerCompoRequiredProperty(EObjectFlatComboSettings settings) {
+		advancedeobjectflatcomboviewerCompoRequiredProperty.setInput(settings);
+		if (current != null) {
+			advancedeobjectflatcomboviewerCompoRequiredProperty.setSelection(new StructuredSelection(settings.getValue()));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#setAdvancedeobjectflatcomboviewerCompoRequiredProperty(EObject newValue)
+	 * 
+	 */
+	public void setAdvancedeobjectflatcomboviewerCompoRequiredProperty(EObject newValue) {
+		if (newValue != null) {
+			advancedeobjectflatcomboviewerCompoRequiredProperty.setSelection(new StructuredSelection(newValue));
+		} else {
+			advancedeobjectflatcomboviewerCompoRequiredProperty.setSelection(new StructuredSelection()); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#setAdvancedeobjectflatcomboviewerCompoRequiredPropertyButtonMode(ButtonsModeEnum newValue)
+	 */
+	public void setAdvancedeobjectflatcomboviewerCompoRequiredPropertyButtonMode(ButtonsModeEnum newValue) {
+		advancedeobjectflatcomboviewerCompoRequiredProperty.setButtonMode(newValue);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#addFilterAdvancedeobjectflatcomboviewerCompoRequiredProperty(ViewerFilter filter)
+	 * 
+	 */
+	public void addFilterToAdvancedeobjectflatcomboviewerCompoRequiredProperty(ViewerFilter filter) {
+		advancedeobjectflatcomboviewerCompoRequiredProperty.addFilter(filter);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#addBusinessFilterAdvancedeobjectflatcomboviewerCompoRequiredProperty(ViewerFilter filter)
+	 * 
+	 */
+	public void addBusinessFilterToAdvancedeobjectflatcomboviewerCompoRequiredProperty(ViewerFilter filter) {
+		advancedeobjectflatcomboviewerCompoRequiredProperty.addBusinessRuleFilter(filter);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#getAdvancedeobjectflatcomboviewerCompoOptionalProperty()
+	 * 
+	 */
+	public EObject getAdvancedeobjectflatcomboviewerCompoOptionalProperty() {
+		return advancedeobjectflatcomboviewerCompoOptionalProperty.getSelection();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#initAdvancedeobjectflatcomboviewerCompoOptionalProperty(EObjectFlatComboSettings)
+	 */
+	public void initAdvancedeobjectflatcomboviewerCompoOptionalProperty(EObjectFlatComboSettings settings) {
+		advancedeobjectflatcomboviewerCompoOptionalProperty.setInput(settings);
+		if (current != null) {
+			advancedeobjectflatcomboviewerCompoOptionalProperty.setSelection(new StructuredSelection(settings.getValue()));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#setAdvancedeobjectflatcomboviewerCompoOptionalProperty(EObject newValue)
+	 * 
+	 */
+	public void setAdvancedeobjectflatcomboviewerCompoOptionalProperty(EObject newValue) {
+		if (newValue != null) {
+			advancedeobjectflatcomboviewerCompoOptionalProperty.setSelection(new StructuredSelection(newValue));
+		} else {
+			advancedeobjectflatcomboviewerCompoOptionalProperty.setSelection(new StructuredSelection()); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#setAdvancedeobjectflatcomboviewerCompoOptionalPropertyButtonMode(ButtonsModeEnum newValue)
+	 */
+	public void setAdvancedeobjectflatcomboviewerCompoOptionalPropertyButtonMode(ButtonsModeEnum newValue) {
+		advancedeobjectflatcomboviewerCompoOptionalProperty.setButtonMode(newValue);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#addFilterAdvancedeobjectflatcomboviewerCompoOptionalProperty(ViewerFilter filter)
+	 * 
+	 */
+	public void addFilterToAdvancedeobjectflatcomboviewerCompoOptionalProperty(ViewerFilter filter) {
+		advancedeobjectflatcomboviewerCompoOptionalProperty.addFilter(filter);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.eef.eefnr.parts.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart#addBusinessFilterAdvancedeobjectflatcomboviewerCompoOptionalProperty(ViewerFilter filter)
+	 * 
+	 */
+	public void addBusinessFilterToAdvancedeobjectflatcomboviewerCompoOptionalProperty(ViewerFilter filter) {
+		advancedeobjectflatcomboviewerCompoOptionalProperty.addBusinessRuleFilter(filter);
+	}
+
 
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedReferencesTableSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedReferencesTableSamplePropertiesEditionPartImpl.java
index 2f4c3011e..df7ea3a63 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedReferencesTableSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedReferencesTableSamplePropertiesEditionPartImpl.java
@@ -331,6 +331,8 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartImpl extends Comp
 			}
 			
 		});
+		advancedreferencestableROProperty.setEnabled(false);
+		advancedreferencestableROProperty.setToolTipText(EefnrMessages.AdvancedReferencesTableSample_ReadOnly);
 		GridData advancedreferencestableROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		advancedreferencestableROPropertyData.horizontalSpan = 3;
 		this.advancedreferencestableROProperty.setLayoutData(advancedreferencestableROPropertyData);
@@ -416,14 +418,6 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartImpl extends Comp
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedreferencestableRequiredProperty.setContentProvider(contentProvider);
 		advancedreferencestableRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableRequiredProperty);
-		if (readOnly && advancedreferencestableRequiredProperty.getTable().isEnabled()) {
-			advancedreferencestableRequiredProperty.setEnabled(false);
-			advancedreferencestableRequiredProperty.setToolTipText(EefnrMessages.AdvancedReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !advancedreferencestableRequiredProperty.getTable().isEnabled()) {
-			advancedreferencestableRequiredProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -479,14 +473,6 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartImpl extends Comp
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedreferencestableOptionalProperty.setContentProvider(contentProvider);
 		advancedreferencestableOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableOptionalProperty);
-		if (readOnly && advancedreferencestableOptionalProperty.getTable().isEnabled()) {
-			advancedreferencestableOptionalProperty.setEnabled(false);
-			advancedreferencestableOptionalProperty.setToolTipText(EefnrMessages.AdvancedReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !advancedreferencestableOptionalProperty.getTable().isEnabled()) {
-			advancedreferencestableOptionalProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -542,9 +528,6 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartImpl extends Comp
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedreferencestableROProperty.setContentProvider(contentProvider);
 		advancedreferencestableROProperty.setInput(settings);
-		advancedreferencestableROProperty.setEnabled(false);
-		advancedreferencestableROProperty.setToolTipText(EefnrMessages.AdvancedReferencesTableSample_ReadOnly);
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.java
index 687df3077..bd0acb483 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.java
@@ -273,6 +273,8 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl exten
 			}
 			
 		});
+		advancedtablecompositionROProperty.setEnabled(false);
+		advancedtablecompositionROProperty.setToolTipText(EefnrMessages.AdvancedTableCompositionEditorSample_ReadOnly);
 		GridData advancedtablecompositionROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		advancedtablecompositionROPropertyData.horizontalSpan = 3;
 		this.advancedtablecompositionROProperty.setLayoutData(advancedtablecompositionROPropertyData);
@@ -309,14 +311,6 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl exten
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedtablecompositionRequiredProperty.setContentProvider(contentProvider);
 		advancedtablecompositionRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionRequiredProperty);
-		if (readOnly && advancedtablecompositionRequiredProperty.isEnabled()) {
-			advancedtablecompositionRequiredProperty.setEnabled(false);
-			advancedtablecompositionRequiredProperty.setToolTipText(EefnrMessages.AdvancedTableCompositionEditorSample_ReadOnly);
-		} else if (!readOnly && !advancedtablecompositionRequiredProperty.isEnabled()) {
-			advancedtablecompositionRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -375,14 +369,6 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl exten
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedtablecompositionOptionalProperty.setContentProvider(contentProvider);
 		advancedtablecompositionOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionOptionalProperty);
-		if (readOnly && advancedtablecompositionOptionalProperty.isEnabled()) {
-			advancedtablecompositionOptionalProperty.setEnabled(false);
-			advancedtablecompositionOptionalProperty.setToolTipText(EefnrMessages.AdvancedTableCompositionEditorSample_ReadOnly);
-		} else if (!readOnly && !advancedtablecompositionOptionalProperty.isEnabled()) {
-			advancedtablecompositionOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -441,9 +427,6 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl exten
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedtablecompositionROProperty.setContentProvider(contentProvider);
 		advancedtablecompositionROProperty.setInput(settings);
-		advancedtablecompositionROProperty.setEnabled(false);
-		advancedtablecompositionROProperty.setToolTipText(EefnrMessages.AdvancedTableCompositionEditorSample_ReadOnly);
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/CheckboxSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/CheckboxSamplePropertiesEditionPartImpl.java
index c97d87f11..06bde7870 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/CheckboxSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/CheckboxSamplePropertiesEditionPartImpl.java
@@ -184,6 +184,8 @@ public class CheckboxSamplePropertiesEditionPartImpl extends CompositeProperties
 	protected Composite createCheckboxROPropertyCheckbox(Composite parent) {
 		checkboxROProperty = new Button(parent, SWT.CHECK);
 		checkboxROProperty.setText(getDescription(EefnrViewsRepository.CheckboxSample.Properties.checkboxROProperty, EefnrMessages.CheckboxSamplePropertiesEditionPart_CheckboxROPropertyLabel));
+		checkboxROProperty.setEnabled(false);
+		checkboxROProperty.setToolTipText(EefnrMessages.CheckboxSample_ReadOnly);
 		checkboxROProperty.addSelectionListener(new SelectionAdapter() {
 
 			/**
@@ -242,14 +244,6 @@ public class CheckboxSamplePropertiesEditionPartImpl extends CompositeProperties
 		} else {
 			checkboxRequiredProperty.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.CheckboxSample.Properties.checkboxRequiredProperty);
-		if (readOnly && checkboxRequiredProperty.isEnabled()) {
-			checkboxRequiredProperty.setEnabled(false);
-			checkboxRequiredProperty.setToolTipText(EefnrMessages.CheckboxSample_ReadOnly);
-		} else if (!readOnly && !checkboxRequiredProperty.isEnabled()) {
-			checkboxRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -274,14 +268,6 @@ public class CheckboxSamplePropertiesEditionPartImpl extends CompositeProperties
 		} else {
 			checkboxOptionalProperty.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.CheckboxSample.Properties.checkboxOptionalProperty);
-		if (readOnly && checkboxOptionalProperty.isEnabled()) {
-			checkboxOptionalProperty.setEnabled(false);
-			checkboxOptionalProperty.setToolTipText(EefnrMessages.CheckboxSample_ReadOnly);
-		} else if (!readOnly && !checkboxOptionalProperty.isEnabled()) {
-			checkboxOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -306,9 +292,6 @@ public class CheckboxSamplePropertiesEditionPartImpl extends CompositeProperties
 		} else {
 			checkboxROProperty.setSelection(false);
 		}
-		checkboxROProperty.setEnabled(false);
-		checkboxROProperty.setToolTipText(EefnrMessages.CheckboxSample_ReadOnly);
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EMFComboViewerSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EMFComboViewerSamplePropertiesEditionPartImpl.java
index 707555162..74ad50328 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EMFComboViewerSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EMFComboViewerSamplePropertiesEditionPartImpl.java
@@ -190,6 +190,8 @@ public class EMFComboViewerSamplePropertiesEditionPartImpl extends CompositeProp
 		emfcomboviewerROProperty = new EMFComboViewer(parent);
 		emfcomboviewerROProperty.setContentProvider(new ArrayContentProvider());
 		emfcomboviewerROProperty.setLabelProvider(new AdapterFactoryLabelProvider(EEFRuntimePlugin.getDefault().getAdapterFactory()));
+		emfcomboviewerROProperty.setEnabled(false);
+		emfcomboviewerROProperty.setToolTipText(EefnrMessages.EMFComboViewerSample_ReadOnly);
 		GridData emfcomboviewerROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		emfcomboviewerROProperty.getCombo().setLayoutData(emfcomboviewerROPropertyData);
 		emfcomboviewerROProperty.addSelectionChangedListener(new ISelectionChangedListener() {
@@ -243,14 +245,6 @@ public class EMFComboViewerSamplePropertiesEditionPartImpl extends CompositeProp
 	public void initEmfcomboviewerRequiredProperty(Object input, Enumerator current) {
 		emfcomboviewerRequiredProperty.setInput(input);
 		emfcomboviewerRequiredProperty.modelUpdating(new StructuredSelection(current));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerRequiredProperty);
-		if (readOnly && emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(false);
-			emfcomboviewerRequiredProperty.setToolTipText(EefnrMessages.EMFComboViewerSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -261,14 +255,6 @@ public class EMFComboViewerSamplePropertiesEditionPartImpl extends CompositeProp
 	 */
 	public void setEmfcomboviewerRequiredProperty(Enumerator newValue) {
 		emfcomboviewerRequiredProperty.modelUpdating(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerRequiredProperty);
-		if (readOnly && emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(false);
-			emfcomboviewerRequiredProperty.setToolTipText(EefnrMessages.EMFComboViewerSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -290,14 +276,6 @@ public class EMFComboViewerSamplePropertiesEditionPartImpl extends CompositeProp
 	public void initEmfcomboviewerOptionalProperty(Object input, Enumerator current) {
 		emfcomboviewerOptionalProperty.setInput(input);
 		emfcomboviewerOptionalProperty.modelUpdating(new StructuredSelection(current));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerOptionalProperty);
-		if (readOnly && emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(false);
-			emfcomboviewerOptionalProperty.setToolTipText(EefnrMessages.EMFComboViewerSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -308,14 +286,6 @@ public class EMFComboViewerSamplePropertiesEditionPartImpl extends CompositeProp
 	 */
 	public void setEmfcomboviewerOptionalProperty(Enumerator newValue) {
 		emfcomboviewerOptionalProperty.modelUpdating(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerOptionalProperty);
-		if (readOnly && emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(false);
-			emfcomboviewerOptionalProperty.setToolTipText(EefnrMessages.EMFComboViewerSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -337,9 +307,6 @@ public class EMFComboViewerSamplePropertiesEditionPartImpl extends CompositeProp
 	public void initEmfcomboviewerROProperty(Object input, Enumerator current) {
 		emfcomboviewerROProperty.setInput(input);
 		emfcomboviewerROProperty.modelUpdating(new StructuredSelection(current));
-		emfcomboviewerROProperty.setEnabled(false);
-		emfcomboviewerROProperty.setToolTipText(EefnrMessages.EMFComboViewerSample_ReadOnly);
-		
 	}
 
 	/**
@@ -350,9 +317,6 @@ public class EMFComboViewerSamplePropertiesEditionPartImpl extends CompositeProp
 	 */
 	public void setEmfcomboviewerROProperty(Enumerator newValue) {
 		emfcomboviewerROProperty.modelUpdating(new StructuredSelection(newValue));
-		emfcomboviewerROProperty.setEnabled(false);
-		emfcomboviewerROProperty.setToolTipText(EefnrMessages.EMFComboViewerSample_ReadOnly);
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EObjectFlatComboViewerSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EObjectFlatComboViewerSamplePropertiesEditionPartImpl.java
index 3f5bfd5ef..d039d47f9 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EObjectFlatComboViewerSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EObjectFlatComboViewerSamplePropertiesEditionPartImpl.java
@@ -185,6 +185,8 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartImpl extends Compo
 		createDescription(parent, EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerROPropery, EefnrMessages.EObjectFlatComboViewerSamplePropertiesEditionPart_EobjectflatcomboviewerROProperyLabel);
 		eobjectflatcomboviewerROPropery = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerROPropery, EefnrViewsRepository.SWT_KIND));
 		eobjectflatcomboviewerROPropery.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+		eobjectflatcomboviewerROPropery.setEnabled(false);
+		eobjectflatcomboviewerROPropery.setToolTipText(EefnrMessages.EObjectFlatComboViewerSample_ReadOnly);
 
 		eobjectflatcomboviewerROPropery.addSelectionChangedListener(new ISelectionChangedListener() {
 
@@ -238,14 +240,6 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartImpl extends Compo
 		if (current != null) {
 			eobjectflatcomboviewerRequiredPropery.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerRequiredPropery);
-		if (readOnly && eobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			eobjectflatcomboviewerRequiredPropery.setEnabled(false);
-			eobjectflatcomboviewerRequiredPropery.setToolTipText(EefnrMessages.EObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			eobjectflatcomboviewerRequiredPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -260,14 +254,6 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartImpl extends Compo
 		} else {
 			eobjectflatcomboviewerRequiredPropery.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerRequiredPropery);
-		if (readOnly && eobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			eobjectflatcomboviewerRequiredPropery.setEnabled(false);
-			eobjectflatcomboviewerRequiredPropery.setToolTipText(EefnrMessages.EObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			eobjectflatcomboviewerRequiredPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -324,14 +310,6 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartImpl extends Compo
 		if (current != null) {
 			eobjectflatcomboviewerOptionalPropery.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerOptionalPropery);
-		if (readOnly && eobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			eobjectflatcomboviewerOptionalPropery.setEnabled(false);
-			eobjectflatcomboviewerOptionalPropery.setToolTipText(EefnrMessages.EObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			eobjectflatcomboviewerOptionalPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -346,14 +324,6 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartImpl extends Compo
 		} else {
 			eobjectflatcomboviewerOptionalPropery.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerOptionalPropery);
-		if (readOnly && eobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			eobjectflatcomboviewerOptionalPropery.setEnabled(false);
-			eobjectflatcomboviewerOptionalPropery.setToolTipText(EefnrMessages.EObjectFlatComboViewerSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			eobjectflatcomboviewerOptionalPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -410,9 +380,6 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartImpl extends Compo
 		if (current != null) {
 			eobjectflatcomboviewerROPropery.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		eobjectflatcomboviewerROPropery.setEnabled(false);
-		eobjectflatcomboviewerROPropery.setToolTipText(EefnrMessages.EObjectFlatComboViewerSample_ReadOnly);
-		
 	}
 
 	/**
@@ -427,9 +394,6 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartImpl extends Compo
 		} else {
 			eobjectflatcomboviewerROPropery.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		eobjectflatcomboviewerROPropery.setEnabled(false);
-		eobjectflatcomboviewerROPropery.setToolTipText(EefnrMessages.EObjectFlatComboViewerSample_ReadOnly);
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/FlatReferenceTableSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/FlatReferenceTableSamplePropertiesEditionPartImpl.java
index 0d752be02..f90b8b7ab 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/FlatReferenceTableSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/FlatReferenceTableSamplePropertiesEditionPartImpl.java
@@ -138,6 +138,7 @@ public class FlatReferenceTableSamplePropertiesEditionPartImpl extends Composite
 		createDescription(parent, EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableRequiredProperty, EefnrMessages.FlatReferenceTableSamplePropertiesEditionPart_FlatreferencetableRequiredPropertyLabel);
 		flatreferencetableRequiredProperty = new FlatReferencesTable(parent);
 		flatreferencetableRequiredProperty.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
 		flatreferencetableRequiredProperty.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -162,6 +163,7 @@ public class FlatReferenceTableSamplePropertiesEditionPartImpl extends Composite
 		createDescription(parent, EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableOptionalProperty, EefnrMessages.FlatReferenceTableSamplePropertiesEditionPart_FlatreferencetableOptionalPropertyLabel);
 		flatreferencetableOptionalProperty = new FlatReferencesTable(parent);
 		flatreferencetableOptionalProperty.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
 		flatreferencetableOptionalProperty.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -186,6 +188,9 @@ public class FlatReferenceTableSamplePropertiesEditionPartImpl extends Composite
 		createDescription(parent, EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableROProperty, EefnrMessages.FlatReferenceTableSamplePropertiesEditionPart_FlatreferencetableROPropertyLabel);
 		flatreferencetableROProperty = new FlatReferencesTable(parent);
 		flatreferencetableROProperty.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+		flatreferencetableROProperty.setEnabled(false);
+		flatreferencetableROProperty.setToolTipText(EefnrMessages.FlatReferenceTableSample_ReadOnly);
+
 		flatreferencetableROProperty.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -226,14 +231,6 @@ public class FlatReferenceTableSamplePropertiesEditionPartImpl extends Composite
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
 		flatreferencetableRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableRequiredProperty);
-		if (readOnly && flatreferencetableRequiredProperty.isEnabled()) {
-			flatreferencetableRequiredProperty.setEnabled(false);
-			flatreferencetableRequiredProperty.setToolTipText(EefnrMessages.FlatReferenceTableSample_ReadOnly);
-		} else if (!readOnly && !flatreferencetableRequiredProperty.isEnabled()) {
-			flatreferencetableRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -287,14 +284,6 @@ public class FlatReferenceTableSamplePropertiesEditionPartImpl extends Composite
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
 		flatreferencetableOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableOptionalProperty);
-		if (readOnly && flatreferencetableOptionalProperty.isEnabled()) {
-			flatreferencetableOptionalProperty.setEnabled(false);
-			flatreferencetableOptionalProperty.setToolTipText(EefnrMessages.FlatReferenceTableSample_ReadOnly);
-		} else if (!readOnly && !flatreferencetableOptionalProperty.isEnabled()) {
-			flatreferencetableOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -348,9 +337,6 @@ public class FlatReferenceTableSamplePropertiesEditionPartImpl extends Composite
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
 		flatreferencetableROProperty.setInput(settings);
-		flatreferencetableROProperty.setEnabled(false);
-		flatreferencetableROProperty.setToolTipText(EefnrMessages.FlatReferenceTableSample_ReadOnly);
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ImageViewerSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ImageViewerSamplePropertiesEditionPartImpl.java
index 7074f74e1..53cd03914 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ImageViewerSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ImageViewerSamplePropertiesEditionPartImpl.java
@@ -185,6 +185,8 @@ public class ImageViewerSamplePropertiesEditionPartImpl extends CompositePropert
 	protected Composite createImageviewerROPropertyImageViewer(Composite parent) {
 		createDescription(parent, EefnrViewsRepository.ImageViewerSample.Properties.imageviewerROProperty, EefnrMessages.ImageViewerSamplePropertiesEditionPart_ImageviewerROPropertyLabel);
 		imageviewerROProperty = new EEFImageViewer(parent, SWT.BORDER);
+		imageviewerROProperty.setEnabled(false);
+		imageviewerROProperty.setToolTipText(EefnrMessages.ImageViewerSample_ReadOnly);
 		GridData imageviewerROPropertyData = new GridData();
 		// Start of user code  for imageviewerROProperty layout data customization
 				imageviewerROPropertyData.widthHint = 200;
@@ -243,14 +245,6 @@ public class ImageViewerSamplePropertiesEditionPartImpl extends CompositePropert
 		} else {
 			imageviewerRequiredProperty.initViewer(key, ""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerRequiredProperty);
-		if (readOnly && imageviewerRequiredProperty.isEnabled()) {
-			imageviewerRequiredProperty.setEnabled(false);
-			imageviewerRequiredProperty.setToolTipText(EefnrMessages.ImageViewerSample_ReadOnly);
-		} else if (!readOnly && !imageviewerRequiredProperty.isEnabled()) {
-			imageviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -265,14 +259,6 @@ public class ImageViewerSamplePropertiesEditionPartImpl extends CompositePropert
 		} else {
 			imageviewerRequiredProperty.setSelection(new StructuredSelection("")); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerRequiredProperty);
-		if (readOnly && imageviewerRequiredProperty.isEnabled()) {
-			imageviewerRequiredProperty.setEnabled(false);
-			imageviewerRequiredProperty.setToolTipText(EefnrMessages.ImageViewerSample_ReadOnly);
-		} else if (!readOnly && !imageviewerRequiredProperty.isEnabled()) {
-			imageviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -300,14 +286,6 @@ public class ImageViewerSamplePropertiesEditionPartImpl extends CompositePropert
 		} else {
 			imageviewerOptionalProperty.initViewer(key, ""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerOptionalProperty);
-		if (readOnly && imageviewerOptionalProperty.isEnabled()) {
-			imageviewerOptionalProperty.setEnabled(false);
-			imageviewerOptionalProperty.setToolTipText(EefnrMessages.ImageViewerSample_ReadOnly);
-		} else if (!readOnly && !imageviewerOptionalProperty.isEnabled()) {
-			imageviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -322,14 +300,6 @@ public class ImageViewerSamplePropertiesEditionPartImpl extends CompositePropert
 		} else {
 			imageviewerOptionalProperty.setSelection(new StructuredSelection("")); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerOptionalProperty);
-		if (readOnly && imageviewerOptionalProperty.isEnabled()) {
-			imageviewerOptionalProperty.setEnabled(false);
-			imageviewerOptionalProperty.setToolTipText(EefnrMessages.ImageViewerSample_ReadOnly);
-		} else if (!readOnly && !imageviewerOptionalProperty.isEnabled()) {
-			imageviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -357,9 +327,6 @@ public class ImageViewerSamplePropertiesEditionPartImpl extends CompositePropert
 		} else {
 			imageviewerROProperty.initViewer(key, ""); //$NON-NLS-1$
 		}
-		imageviewerROProperty.setEnabled(false);
-		imageviewerROProperty.setToolTipText(EefnrMessages.ImageViewerSample_ReadOnly);
-		
 	}
 
 	/**
@@ -374,9 +341,6 @@ public class ImageViewerSamplePropertiesEditionPartImpl extends CompositePropert
 		} else {
 			imageviewerROProperty.setSelection(new StructuredSelection("")); //$NON-NLS-1$
 		}
-		imageviewerROProperty.setEnabled(false);
-		imageviewerROProperty.setToolTipText(EefnrMessages.ImageViewerSample_ReadOnly);
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/MultiValuedEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/MultiValuedEditorSamplePropertiesEditionPartImpl.java
index 7bdf9af13..622d70094 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/MultiValuedEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/MultiValuedEditorSamplePropertiesEditionPartImpl.java
@@ -221,13 +221,14 @@ public class MultiValuedEditorSamplePropertiesEditionPartImpl extends CompositeP
 
 	protected Composite createMultivaluededitorROPropertyMultiValuedEditor(Composite parent) {
 		multivaluededitorROProperty = SWTUtils.createScrollableText(parent, SWT.BORDER | SWT.READ_ONLY);
+		multivaluededitorROProperty.setEnabled(false);
+		multivaluededitorROProperty.setToolTipText(EefnrMessages.MultiValuedEditorSample_ReadOnly);
 		GridData multivaluededitorROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		multivaluededitorROPropertyData.horizontalSpan = 2;
 		multivaluededitorROProperty.setLayoutData(multivaluededitorROPropertyData);
 		EditingUtils.setID(multivaluededitorROProperty, EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorROProperty);
 		EditingUtils.setEEFtype(multivaluededitorROProperty, "eef::MultiValuedEditor::field"); //$NON-NLS-1$
 		editMultivaluededitorROProperty = new Button(parent, SWT.NONE);
-		editMultivaluededitorROProperty.setEnabled(false);
 		editMultivaluededitorROProperty.setText(getDescription(EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorROProperty, EefnrMessages.MultiValuedEditorSamplePropertiesEditionPart_MultivaluededitorROPropertyLabel));
 		GridData editMultivaluededitorROPropertyData = new GridData();
 		editMultivaluededitorROProperty.setLayoutData(editMultivaluededitorROPropertyData);
@@ -296,14 +297,6 @@ public class MultiValuedEditorSamplePropertiesEditionPartImpl extends CompositeP
 		} else {
 			multivaluededitorRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorRequiredProperty);
-		if (readOnly && multivaluededitorRequiredProperty.isEnabled()) {
-			multivaluededitorRequiredProperty.setEnabled(false);
-			multivaluededitorRequiredProperty.setToolTipText(EefnrMessages.MultiValuedEditorSample_ReadOnly);
-		} else if (!readOnly && !multivaluededitorRequiredProperty.isEnabled()) {
-			multivaluededitorRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	public void addToMultivaluededitorRequiredProperty(Object newValue) {
@@ -347,14 +340,6 @@ public class MultiValuedEditorSamplePropertiesEditionPartImpl extends CompositeP
 		} else {
 			multivaluededitorOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorOptionalProperty);
-		if (readOnly && multivaluededitorOptionalProperty.isEnabled()) {
-			multivaluededitorOptionalProperty.setEnabled(false);
-			multivaluededitorOptionalProperty.setToolTipText(EefnrMessages.MultiValuedEditorSample_ReadOnly);
-		} else if (!readOnly && !multivaluededitorOptionalProperty.isEnabled()) {
-			multivaluededitorOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	public void addToMultivaluededitorOptionalProperty(Object newValue) {
@@ -398,9 +383,6 @@ public class MultiValuedEditorSamplePropertiesEditionPartImpl extends CompositeP
 		} else {
 			multivaluededitorROProperty.setText(""); //$NON-NLS-1$
 		}
-		multivaluededitorROProperty.setEnabled(false);
-		multivaluededitorROProperty.setToolTipText(EefnrMessages.MultiValuedEditorSample_ReadOnly);
-		
 	}
 
 	public void addToMultivaluededitorROProperty(Object newValue) {
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RadioSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RadioSamplePropertiesEditionPartImpl.java
index 05a2d51fa..30ed36d67 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RadioSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RadioSamplePropertiesEditionPartImpl.java
@@ -174,6 +174,8 @@ public class RadioSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 	 */
 	protected Composite createRadioROPropertyRadioViewer(Composite parent) {
 		radioROPropertyRadioViewer = new RadioViewer(parent, SWT.CHECK);
+		radioROPropertyRadioViewer.setEnabled(false);
+		radioROPropertyRadioViewer.setToolTipText(EefnrMessages.RadioSample_ReadOnly);
 		GridData radioROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		radioROPropertyData.horizontalSpan = 2;
 		radioROPropertyRadioViewer.setLayoutData(radioROPropertyData);
@@ -235,14 +237,6 @@ public class RadioSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 	 */
 	public void setRadioRequiredProperty(Object newValue) {
 		radioRequiredPropertyRadioViewer.setSelection(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.RadioSample.Properties.radioRequiredProperty);
-		if (readOnly && radioRequiredPropertyRadioViewer.isEnabled()) {
-			radioRequiredPropertyRadioViewer.setEnabled(false);
-			radioRequiredPropertyRadioViewer.setToolTipText(EefnrMessages.RadioSample_ReadOnly);
-		} else if (!readOnly && !radioRequiredPropertyRadioViewer.isEnabled()) {
-			radioRequiredPropertyRadioViewer.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -277,14 +271,6 @@ public class RadioSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 	 */
 	public void setRadioOptionalProperty(Object newValue) {
 		radioOptionalPropertyRadioViewer.setSelection(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.RadioSample.Properties.radioOptionalProperty);
-		if (readOnly && radioOptionalPropertyRadioViewer.isEnabled()) {
-			radioOptionalPropertyRadioViewer.setEnabled(false);
-			radioOptionalPropertyRadioViewer.setToolTipText(EefnrMessages.RadioSample_ReadOnly);
-		} else if (!readOnly && !radioOptionalPropertyRadioViewer.isEnabled()) {
-			radioOptionalPropertyRadioViewer.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -319,9 +305,6 @@ public class RadioSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 	 */
 	public void setRadioROProperty(Object newValue) {
 		radioROPropertyRadioViewer.setSelection(new StructuredSelection(newValue));
-		radioROPropertyRadioViewer.setEnabled(false);
-		radioROPropertyRadioViewer.setToolTipText(EefnrMessages.RadioSample_ReadOnly);
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ReferencesTableSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ReferencesTableSamplePropertiesEditionPartImpl.java
index a53eb3404..186695e4f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ReferencesTableSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ReferencesTableSamplePropertiesEditionPartImpl.java
@@ -498,6 +498,8 @@ public class ReferencesTableSamplePropertiesEditionPartImpl extends CompositePro
 	protected TableViewer createReferencestableROPropertyViewer(Composite container, AdapterFactory adapter) {
 		org.eclipse.swt.widgets.Table table = new org.eclipse.swt.widgets.Table(container, SWT.FULL_SELECTION);
 		table.setHeaderVisible(true);
+		table.setEnabled(false);
+		table.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
 		GridData gd = new GridData();
 		gd.grabExcessHorizontalSpace = true;
 		gd.horizontalAlignment = GridData.FILL;
@@ -560,6 +562,8 @@ public class ReferencesTableSamplePropertiesEditionPartImpl extends CompositePro
 		result.setLayout(layout);
 		addReferencestableROProperty = new Button(result, SWT.NONE);
 		addReferencestableROProperty.setText(EefnrMessages.PropertiesEditionPart_AddListViewerLabel);
+		addReferencestableROProperty.setEnabled(false);
+		addReferencestableROProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
 		GridData addData = new GridData(GridData.FILL_HORIZONTAL);
 		addReferencestableROProperty.setLayoutData(addData);
 		addReferencestableROProperty.addSelectionListener(new SelectionAdapter() {
@@ -579,6 +583,8 @@ public class ReferencesTableSamplePropertiesEditionPartImpl extends CompositePro
 		EditingUtils.setEEFtype(addReferencestableROProperty, "eef::ReferencesTable::addbutton"); //$NON-NLS-1$
 		removeReferencestableROProperty = new Button(result, SWT.NONE);
 		removeReferencestableROProperty.setText(EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel);
+		removeReferencestableROProperty.setEnabled(false);
+		removeReferencestableROProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
 		GridData removeData = new GridData(GridData.FILL_HORIZONTAL);
 		removeReferencestableROProperty.setLayoutData(removeData);
 		removeReferencestableROProperty.addSelectionListener(new SelectionAdapter() {
@@ -655,20 +661,6 @@ public class ReferencesTableSamplePropertiesEditionPartImpl extends CompositePro
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		referencestableRequiredProperty.setContentProvider(contentProvider);
 		referencestableRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.ReferencesTableSample.Properties.referencestableRequiredProperty);
-		if (readOnly && referencestableRequiredProperty.getTable().isEnabled()) {
-			referencestableRequiredProperty.getTable().setEnabled(false);
-			referencestableRequiredProperty.getTable().setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-			addReferencestableRequiredProperty.setEnabled(false);
-			addReferencestableRequiredProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-			removeReferencestableRequiredProperty.setEnabled(false);
-			removeReferencestableRequiredProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !referencestableRequiredProperty.getTable().isEnabled()) {
-			referencestableRequiredProperty.getTable().setEnabled(true);
-			addReferencestableRequiredProperty.setEnabled(true);
-			removeReferencestableRequiredProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -724,20 +716,6 @@ public class ReferencesTableSamplePropertiesEditionPartImpl extends CompositePro
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		referencestableOptionalProperty.setContentProvider(contentProvider);
 		referencestableOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.ReferencesTableSample.Properties.referencestableOptionalProperty);
-		if (readOnly && referencestableOptionalProperty.getTable().isEnabled()) {
-			referencestableOptionalProperty.getTable().setEnabled(false);
-			referencestableOptionalProperty.getTable().setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-			addReferencestableOptionalProperty.setEnabled(false);
-			addReferencestableOptionalProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-			removeReferencestableOptionalProperty.setEnabled(false);
-			removeReferencestableOptionalProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-		} else if (!readOnly && !referencestableOptionalProperty.getTable().isEnabled()) {
-			referencestableOptionalProperty.getTable().setEnabled(true);
-			addReferencestableOptionalProperty.setEnabled(true);
-			removeReferencestableOptionalProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -793,13 +771,6 @@ public class ReferencesTableSamplePropertiesEditionPartImpl extends CompositePro
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		referencestableROProperty.setContentProvider(contentProvider);
 		referencestableROProperty.setInput(settings);
-		referencestableROProperty.getTable().setEnabled(false);
-		referencestableROProperty.getTable().setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-		addReferencestableROProperty.setEnabled(false);
-		addReferencestableROProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-		removeReferencestableROProperty.setEnabled(false);
-		removeReferencestableROProperty.setToolTipText(EefnrMessages.ReferencesTableSample_ReadOnly);
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java
index 2486a65c9..df1e8049c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java
@@ -199,14 +199,6 @@ public class RootPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		samples.setContentProvider(contentProvider);
 		samples.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.Root.Properties.samples);
-		if (readOnly && samples.isEnabled()) {
-			samples.setEnabled(false);
-			samples.setToolTipText(EefnrMessages.Root_ReadOnly);
-		} else if (!readOnly && !samples.isEnabled()) {
-			samples.setEnabled(true);
-		}	
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SamplePropertiesEditionPartImpl.java
index 04b3b95fe..c3ba8b8b8 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SamplePropertiesEditionPartImpl.java
@@ -250,14 +250,6 @@ public class SamplePropertiesEditionPartImpl extends CompositePropertiesEditionP
 		} else {
 			textRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.Sample.Properties.textRequiredProperty);
-		if (readOnly && textRequiredProperty.isEnabled()) {
-			textRequiredProperty.setEnabled(false);
-			textRequiredProperty.setToolTipText(EefnrMessages.Sample_ReadOnly);
-		} else if (!readOnly && !textRequiredProperty.isEnabled()) {
-			textRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -282,14 +274,6 @@ public class SamplePropertiesEditionPartImpl extends CompositePropertiesEditionP
 		} else {
 			textOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.Sample.Properties.textOptionalProperty);
-		if (readOnly && textOptionalProperty.isEnabled()) {
-			textOptionalProperty.setEnabled(false);
-			textOptionalProperty.setToolTipText(EefnrMessages.Sample_ReadOnly);
-		} else if (!readOnly && !textOptionalProperty.isEnabled()) {
-			textOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SelectionDialogSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SelectionDialogSamplePropertiesEditionPartImpl.java
index 4cec870bb..2a0c65e38 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SelectionDialogSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SelectionDialogSamplePropertiesEditionPartImpl.java
@@ -137,6 +137,7 @@ public class SelectionDialogSamplePropertiesEditionPartImpl extends CompositePro
 	protected Composite createSelectionDialogRequiredPropertySelectionDialog(Composite parent) {
 		createDescription(parent, EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogRequiredProperty, EefnrMessages.SelectionDialogSamplePropertiesEditionPart_SelectionDialogRequiredPropertyLabel);
 		selectionDialogRequiredProperty = new SelectionDialog(parent, SWT.NONE);
+
 		GridData generatorData = new GridData(GridData.FILL_HORIZONTAL);
 		selectionDialogRequiredProperty.setLayoutData(generatorData);
 
@@ -194,6 +195,7 @@ public class SelectionDialogSamplePropertiesEditionPartImpl extends CompositePro
 	protected Composite createSelectionDialogOptionalPropertySelectionDialog(Composite parent) {
 		createDescription(parent, EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogOptionalProperty, EefnrMessages.SelectionDialogSamplePropertiesEditionPart_SelectionDialogOptionalPropertyLabel);
 		selectionDialogOptionalProperty = new SelectionDialog(parent, SWT.NONE);
+
 		GridData generatorData = new GridData(GridData.FILL_HORIZONTAL);
 		selectionDialogOptionalProperty.setLayoutData(generatorData);
 
@@ -251,6 +253,7 @@ public class SelectionDialogSamplePropertiesEditionPartImpl extends CompositePro
 	protected Composite createSelectionDialogROPropertySelectionDialog(Composite parent) {
 		createDescription(parent, EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogROProperty, EefnrMessages.SelectionDialogSamplePropertiesEditionPart_SelectionDialogROPropertyLabel);
 		selectionDialogROProperty = new SelectionDialog(parent, SWT.NONE);
+
 		GridData generatorData = new GridData(GridData.FILL_HORIZONTAL);
 		selectionDialogROProperty.setLayoutData(generatorData);
 
@@ -339,14 +342,6 @@ public class SelectionDialogSamplePropertiesEditionPartImpl extends CompositePro
 		} else {
 			selectionDialogRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogRequiredProperty);
-		if (readOnly && selectionDialogRequiredProperty.isEnabled()) {
-			selectionDialogRequiredProperty.setEnabled(false);
-			selectionDialogRequiredProperty.setToolTipText(EefnrMessages.SelectionDialogSample_ReadOnly);
-		} else if (!readOnly && !selectionDialogRequiredProperty.isEnabled()) {
-			selectionDialogRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -371,14 +366,6 @@ public class SelectionDialogSamplePropertiesEditionPartImpl extends CompositePro
 		} else {
 			selectionDialogOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogOptionalProperty);
-		if (readOnly && selectionDialogOptionalProperty.isEnabled()) {
-			selectionDialogOptionalProperty.setEnabled(false);
-			selectionDialogOptionalProperty.setToolTipText(EefnrMessages.SelectionDialogSample_ReadOnly);
-		} else if (!readOnly && !selectionDialogOptionalProperty.isEnabled()) {
-			selectionDialogOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -403,9 +390,6 @@ public class SelectionDialogSamplePropertiesEditionPartImpl extends CompositePro
 		} else {
 			selectionDialogROProperty.setText(""); //$NON-NLS-1$
 		}
-		selectionDialogROProperty.setEnabled(false);
-		selectionDialogROProperty.setToolTipText(EefnrMessages.SelectionDialogSample_ReadOnly);
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SingleCompositionViewerSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SingleCompositionViewerSamplePropertiesEditionPartImpl.java
index a961cfa1f..e1511c52c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SingleCompositionViewerSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SingleCompositionViewerSamplePropertiesEditionPartImpl.java
@@ -395,14 +395,6 @@ public class SingleCompositionViewerSamplePropertiesEditionPartImpl extends Comp
 	 */
 	public void setSinglecompositionviewerSingleRequiredProperty(EObject newValue) {
 		singlecompositionviewerSingleRequiredProperty.update(newValue);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.SingleCompositionViewerSample.Properties.singlecompositionviewerSingleRequiredProperty);
-		if (readOnly && singlecompositionviewerSingleRequiredProperty.isEnabled()) {
-			singlecompositionviewerSingleRequiredProperty.setEnabled(false);
-			singlecompositionviewerSingleRequiredProperty.setToolTipText(EefnrMessages.SingleCompositionViewerSample_ReadOnly);
-		} else if (!readOnly && !singlecompositionviewerSingleRequiredProperty.isEnabled()) {
-			singlecompositionviewerSingleRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -447,14 +439,6 @@ public class SingleCompositionViewerSamplePropertiesEditionPartImpl extends Comp
 	 */
 	public void setSinglecompositionviewerSingleOptionalProperty(EObject newValue) {
 		singlecompositionviewerSingleOptionalProperty.update(newValue);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.SingleCompositionViewerSample.Properties.singlecompositionviewerSingleOptionalProperty);
-		if (readOnly && singlecompositionviewerSingleOptionalProperty.isEnabled()) {
-			singlecompositionviewerSingleOptionalProperty.setEnabled(false);
-			singlecompositionviewerSingleOptionalProperty.setToolTipText(EefnrMessages.SingleCompositionViewerSample_ReadOnly);
-		} else if (!readOnly && !singlecompositionviewerSingleOptionalProperty.isEnabled()) {
-			singlecompositionviewerSingleOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -499,14 +483,6 @@ public class SingleCompositionViewerSamplePropertiesEditionPartImpl extends Comp
 	 */
 	public void setSinglecompositionviewerMultiRequiredProperty(EObject newValue) {
 		singlecompositionviewerMultiRequiredProperty.update(newValue);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.SingleCompositionViewerSample.Properties.singlecompositionviewerMultiRequiredProperty);
-		if (readOnly && singlecompositionviewerMultiRequiredProperty.isEnabled()) {
-			singlecompositionviewerMultiRequiredProperty.setEnabled(false);
-			singlecompositionviewerMultiRequiredProperty.setToolTipText(EefnrMessages.SingleCompositionViewerSample_ReadOnly);
-		} else if (!readOnly && !singlecompositionviewerMultiRequiredProperty.isEnabled()) {
-			singlecompositionviewerMultiRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -551,14 +527,6 @@ public class SingleCompositionViewerSamplePropertiesEditionPartImpl extends Comp
 	 */
 	public void setSinglecompositionviewerMultiOptionalProperty(EObject newValue) {
 		singlecompositionviewerMultiOptionalProperty.update(newValue);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.SingleCompositionViewerSample.Properties.singlecompositionviewerMultiOptionalProperty);
-		if (readOnly && singlecompositionviewerMultiOptionalProperty.isEnabled()) {
-			singlecompositionviewerMultiOptionalProperty.setEnabled(false);
-			singlecompositionviewerMultiOptionalProperty.setToolTipText(EefnrMessages.SingleCompositionViewerSample_ReadOnly);
-		} else if (!readOnly && !singlecompositionviewerMultiOptionalProperty.isEnabled()) {
-			singlecompositionviewerMultiOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -603,9 +571,6 @@ public class SingleCompositionViewerSamplePropertiesEditionPartImpl extends Comp
 	 */
 	public void setSinglecompositionviewerSingleROProperty(EObject newValue) {
 		singlecompositionviewerSingleROProperty.update(newValue);
-		singlecompositionviewerSingleROProperty.setEnabled(false);
-		singlecompositionviewerSingleROProperty.setToolTipText(EefnrMessages.SingleCompositionViewerSample_ReadOnly);
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionEditorSamplePropertiesEditionPartImpl.java
index cc037390b..066f95581 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionEditorSamplePropertiesEditionPartImpl.java
@@ -63,21 +63,12 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 	protected TableViewer tablecompositionRequiredProperty;
 	protected List<ViewerFilter> tablecompositionRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> tablecompositionRequiredPropertyFilters = new ArrayList<ViewerFilter>();
-	protected Button addTablecompositionRequiredProperty;
-	protected Button removeTablecompositionRequiredProperty;
-	protected Button editTablecompositionRequiredProperty;
 	protected TableViewer tablecompositionOptionalProperty;
 	protected List<ViewerFilter> tablecompositionOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new ArrayList<ViewerFilter>();
-	protected Button addTablecompositionOptionalProperty;
-	protected Button removeTablecompositionOptionalProperty;
-	protected Button editTablecompositionOptionalProperty;
 	protected TableViewer tablecompositionROProperty;
 	protected List<ViewerFilter> tablecompositionROPropertyBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> tablecompositionROPropertyFilters = new ArrayList<ViewerFilter>();
-	protected Button addTablecompositionROProperty;
-	protected Button removeTablecompositionROProperty;
-	protected Button editTablecompositionROProperty;
 
 
 
@@ -256,7 +247,7 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		GridLayout tablecompositionRequiredPropertyPanelLayout = new GridLayout();
 		tablecompositionRequiredPropertyPanelLayout.numColumns = 1;
 		tablecompositionRequiredPropertyPanel.setLayout(tablecompositionRequiredPropertyPanelLayout);
-		addTablecompositionRequiredProperty = new Button(tablecompositionRequiredPropertyPanel, SWT.NONE);
+		Button addTablecompositionRequiredProperty = new Button(tablecompositionRequiredPropertyPanel, SWT.NONE);
 		addTablecompositionRequiredProperty.setText(EefnrMessages.PropertiesEditionPart_AddTableViewerLabel);
 		GridData addTablecompositionRequiredPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		addTablecompositionRequiredProperty.setLayoutData(addTablecompositionRequiredPropertyData);
@@ -275,7 +266,7 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		});
 		EditingUtils.setID(addTablecompositionRequiredProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(addTablecompositionRequiredProperty, "eef::TableComposition::addbutton"); //$NON-NLS-1$
-		removeTablecompositionRequiredProperty = new Button(tablecompositionRequiredPropertyPanel, SWT.NONE);
+		Button removeTablecompositionRequiredProperty = new Button(tablecompositionRequiredPropertyPanel, SWT.NONE);
 		removeTablecompositionRequiredProperty.setText(EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel);
 		GridData removeTablecompositionRequiredPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		removeTablecompositionRequiredProperty.setLayoutData(removeTablecompositionRequiredPropertyData);
@@ -301,7 +292,7 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		});
 		EditingUtils.setID(removeTablecompositionRequiredProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(removeTablecompositionRequiredProperty, "eef::TableComposition::removebutton"); //$NON-NLS-1$
-		editTablecompositionRequiredProperty = new Button(tablecompositionRequiredPropertyPanel, SWT.NONE);
+		Button editTablecompositionRequiredProperty = new Button(tablecompositionRequiredPropertyPanel, SWT.NONE);
 		editTablecompositionRequiredProperty.setText(EefnrMessages.PropertiesEditionPart_EditTableViewerLabel);
 		GridData editTablecompositionRequiredPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		editTablecompositionRequiredProperty.setLayoutData(editTablecompositionRequiredPropertyData);
@@ -427,7 +418,7 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		GridLayout tablecompositionOptionalPropertyPanelLayout = new GridLayout();
 		tablecompositionOptionalPropertyPanelLayout.numColumns = 1;
 		tablecompositionOptionalPropertyPanel.setLayout(tablecompositionOptionalPropertyPanelLayout);
-		addTablecompositionOptionalProperty = new Button(tablecompositionOptionalPropertyPanel, SWT.NONE);
+		Button addTablecompositionOptionalProperty = new Button(tablecompositionOptionalPropertyPanel, SWT.NONE);
 		addTablecompositionOptionalProperty.setText(EefnrMessages.PropertiesEditionPart_AddTableViewerLabel);
 		GridData addTablecompositionOptionalPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		addTablecompositionOptionalProperty.setLayoutData(addTablecompositionOptionalPropertyData);
@@ -446,7 +437,7 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		});
 		EditingUtils.setID(addTablecompositionOptionalProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(addTablecompositionOptionalProperty, "eef::TableComposition::addbutton"); //$NON-NLS-1$
-		removeTablecompositionOptionalProperty = new Button(tablecompositionOptionalPropertyPanel, SWT.NONE);
+		Button removeTablecompositionOptionalProperty = new Button(tablecompositionOptionalPropertyPanel, SWT.NONE);
 		removeTablecompositionOptionalProperty.setText(EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel);
 		GridData removeTablecompositionOptionalPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		removeTablecompositionOptionalProperty.setLayoutData(removeTablecompositionOptionalPropertyData);
@@ -472,7 +463,7 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		});
 		EditingUtils.setID(removeTablecompositionOptionalProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(removeTablecompositionOptionalProperty, "eef::TableComposition::removebutton"); //$NON-NLS-1$
-		editTablecompositionOptionalProperty = new Button(tablecompositionOptionalPropertyPanel, SWT.NONE);
+		Button editTablecompositionOptionalProperty = new Button(tablecompositionOptionalPropertyPanel, SWT.NONE);
 		editTablecompositionOptionalProperty.setText(EefnrMessages.PropertiesEditionPart_EditTableViewerLabel);
 		GridData editTablecompositionOptionalPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		editTablecompositionOptionalProperty.setLayoutData(editTablecompositionOptionalPropertyData);
@@ -514,6 +505,8 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		tableContainer.setLayout(tableContainerLayout);
 		org.eclipse.swt.widgets.Table tableTablecompositionROProperty = new org.eclipse.swt.widgets.Table(tableContainer, SWT.FULL_SELECTION);
 		tableTablecompositionROProperty.setHeaderVisible(true);
+		tableTablecompositionROProperty.setEnabled(false);
+		tableTablecompositionROProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
 		GridData gdTablecompositionROProperty = new GridData();
 		gdTablecompositionROProperty.grabExcessHorizontalSpace = true;
 		gdTablecompositionROProperty.horizontalAlignment = GridData.FILL;
@@ -598,8 +591,10 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		GridLayout tablecompositionROPropertyPanelLayout = new GridLayout();
 		tablecompositionROPropertyPanelLayout.numColumns = 1;
 		tablecompositionROPropertyPanel.setLayout(tablecompositionROPropertyPanelLayout);
-		addTablecompositionROProperty = new Button(tablecompositionROPropertyPanel, SWT.NONE);
+		Button addTablecompositionROProperty = new Button(tablecompositionROPropertyPanel, SWT.NONE);
 		addTablecompositionROProperty.setText(EefnrMessages.PropertiesEditionPart_AddTableViewerLabel);
+		addTablecompositionROProperty.setEnabled(false);
+		addTablecompositionROProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
 		GridData addTablecompositionROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		addTablecompositionROProperty.setLayoutData(addTablecompositionROPropertyData);
 		addTablecompositionROProperty.addSelectionListener(new SelectionAdapter() {
@@ -617,8 +612,10 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		});
 		EditingUtils.setID(addTablecompositionROProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionROProperty);
 		EditingUtils.setEEFtype(addTablecompositionROProperty, "eef::TableComposition::addbutton"); //$NON-NLS-1$
-		removeTablecompositionROProperty = new Button(tablecompositionROPropertyPanel, SWT.NONE);
+		Button removeTablecompositionROProperty = new Button(tablecompositionROPropertyPanel, SWT.NONE);
 		removeTablecompositionROProperty.setText(EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel);
+		removeTablecompositionROProperty.setEnabled(false);
+		removeTablecompositionROProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
 		GridData removeTablecompositionROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		removeTablecompositionROProperty.setLayoutData(removeTablecompositionROPropertyData);
 		removeTablecompositionROProperty.addSelectionListener(new SelectionAdapter() {
@@ -643,8 +640,10 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		});
 		EditingUtils.setID(removeTablecompositionROProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionROProperty);
 		EditingUtils.setEEFtype(removeTablecompositionROProperty, "eef::TableComposition::removebutton"); //$NON-NLS-1$
-		editTablecompositionROProperty = new Button(tablecompositionROPropertyPanel, SWT.NONE);
+		Button editTablecompositionROProperty = new Button(tablecompositionROPropertyPanel, SWT.NONE);
 		editTablecompositionROProperty.setText(EefnrMessages.PropertiesEditionPart_EditTableViewerLabel);
+		editTablecompositionROProperty.setEnabled(false);
+		editTablecompositionROProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
 		GridData editTablecompositionROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		editTablecompositionROProperty.setLayoutData(editTablecompositionROPropertyData);
 		editTablecompositionROProperty.addSelectionListener(new SelectionAdapter() {
@@ -697,23 +696,6 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		tablecompositionRequiredProperty.setContentProvider(contentProvider);
 		tablecompositionRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty);
-		if (readOnly && tablecompositionRequiredProperty.getTable().isEnabled()) {
-			tablecompositionRequiredProperty.getTable().setEnabled(false);
-			tablecompositionRequiredProperty.getTable().setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-			addTablecompositionRequiredProperty.setEnabled(false);
-			addTablecompositionRequiredProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-			removeTablecompositionRequiredProperty.setEnabled(false);
-			removeTablecompositionRequiredProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-			editTablecompositionRequiredProperty.setEnabled(false);
-			editTablecompositionRequiredProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-		} else if (!readOnly && !tablecompositionRequiredProperty.getTable().isEnabled()) {
-			tablecompositionRequiredProperty.getTable().setEnabled(true);
-			addTablecompositionRequiredProperty.setEnabled(true);
-			removeTablecompositionRequiredProperty.setEnabled(true);
-			editTablecompositionRequiredProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -772,23 +754,6 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		tablecompositionOptionalProperty.setContentProvider(contentProvider);
 		tablecompositionOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionOptionalProperty);
-		if (readOnly && tablecompositionOptionalProperty.getTable().isEnabled()) {
-			tablecompositionOptionalProperty.getTable().setEnabled(false);
-			tablecompositionOptionalProperty.getTable().setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-			addTablecompositionOptionalProperty.setEnabled(false);
-			addTablecompositionOptionalProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-			removeTablecompositionOptionalProperty.setEnabled(false);
-			removeTablecompositionOptionalProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-			editTablecompositionOptionalProperty.setEnabled(false);
-			editTablecompositionOptionalProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-		} else if (!readOnly && !tablecompositionOptionalProperty.getTable().isEnabled()) {
-			tablecompositionOptionalProperty.getTable().setEnabled(true);
-			addTablecompositionOptionalProperty.setEnabled(true);
-			removeTablecompositionOptionalProperty.setEnabled(true);
-			editTablecompositionOptionalProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -847,15 +812,6 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		tablecompositionROProperty.setContentProvider(contentProvider);
 		tablecompositionROProperty.setInput(settings);
-		tablecompositionROProperty.getTable().setEnabled(false);
-		tablecompositionROProperty.getTable().setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-		addTablecompositionROProperty.setEnabled(false);
-		addTablecompositionROProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-		removeTablecompositionROProperty.setEnabled(false);
-		removeTablecompositionROProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-		editTablecompositionROProperty.setEnabled(false);
-		editTablecompositionROProperty.setToolTipText(EefnrMessages.TableCompositionEditorSample_ReadOnly);
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionExtensionEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionExtensionEditorSamplePropertiesEditionPartImpl.java
index 8dbe8fc1d..fa8d73047 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionExtensionEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionExtensionEditorSamplePropertiesEditionPartImpl.java
@@ -321,14 +321,6 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartImpl exte
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(EefnrMessages.TableCompositionExtensionEditorSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
@@ -344,14 +336,6 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartImpl exte
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		tablecompositionRequiredProperty.setContentProvider(contentProvider);
 		tablecompositionRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.tablecompositionRequiredProperty);
-		if (readOnly && tablecompositionRequiredProperty.isEnabled()) {
-			tablecompositionRequiredProperty.setEnabled(false);
-			tablecompositionRequiredProperty.setToolTipText(EefnrMessages.TableCompositionExtensionEditorSample_ReadOnly);
-		} else if (!readOnly && !tablecompositionRequiredProperty.isEnabled()) {
-			tablecompositionRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -410,14 +394,6 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartImpl exte
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		tablecompositionOptionalProperty.setContentProvider(contentProvider);
 		tablecompositionOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.tablecompositionOptionalProperty);
-		if (readOnly && tablecompositionOptionalProperty.isEnabled()) {
-			tablecompositionOptionalProperty.setEnabled(false);
-			tablecompositionOptionalProperty.setToolTipText(EefnrMessages.TableCompositionExtensionEditorSample_ReadOnly);
-		} else if (!readOnly && !tablecompositionOptionalProperty.isEnabled()) {
-			tablecompositionOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleFirstTabPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleFirstTabPropertiesEditionPartImpl.java
index 450a9b986..7e07e8d26 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleFirstTabPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleFirstTabPropertiesEditionPartImpl.java
@@ -250,14 +250,6 @@ public class TextSampleFirstTabPropertiesEditionPartImpl extends CompositeProper
 		} else {
 			textRequiredPropertyInFirstTab.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextSampleFirstTab.Properties.textRequiredPropertyInFirstTab);
-		if (readOnly && textRequiredPropertyInFirstTab.isEnabled()) {
-			textRequiredPropertyInFirstTab.setEnabled(false);
-			textRequiredPropertyInFirstTab.setToolTipText(EefnrMessages.TextSampleFirstTab_ReadOnly);
-		} else if (!readOnly && !textRequiredPropertyInFirstTab.isEnabled()) {
-			textRequiredPropertyInFirstTab.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -282,14 +274,6 @@ public class TextSampleFirstTabPropertiesEditionPartImpl extends CompositeProper
 		} else {
 			textOptionalPropertyInFirstTab.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextSampleFirstTab.Properties.textOptionalPropertyInFirstTab);
-		if (readOnly && textOptionalPropertyInFirstTab.isEnabled()) {
-			textOptionalPropertyInFirstTab.setEnabled(false);
-			textOptionalPropertyInFirstTab.setToolTipText(EefnrMessages.TextSampleFirstTab_ReadOnly);
-		} else if (!readOnly && !textOptionalPropertyInFirstTab.isEnabled()) {
-			textOptionalPropertyInFirstTab.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSamplePropertiesEditionPartImpl.java
index 106314f4c..134d6f215 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSamplePropertiesEditionPartImpl.java
@@ -224,6 +224,8 @@ public class TextSamplePropertiesEditionPartImpl extends CompositePropertiesEdit
 	protected Composite createTextROPropertyText(Composite parent) {
 		createDescription(parent, EefnrViewsRepository.TextSample.Properties.textROProperty, EefnrMessages.TextSamplePropertiesEditionPart_TextROPropertyLabel);
 		textROProperty = SWTUtils.createScrollableText(parent, SWT.BORDER);
+		textROProperty.setEnabled(false);
+		textROProperty.setToolTipText(EefnrMessages.TextSample_ReadOnly);
 		GridData textROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		textROProperty.setLayoutData(textROPropertyData);
 		textROProperty.addFocusListener(new FocusAdapter() {
@@ -301,14 +303,6 @@ public class TextSamplePropertiesEditionPartImpl extends CompositePropertiesEdit
 		} else {
 			textRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextSample.Properties.textRequiredProperty);
-		if (readOnly && textRequiredProperty.isEnabled()) {
-			textRequiredProperty.setEnabled(false);
-			textRequiredProperty.setToolTipText(EefnrMessages.TextSample_ReadOnly);
-		} else if (!readOnly && !textRequiredProperty.isEnabled()) {
-			textRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -333,14 +327,6 @@ public class TextSamplePropertiesEditionPartImpl extends CompositePropertiesEdit
 		} else {
 			textOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextSample.Properties.textOptionalProperty);
-		if (readOnly && textOptionalProperty.isEnabled()) {
-			textOptionalProperty.setEnabled(false);
-			textOptionalProperty.setToolTipText(EefnrMessages.TextSample_ReadOnly);
-		} else if (!readOnly && !textOptionalProperty.isEnabled()) {
-			textOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -365,9 +351,6 @@ public class TextSamplePropertiesEditionPartImpl extends CompositePropertiesEdit
 		} else {
 			textROProperty.setText(""); //$NON-NLS-1$
 		}
-		textROProperty.setEnabled(false);
-		textROProperty.setToolTipText(EefnrMessages.TextSample_ReadOnly);
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleSecondTabPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleSecondTabPropertiesEditionPartImpl.java
index 6b6dfc925..9a0edf2b6 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleSecondTabPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleSecondTabPropertiesEditionPartImpl.java
@@ -250,14 +250,6 @@ public class TextSampleSecondTabPropertiesEditionPartImpl extends CompositePrope
 		} else {
 			textRequiredPropertyInSecondTab.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextSampleSecondTab.Properties.textRequiredPropertyInSecondTab);
-		if (readOnly && textRequiredPropertyInSecondTab.isEnabled()) {
-			textRequiredPropertyInSecondTab.setEnabled(false);
-			textRequiredPropertyInSecondTab.setToolTipText(EefnrMessages.TextSampleSecondTab_ReadOnly);
-		} else if (!readOnly && !textRequiredPropertyInSecondTab.isEnabled()) {
-			textRequiredPropertyInSecondTab.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -282,14 +274,6 @@ public class TextSampleSecondTabPropertiesEditionPartImpl extends CompositePrope
 		} else {
 			textOptionalPropertyInSecondTab.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextSampleSecondTab.Properties.textOptionalPropertyInSecondTab);
-		if (readOnly && textOptionalPropertyInSecondTab.isEnabled()) {
-			textOptionalPropertyInSecondTab.setEnabled(false);
-			textOptionalPropertyInSecondTab.setToolTipText(EefnrMessages.TextSampleSecondTab_ReadOnly);
-		} else if (!readOnly && !textOptionalPropertyInSecondTab.isEnabled()) {
-			textOptionalPropertyInSecondTab.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextareaSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextareaSamplePropertiesEditionPartImpl.java
index 9f1bd7961..3a05aed1c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextareaSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextareaSamplePropertiesEditionPartImpl.java
@@ -200,6 +200,8 @@ public class TextareaSamplePropertiesEditionPartImpl extends CompositeProperties
 		textareaROPropertyLabelData.horizontalSpan = 3;
 		textareaROPropertyLabel.setLayoutData(textareaROPropertyLabelData);
 		textareaROProperty = SWTUtils.createScrollableText(parent, SWT.BORDER | SWT.WRAP | SWT.MULTI | SWT.V_SCROLL);
+		textareaROProperty.setEnabled(false);
+		textareaROProperty.setToolTipText(EefnrMessages.TextareaSample_ReadOnly);
 		GridData textareaROPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		textareaROPropertyData.horizontalSpan = 2;
 		textareaROPropertyData.heightHint = 80;
@@ -260,15 +262,6 @@ public class TextareaSamplePropertiesEditionPartImpl extends CompositeProperties
 		} else {
 			textareaRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextareaSample.Properties.textareaRequiredProperty);
-		if (readOnly && textareaRequiredProperty.isEnabled()) {
-			textareaRequiredProperty.setEnabled(false);
-			textareaRequiredProperty.setBackground(textareaRequiredProperty.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-			textareaRequiredProperty.setToolTipText(EefnrMessages.TextareaSample_ReadOnly);
-		} else if (!readOnly && !textareaRequiredProperty.isEnabled()) {
-			textareaRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -293,15 +286,6 @@ public class TextareaSamplePropertiesEditionPartImpl extends CompositeProperties
 		} else {
 			textareaOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TextareaSample.Properties.textareaOptionalProperty);
-		if (readOnly && textareaOptionalProperty.isEnabled()) {
-			textareaOptionalProperty.setEnabled(false);
-			textareaOptionalProperty.setBackground(textareaOptionalProperty.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-			textareaOptionalProperty.setToolTipText(EefnrMessages.TextareaSample_ReadOnly);
-		} else if (!readOnly && !textareaOptionalProperty.isEnabled()) {
-			textareaOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -326,10 +310,6 @@ public class TextareaSamplePropertiesEditionPartImpl extends CompositeProperties
 		} else {
 			textareaROProperty.setText(""); //$NON-NLS-1$
 		}
-		textareaROProperty.setEnabled(false);
-		textareaROProperty.setBackground(textareaROProperty.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-		textareaROProperty.setToolTipText(EefnrMessages.TextareaSample_ReadOnly);
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TotalSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TotalSamplePropertiesEditionPartImpl.java
index 5e8831195..dc648a710 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TotalSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TotalSamplePropertiesEditionPartImpl.java
@@ -121,15 +121,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 	protected TableViewer tablecompositionRequiredProperty;
 	protected List<ViewerFilter> tablecompositionRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> tablecompositionRequiredPropertyFilters = new ArrayList<ViewerFilter>();
-	protected Button addTablecompositionRequiredProperty;
-	protected Button removeTablecompositionRequiredProperty;
-	protected Button editTablecompositionRequiredProperty;
 	protected TableViewer tablecompositionOptionalProperty;
 	protected List<ViewerFilter> tablecompositionOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new ArrayList<ViewerFilter>();
-	protected Button addTablecompositionOptionalProperty;
-	protected Button removeTablecompositionOptionalProperty;
-	protected Button editTablecompositionOptionalProperty;
 	protected ReferencesTable advancedreferencestableRequiredProperty;
 	protected List<ViewerFilter> advancedreferencestableRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>();
 	protected List<ViewerFilter> advancedreferencestableRequiredPropertyFilters = new ArrayList<ViewerFilter>();
@@ -1055,7 +1049,7 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		GridLayout tablecompositionRequiredPropertyPanelLayout = new GridLayout();
 		tablecompositionRequiredPropertyPanelLayout.numColumns = 1;
 		tablecompositionRequiredPropertyPanel.setLayout(tablecompositionRequiredPropertyPanelLayout);
-		addTablecompositionRequiredProperty = new Button(tablecompositionRequiredPropertyPanel, SWT.NONE);
+		Button addTablecompositionRequiredProperty = new Button(tablecompositionRequiredPropertyPanel, SWT.NONE);
 		addTablecompositionRequiredProperty.setText(EefnrMessages.PropertiesEditionPart_AddTableViewerLabel);
 		GridData addTablecompositionRequiredPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		addTablecompositionRequiredProperty.setLayoutData(addTablecompositionRequiredPropertyData);
@@ -1074,7 +1068,7 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		EditingUtils.setID(addTablecompositionRequiredProperty, EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(addTablecompositionRequiredProperty, "eef::TableComposition::addbutton"); //$NON-NLS-1$
-		removeTablecompositionRequiredProperty = new Button(tablecompositionRequiredPropertyPanel, SWT.NONE);
+		Button removeTablecompositionRequiredProperty = new Button(tablecompositionRequiredPropertyPanel, SWT.NONE);
 		removeTablecompositionRequiredProperty.setText(EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel);
 		GridData removeTablecompositionRequiredPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		removeTablecompositionRequiredProperty.setLayoutData(removeTablecompositionRequiredPropertyData);
@@ -1100,7 +1094,7 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		EditingUtils.setID(removeTablecompositionRequiredProperty, EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(removeTablecompositionRequiredProperty, "eef::TableComposition::removebutton"); //$NON-NLS-1$
-		editTablecompositionRequiredProperty = new Button(tablecompositionRequiredPropertyPanel, SWT.NONE);
+		Button editTablecompositionRequiredProperty = new Button(tablecompositionRequiredPropertyPanel, SWT.NONE);
 		editTablecompositionRequiredProperty.setText(EefnrMessages.PropertiesEditionPart_EditTableViewerLabel);
 		GridData editTablecompositionRequiredPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		editTablecompositionRequiredProperty.setLayoutData(editTablecompositionRequiredPropertyData);
@@ -1226,7 +1220,7 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		GridLayout tablecompositionOptionalPropertyPanelLayout = new GridLayout();
 		tablecompositionOptionalPropertyPanelLayout.numColumns = 1;
 		tablecompositionOptionalPropertyPanel.setLayout(tablecompositionOptionalPropertyPanelLayout);
-		addTablecompositionOptionalProperty = new Button(tablecompositionOptionalPropertyPanel, SWT.NONE);
+		Button addTablecompositionOptionalProperty = new Button(tablecompositionOptionalPropertyPanel, SWT.NONE);
 		addTablecompositionOptionalProperty.setText(EefnrMessages.PropertiesEditionPart_AddTableViewerLabel);
 		GridData addTablecompositionOptionalPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		addTablecompositionOptionalProperty.setLayoutData(addTablecompositionOptionalPropertyData);
@@ -1245,7 +1239,7 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		EditingUtils.setID(addTablecompositionOptionalProperty, EefnrViewsRepository.TotalSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(addTablecompositionOptionalProperty, "eef::TableComposition::addbutton"); //$NON-NLS-1$
-		removeTablecompositionOptionalProperty = new Button(tablecompositionOptionalPropertyPanel, SWT.NONE);
+		Button removeTablecompositionOptionalProperty = new Button(tablecompositionOptionalPropertyPanel, SWT.NONE);
 		removeTablecompositionOptionalProperty.setText(EefnrMessages.PropertiesEditionPart_RemoveTableViewerLabel);
 		GridData removeTablecompositionOptionalPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		removeTablecompositionOptionalProperty.setLayoutData(removeTablecompositionOptionalPropertyData);
@@ -1271,7 +1265,7 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		EditingUtils.setID(removeTablecompositionOptionalProperty, EefnrViewsRepository.TotalSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(removeTablecompositionOptionalProperty, "eef::TableComposition::removebutton"); //$NON-NLS-1$
-		editTablecompositionOptionalProperty = new Button(tablecompositionOptionalPropertyPanel, SWT.NONE);
+		Button editTablecompositionOptionalProperty = new Button(tablecompositionOptionalPropertyPanel, SWT.NONE);
 		editTablecompositionOptionalProperty.setText(EefnrMessages.PropertiesEditionPart_EditTableViewerLabel);
 		GridData editTablecompositionOptionalPropertyData = new GridData(GridData.FILL_HORIZONTAL);
 		editTablecompositionOptionalProperty.setLayoutData(editTablecompositionOptionalPropertyData);
@@ -1686,14 +1680,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		} else {
 			textRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.textRequiredProperty);
-		if (readOnly && textRequiredProperty.isEnabled()) {
-			textRequiredProperty.setEnabled(false);
-			textRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !textRequiredProperty.isEnabled()) {
-			textRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1718,14 +1704,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		} else {
 			textOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.textOptionalProperty);
-		if (readOnly && textOptionalProperty.isEnabled()) {
-			textOptionalProperty.setEnabled(false);
-			textOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !textOptionalProperty.isEnabled()) {
-			textOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1750,14 +1728,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		} else {
 			checkboxRequiredProperty.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.checkboxRequiredProperty);
-		if (readOnly && checkboxRequiredProperty.isEnabled()) {
-			checkboxRequiredProperty.setEnabled(false);
-			checkboxRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !checkboxRequiredProperty.isEnabled()) {
-			checkboxRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1782,14 +1752,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		} else {
 			checkboxOptionalProperty.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.checkboxOptionalProperty);
-		if (readOnly && checkboxOptionalProperty.isEnabled()) {
-			checkboxOptionalProperty.setEnabled(false);
-			checkboxOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !checkboxOptionalProperty.isEnabled()) {
-			checkboxOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1814,14 +1776,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		} else {
 			textareaRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.textareaRequiredProperty);
-		if (readOnly && textareaRequiredProperty.isEnabled()) {
-			textareaRequiredProperty.setEnabled(false);
-			textareaRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !textareaRequiredProperty.isEnabled()) {
-			textareaRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1846,14 +1800,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		} else {
 			textareaOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.textareaOptionalProperty);
-		if (readOnly && textareaOptionalProperty.isEnabled()) {
-			textareaOptionalProperty.setEnabled(false);
-			textareaOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !textareaOptionalProperty.isEnabled()) {
-			textareaOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1875,14 +1821,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 	public void initRadioRequiredProperty(Object input, Enumerator current) {
 		radioRequiredProperty.setInput(input);
 		radioRequiredProperty.modelUpdating(new StructuredSelection(current));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.radioRequiredProperty);
-		if (readOnly && radioRequiredProperty.isEnabled()) {
-			radioRequiredProperty.setEnabled(false);
-			radioRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !radioRequiredProperty.isEnabled()) {
-			radioRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1893,14 +1831,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 	 */
 	public void setRadioRequiredProperty(Enumerator newValue) {
 		radioRequiredProperty.modelUpdating(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.radioRequiredProperty);
-		if (readOnly && radioRequiredProperty.isEnabled()) {
-			radioRequiredProperty.setEnabled(false);
-			radioRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !radioRequiredProperty.isEnabled()) {
-			radioRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1922,14 +1852,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 	public void initRadioOptionalProperty(Object input, Enumerator current) {
 		radioOptionalProperty.setInput(input);
 		radioOptionalProperty.modelUpdating(new StructuredSelection(current));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.radioOptionalProperty);
-		if (readOnly && radioOptionalProperty.isEnabled()) {
-			radioOptionalProperty.setEnabled(false);
-			radioOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !radioOptionalProperty.isEnabled()) {
-			radioOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1940,14 +1862,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 	 */
 	public void setRadioOptionalProperty(Enumerator newValue) {
 		radioOptionalProperty.modelUpdating(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.radioOptionalProperty);
-		if (readOnly && radioOptionalProperty.isEnabled()) {
-			radioOptionalProperty.setEnabled(false);
-			radioOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !radioOptionalProperty.isEnabled()) {
-			radioOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1975,14 +1889,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		if (current != null) {
 			eobjectflatcomboviewerRequiredProperty.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerRequiredProperty);
-		if (readOnly && eobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			eobjectflatcomboviewerRequiredProperty.setEnabled(false);
-			eobjectflatcomboviewerRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			eobjectflatcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -1997,14 +1903,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		} else {
 			eobjectflatcomboviewerRequiredProperty.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerRequiredProperty);
-		if (readOnly && eobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			eobjectflatcomboviewerRequiredProperty.setEnabled(false);
-			eobjectflatcomboviewerRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerRequiredProperty.isEnabled()) {
-			eobjectflatcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2061,14 +1959,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		if (current != null) {
 			eobjectflatcomboviewerOptionalProperty.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerOptionalProperty);
-		if (readOnly && eobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			eobjectflatcomboviewerOptionalProperty.setEnabled(false);
-			eobjectflatcomboviewerOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			eobjectflatcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2083,14 +1973,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		} else {
 			eobjectflatcomboviewerOptionalProperty.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerOptionalProperty);
-		if (readOnly && eobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			eobjectflatcomboviewerOptionalProperty.setEnabled(false);
-			eobjectflatcomboviewerOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !eobjectflatcomboviewerOptionalProperty.isEnabled()) {
-			eobjectflatcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2135,14 +2017,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		referencestableRequiredProperty.setContentProvider(contentProvider);
 		referencestableRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.referencestableRequiredProperty);
-		if (readOnly && referencestableRequiredProperty.getTable().isEnabled()) {
-			referencestableRequiredProperty.setEnabled(false);
-			referencestableRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !referencestableRequiredProperty.getTable().isEnabled()) {
-			referencestableRequiredProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2198,14 +2072,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		referencestableOptionalProperty.setContentProvider(contentProvider);
 		referencestableOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.referencestableOptionalProperty);
-		if (readOnly && referencestableOptionalProperty.getTable().isEnabled()) {
-			referencestableOptionalProperty.setEnabled(false);
-			referencestableOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !referencestableOptionalProperty.getTable().isEnabled()) {
-			referencestableOptionalProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2267,14 +2133,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 	public void initEmfcomboviewerRequiredProperty(Object input, Enumerator current) {
 		emfcomboviewerRequiredProperty.setInput(input);
 		emfcomboviewerRequiredProperty.modelUpdating(new StructuredSelection(current));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerRequiredProperty);
-		if (readOnly && emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(false);
-			emfcomboviewerRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2285,14 +2143,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 	 */
 	public void setEmfcomboviewerRequiredProperty(Enumerator newValue) {
 		emfcomboviewerRequiredProperty.modelUpdating(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerRequiredProperty);
-		if (readOnly && emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(false);
-			emfcomboviewerRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerRequiredProperty.isEnabled()) {
-			emfcomboviewerRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2314,14 +2164,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 	public void initEmfcomboviewerOptionalProperty(Object input, Enumerator current) {
 		emfcomboviewerOptionalProperty.setInput(input);
 		emfcomboviewerOptionalProperty.modelUpdating(new StructuredSelection(current));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerOptionalProperty);
-		if (readOnly && emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(false);
-			emfcomboviewerOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2332,14 +2174,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 	 */
 	public void setEmfcomboviewerOptionalProperty(Enumerator newValue) {
 		emfcomboviewerOptionalProperty.modelUpdating(new StructuredSelection(newValue));
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerOptionalProperty);
-		if (readOnly && emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(false);
-			emfcomboviewerOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !emfcomboviewerOptionalProperty.isEnabled()) {
-			emfcomboviewerOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2365,14 +2199,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		} else {
 			multivaluededitorRequiredProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.multivaluededitorRequiredProperty);
-		if (readOnly && multivaluededitorRequiredProperty.isEnabled()) {
-			multivaluededitorRequiredProperty.setEnabled(false);
-			multivaluededitorRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !multivaluededitorRequiredProperty.isEnabled()) {
-			multivaluededitorRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	public void addToMultivaluededitorRequiredProperty(Object newValue) {
@@ -2416,14 +2242,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		} else {
 			multivaluededitorOptionalProperty.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.multivaluededitorOptionalProperty);
-		if (readOnly && multivaluededitorOptionalProperty.isEnabled()) {
-			multivaluededitorOptionalProperty.setEnabled(false);
-			multivaluededitorOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !multivaluededitorOptionalProperty.isEnabled()) {
-			multivaluededitorOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	public void addToMultivaluededitorOptionalProperty(Object newValue) {
@@ -2457,23 +2275,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		tablecompositionRequiredProperty.setContentProvider(contentProvider);
 		tablecompositionRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty);
-		if (readOnly && tablecompositionRequiredProperty.getTable().isEnabled()) {
-			tablecompositionRequiredProperty.getTable().setEnabled(false);
-			tablecompositionRequiredProperty.getTable().setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-			addTablecompositionRequiredProperty.setEnabled(false);
-			addTablecompositionRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-			removeTablecompositionRequiredProperty.setEnabled(false);
-			removeTablecompositionRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-			editTablecompositionRequiredProperty.setEnabled(false);
-			editTablecompositionRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !tablecompositionRequiredProperty.getTable().isEnabled()) {
-			tablecompositionRequiredProperty.getTable().setEnabled(true);
-			addTablecompositionRequiredProperty.setEnabled(true);
-			removeTablecompositionRequiredProperty.setEnabled(true);
-			editTablecompositionRequiredProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2532,23 +2333,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		tablecompositionOptionalProperty.setContentProvider(contentProvider);
 		tablecompositionOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.tablecompositionOptionalProperty);
-		if (readOnly && tablecompositionOptionalProperty.getTable().isEnabled()) {
-			tablecompositionOptionalProperty.getTable().setEnabled(false);
-			tablecompositionOptionalProperty.getTable().setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-			addTablecompositionOptionalProperty.setEnabled(false);
-			addTablecompositionOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-			removeTablecompositionOptionalProperty.setEnabled(false);
-			removeTablecompositionOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-			editTablecompositionOptionalProperty.setEnabled(false);
-			editTablecompositionOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !tablecompositionOptionalProperty.getTable().isEnabled()) {
-			tablecompositionOptionalProperty.getTable().setEnabled(true);
-			addTablecompositionOptionalProperty.setEnabled(true);
-			removeTablecompositionOptionalProperty.setEnabled(true);
-			editTablecompositionOptionalProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2607,14 +2391,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedreferencestableRequiredProperty.setContentProvider(contentProvider);
 		advancedreferencestableRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedreferencestableRequiredProperty);
-		if (readOnly && advancedreferencestableRequiredProperty.getTable().isEnabled()) {
-			advancedreferencestableRequiredProperty.setEnabled(false);
-			advancedreferencestableRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedreferencestableRequiredProperty.getTable().isEnabled()) {
-			advancedreferencestableRequiredProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2670,14 +2446,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedreferencestableOptionalProperty.setContentProvider(contentProvider);
 		advancedreferencestableOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedreferencestableOptionalProperty);
-		if (readOnly && advancedreferencestableOptionalProperty.getTable().isEnabled()) {
-			advancedreferencestableOptionalProperty.setEnabled(false);
-			advancedreferencestableOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedreferencestableOptionalProperty.getTable().isEnabled()) {
-			advancedreferencestableOptionalProperty.setEnabled(true);
-		}
-		
 	}
 
 	/**
@@ -2745,14 +2513,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		if (current != null) {
 			advancedeobjectflatcomboviewerRequiredPropery.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerRequiredPropery);
-		if (readOnly && advancedeobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredPropery.setEnabled(false);
-			advancedeobjectflatcomboviewerRequiredPropery.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2767,14 +2527,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		} else {
 			advancedeobjectflatcomboviewerRequiredPropery.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerRequiredPropery);
-		if (readOnly && advancedeobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredPropery.setEnabled(false);
-			advancedeobjectflatcomboviewerRequiredPropery.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerRequiredPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerRequiredPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2831,14 +2583,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		if (current != null) {
 			advancedeobjectflatcomboviewerOptionalPropery.setSelection(new StructuredSelection(settings.getValue()));
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerOptionalPropery);
-		if (readOnly && advancedeobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalPropery.setEnabled(false);
-			advancedeobjectflatcomboviewerOptionalPropery.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2853,14 +2597,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		} else {
 			advancedeobjectflatcomboviewerOptionalPropery.setSelection(new StructuredSelection()); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerOptionalPropery);
-		if (readOnly && advancedeobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalPropery.setEnabled(false);
-			advancedeobjectflatcomboviewerOptionalPropery.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedeobjectflatcomboviewerOptionalPropery.isEnabled()) {
-			advancedeobjectflatcomboviewerOptionalPropery.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2905,14 +2641,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedtablecompositionRequiredProperty.setContentProvider(contentProvider);
 		advancedtablecompositionRequiredProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionRequiredProperty);
-		if (readOnly && advancedtablecompositionRequiredProperty.isEnabled()) {
-			advancedtablecompositionRequiredProperty.setEnabled(false);
-			advancedtablecompositionRequiredProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedtablecompositionRequiredProperty.isEnabled()) {
-			advancedtablecompositionRequiredProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -2971,14 +2699,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		advancedtablecompositionOptionalProperty.setContentProvider(contentProvider);
 		advancedtablecompositionOptionalProperty.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionOptionalProperty);
-		if (readOnly && advancedtablecompositionOptionalProperty.isEnabled()) {
-			advancedtablecompositionOptionalProperty.setEnabled(false);
-			advancedtablecompositionOptionalProperty.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !advancedtablecompositionOptionalProperty.isEnabled()) {
-			advancedtablecompositionOptionalProperty.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -3046,14 +2766,6 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrViewsRepository.TotalSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(EefnrMessages.TotalSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/EefnrMessages.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/EefnrMessages.java
index 08538ac8f..104d2ae02 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/EefnrMessages.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/EefnrMessages.java
@@ -401,6 +401,12 @@ public class EefnrMessages extends NLS {
 	public static String AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerROPropertyLabel;
 
 	
+	public static String AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerCompoRequiredPropertyLabel;
+
+	
+	public static String AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerCompoOptionalPropertyLabel;
+
+	
 	public static String AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionRequiredPropertyLabel;
 
 	
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/eefnrMessages.properties b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/eefnrMessages.properties
index 067650351..901eefe81 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/eefnrMessages.properties
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/eefnrMessages.properties
@@ -140,6 +140,8 @@ AdvancedReferencesTableSamplePropertiesEditionPart_AdvancedreferencestableROProp
 AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerRequiredPropertyLabel=AdvancedeobjectflatcomboviewerRequiredProperty : 
 AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerOptionalPropertyLabel=AdvancedeobjectflatcomboviewerOptionalProperty : 
 AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerROPropertyLabel=AdvancedeobjectflatcomboviewerROProperty : 
+AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerCompoRequiredPropertyLabel=AdvancedeobjectflatcomboviewerCompoRequiredProperty : 
+AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerCompoOptionalPropertyLabel=AdvancedeobjectflatcomboviewerCompoOptionalProperty : 
 AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionRequiredPropertyLabel=AdvancedtablecompositionRequiredProperty : 
 AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionOptionalPropertyLabel=AdvancedtablecompositionOptionalProperty : 
 AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionROPropertyLabel=AdvancedtablecompositionROProperty : 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/eefnrMessages_fr.properties b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/eefnrMessages_fr.properties
index e54808d45..1be3c266c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/eefnrMessages_fr.properties
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/eefnrMessages_fr.properties
@@ -140,6 +140,8 @@ AdvancedReferencesTableSamplePropertiesEditionPart_AdvancedreferencestableROProp
 AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerRequiredPropertyLabel=AdvancedeobjectflatcomboviewerRequiredProperty : 
 AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerOptionalPropertyLabel=AdvancedeobjectflatcomboviewerOptionalProperty : 
 AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerROPropertyLabel=AdvancedeobjectflatcomboviewerROProperty : 
+AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerCompoRequiredPropertyLabel=AdvancedeobjectflatcomboviewerCompoRequiredProperty : 
+AdvancedEObjectFlatComboViewerSamplePropertiesEditionPart_AdvancedeobjectflatcomboviewerCompoOptionalPropertyLabel=AdvancedeobjectflatcomboviewerCompoOptionalProperty : 
 AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionRequiredPropertyLabel=AdvancedtablecompositionRequiredProperty : 
 AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionOptionalPropertyLabel=AdvancedtablecompositionOptionalProperty : 
 AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionROPropertyLabel=AdvancedtablecompositionROProperty : 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractEnabledSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractEnabledSamplePropertiesEditionPartForm.java
index 97e52d4d4..8ce8ef8d6 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractEnabledSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractEnabledSamplePropertiesEditionPartForm.java
@@ -207,14 +207,6 @@ public class AbstractEnabledSamplePropertiesEditionPartForm extends SectionPrope
 		} else {
 			enabled.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(ReferencesViewsRepository.AbstractEnabledSample.EnabledProperties.enabled);
-		if (readOnly && enabled.isEnabled()) {
-			enabled.setEnabled(false);
-			enabled.setToolTipText(ReferencesMessages.AbstractEnabledSample_ReadOnly);
-		} else if (!readOnly && !enabled.isEnabled()) {
-			enabled.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractSamplePropertiesEditionPartForm.java
index 44b282a1e..9174ef26b 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractSamplePropertiesEditionPartForm.java
@@ -230,14 +230,6 @@ public class AbstractSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(ReferencesViewsRepository.AbstractSample.NameProperties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(ReferencesMessages.AbstractSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/ReferenceEnabledSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/ReferenceEnabledSamplePropertiesEditionPartForm.java
index 06106d531..93d24d854 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/ReferenceEnabledSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/ReferenceEnabledSamplePropertiesEditionPartForm.java
@@ -266,14 +266,6 @@ public class ReferenceEnabledSamplePropertiesEditionPartForm extends SectionProp
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		reference.setContentProvider(contentProvider);
 		reference.setInput(settings);
-		boolean readOnly = isReadOnly(ReferencesViewsRepository.ReferenceEnabledSample.Properties.reference);
-		if (readOnly && reference.getTable().isEnabled()) {
-			reference.setEnabled(false);
-			reference.setToolTipText(ReferencesMessages.ReferenceEnabledSample_ReadOnly);
-		} else if (!readOnly && !reference.getTable().isEnabled()) {
-			reference.setEnabled(true);
-		}
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractEnabledSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractEnabledSamplePropertiesEditionPartImpl.java
index 1f50e33ff..4c74222cd 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractEnabledSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractEnabledSamplePropertiesEditionPartImpl.java
@@ -195,14 +195,6 @@ public class AbstractEnabledSamplePropertiesEditionPartImpl extends CompositePro
 		} else {
 			enabled.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(ReferencesViewsRepository.AbstractEnabledSample.EnabledProperties.enabled);
-		if (readOnly && enabled.isEnabled()) {
-			enabled.setEnabled(false);
-			enabled.setToolTipText(ReferencesMessages.AbstractEnabledSample_ReadOnly);
-		} else if (!readOnly && !enabled.isEnabled()) {
-			enabled.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractSamplePropertiesEditionPartImpl.java
index f7c3d9b62..2144c5bae 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractSamplePropertiesEditionPartImpl.java
@@ -199,14 +199,6 @@ public class AbstractSamplePropertiesEditionPartImpl extends CompositeProperties
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(ReferencesViewsRepository.AbstractSample.NameProperties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(ReferencesMessages.AbstractSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/ReferenceEnabledSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/ReferenceEnabledSamplePropertiesEditionPartImpl.java
index 45b12c78d..7e181ad7f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/ReferenceEnabledSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/ReferenceEnabledSamplePropertiesEditionPartImpl.java
@@ -256,14 +256,6 @@ public class ReferenceEnabledSamplePropertiesEditionPartImpl extends CompositePr
 		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
 		reference.setContentProvider(contentProvider);
 		reference.setInput(settings);
-		boolean readOnly = isReadOnly(ReferencesViewsRepository.ReferenceEnabledSample.Properties.reference);
-		if (readOnly && reference.getTable().isEnabled()) {
-			reference.setEnabled(false);
-			reference.setToolTipText(ReferencesMessages.ReferenceEnabledSample_ReadOnly);
-		} else if (!readOnly && !reference.getTable().isEnabled()) {
-			reference.setEnabled(true);
-		}
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/CheckBoxExtendedEditorSampleBasePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/CheckBoxExtendedEditorSampleBasePropertiesEditionComponent.java
index c62598827..ac4e6fbde 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/CheckBoxExtendedEditorSampleBasePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/CheckBoxExtendedEditorSampleBasePropertiesEditionComponent.java
@@ -68,7 +68,6 @@ public class CheckBoxExtendedEditorSampleBasePropertiesEditionComponent extends
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final CheckBoxExtendedEditorSample checkBoxExtendedEditorSample = (CheckBoxExtendedEditorSample)elt;
 			final CheckBoxExtendedEditorSamplePropertiesEditionPart basePart = (CheckBoxExtendedEditorSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -119,7 +118,6 @@ public class CheckBoxExtendedEditorSampleBasePropertiesEditionComponent extends
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			CheckBoxExtendedEditorSamplePropertiesEditionPart basePart = (CheckBoxExtendedEditorSamplePropertiesEditionPart)editingPart;
 			if (EefnrextPackage.eINSTANCE.getCheckBoxExtendedEditorSample_CheckboxEditorSample().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(EefnrextViewsRepository.CheckBoxExtendedEditorSample.Properties.checkboxEditorSample))
@@ -176,7 +174,4 @@ public class CheckBoxExtendedEditorSampleBasePropertiesEditionComponent extends
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleBasePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleBasePropertiesEditionComponent.java
index 4956de2b9..6de4943e2 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleBasePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleBasePropertiesEditionComponent.java
@@ -78,7 +78,6 @@ public class FlatReferenceExtendedEditorSampleBasePropertiesEditionComponent ext
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final FlatReferenceExtendedEditorSample flatReferenceExtendedEditorSample = (FlatReferenceExtendedEditorSample)elt;
 			final FlatReferenceExtendedEditorSamplePropertiesEditionPart basePart = (FlatReferenceExtendedEditorSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -150,7 +149,6 @@ public class FlatReferenceExtendedEditorSampleBasePropertiesEditionComponent ext
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			FlatReferenceExtendedEditorSamplePropertiesEditionPart basePart = (FlatReferenceExtendedEditorSamplePropertiesEditionPart)editingPart;
 			if (EefnrextPackage.eINSTANCE.getFlatReferenceExtendedEditorSample_FlatReferenceEditorSample().equals(msg.getFeature()) && isAccessible(EefnrextViewsRepository.FlatReferenceExtendedEditorSample.Properties.flatReferenceEditorSample))
@@ -209,7 +207,4 @@ public class FlatReferenceExtendedEditorSampleBasePropertiesEditionComponent ext
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleSecondFlatReferenceExtendedEditorSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleSecondFlatReferenceExtendedEditorSamplePropertiesEditionComponent.java
index 13fce6453..7ef33548a 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleSecondFlatReferenceExtendedEditorSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleSecondFlatReferenceExtendedEditorSamplePropertiesEditionComponent.java
@@ -68,11 +68,10 @@ public class FlatReferenceExtendedEditorSampleSecondFlatReferenceExtendedEditorS
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final FlatReferenceExtendedEditorSample flatReferenceExtendedEditorSample = (FlatReferenceExtendedEditorSample)elt;
 			final SecondFlatReferenceExtendedEditorSamplePropertiesEditionPart secondFlatReferenceExtendedEditorSamplePart = (SecondFlatReferenceExtendedEditorSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.demo))
+			if (flatReferenceExtendedEditorSample.getDemo() != null && isAccessible(EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.demo))
 				secondFlatReferenceExtendedEditorSamplePart.setDemo(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, flatReferenceExtendedEditorSample.getDemo()));
 			
 			if (isAccessible(EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.size)) {
@@ -128,7 +127,6 @@ public class FlatReferenceExtendedEditorSampleSecondFlatReferenceExtendedEditorS
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			SecondFlatReferenceExtendedEditorSamplePropertiesEditionPart secondFlatReferenceExtendedEditorSamplePart = (SecondFlatReferenceExtendedEditorSamplePropertiesEditionPart)editingPart;
 			if (EefnrextPackage.eINSTANCE.getFlatReferenceExtendedEditorSample_Demo().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && secondFlatReferenceExtendedEditorSamplePart != null && isAccessible(EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.demo)) {
@@ -206,7 +204,4 @@ public class FlatReferenceExtendedEditorSampleSecondFlatReferenceExtendedEditorS
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/TableCompositionTargetExtensionEditorSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/TableCompositionTargetExtensionEditorSamplePropertiesEditionComponent.java
index 6600c42ef..9b5c42593 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/TableCompositionTargetExtensionEditorSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/TableCompositionTargetExtensionEditorSamplePropertiesEditionComponent.java
@@ -69,11 +69,10 @@ public class TableCompositionTargetExtensionEditorSamplePropertiesEditionCompone
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final TableCompositionTargetExtensionEditorSample tableCompositionTargetExtensionEditorSample = (TableCompositionTargetExtensionEditorSample)elt;
 			final TableCompositionTargetExtensionEditorSamplePropertiesEditionPart basePart = (TableCompositionTargetExtensionEditorSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(EefnrextViewsRepository.TableCompositionTargetExtensionEditorSample.Properties.name))
+			if (tableCompositionTargetExtensionEditorSample.getName() != null && isAccessible(EefnrextViewsRepository.TableCompositionTargetExtensionEditorSample.Properties.name))
 				basePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, tableCompositionTargetExtensionEditorSample.getName()));
 			
 			// init filters
@@ -117,7 +116,6 @@ public class TableCompositionTargetExtensionEditorSamplePropertiesEditionCompone
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			TableCompositionTargetExtensionEditorSamplePropertiesEditionPart basePart = (TableCompositionTargetExtensionEditorSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAbstractSample_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(EefnrextViewsRepository.TableCompositionTargetExtensionEditorSample.Properties.name)) {
@@ -170,7 +168,4 @@ public class TableCompositionTargetExtensionEditorSamplePropertiesEditionCompone
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/CheckBoxExtendedEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/CheckBoxExtendedEditorSamplePropertiesEditionPartForm.java
index 61fa32e15..44bdcd823 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/CheckBoxExtendedEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/CheckBoxExtendedEditorSamplePropertiesEditionPartForm.java
@@ -208,14 +208,6 @@ public class CheckBoxExtendedEditorSamplePropertiesEditionPartForm extends Secti
 		} else {
 			checkboxEditorSample.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(EefnrextViewsRepository.CheckBoxExtendedEditorSample.Properties.checkboxEditorSample);
-		if (readOnly && checkboxEditorSample.isEnabled()) {
-			checkboxEditorSample.setEnabled(false);
-			checkboxEditorSample.setToolTipText(EefnrextMessages.CheckBoxExtendedEditorSample_ReadOnly);
-		} else if (!readOnly && !checkboxEditorSample.isEnabled()) {
-			checkboxEditorSample.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/FlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/FlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java
index d2b2ae162..beca538ca 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/FlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/FlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java
@@ -149,6 +149,7 @@ public class FlatReferenceExtendedEditorSamplePropertiesEditionPartForm extends
 		createDescription(parent, EefnrextViewsRepository.FlatReferenceExtendedEditorSample.Properties.flatReferenceEditorSample, EefnrextMessages.FlatReferenceExtendedEditorSamplePropertiesEditionPart_FlatReferenceEditorSampleLabel);
 		flatReferenceEditorSample = new FlatReferencesTable(parent);
 		flatReferenceEditorSample.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
 		flatReferenceEditorSample.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -197,14 +198,6 @@ public class FlatReferenceExtendedEditorSamplePropertiesEditionPartForm extends
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
 		flatReferenceEditorSample.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrextViewsRepository.FlatReferenceExtendedEditorSample.Properties.flatReferenceEditorSample);
-		if (readOnly && flatReferenceEditorSample.isEnabled()) {
-			flatReferenceEditorSample.setEnabled(false);
-			flatReferenceEditorSample.setToolTipText(EefnrextMessages.FlatReferenceExtendedEditorSample_ReadOnly);
-		} else if (!readOnly && !flatReferenceEditorSample.isEnabled()) {
-			flatReferenceEditorSample.setEnabled(true);
-		}	
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java
index 0e3c1b163..34063769b 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java
@@ -300,14 +300,6 @@ public class SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartForm ex
 		} else {
 			demo.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.demo);
-		if (readOnly && demo.isEnabled()) {
-			demo.setEnabled(false);
-			demo.setToolTipText(EefnrextMessages.SecondFlatReferenceExtendedEditorSample_ReadOnly);
-		} else if (!readOnly && !demo.isEnabled()) {
-			demo.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -332,14 +324,6 @@ public class SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartForm ex
 		} else {
 			size.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.size);
-		if (readOnly && size.isEnabled()) {
-			size.setEnabled(false);
-			size.setToolTipText(EefnrextMessages.SecondFlatReferenceExtendedEditorSample_ReadOnly);
-		} else if (!readOnly && !size.isEnabled()) {
-			size.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartForm.java
index 49cab442d..42ba22e65 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartForm.java
@@ -230,14 +230,6 @@ public class TableCompositionTargetExtensionEditorSamplePropertiesEditionPartFor
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrextViewsRepository.TableCompositionTargetExtensionEditorSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(EefnrextMessages.TableCompositionTargetExtensionEditorSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/CheckBoxExtendedEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/CheckBoxExtendedEditorSamplePropertiesEditionPartImpl.java
index ffcdd4b6c..7f9a31d56 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/CheckBoxExtendedEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/CheckBoxExtendedEditorSamplePropertiesEditionPartImpl.java
@@ -196,14 +196,6 @@ public class CheckBoxExtendedEditorSamplePropertiesEditionPartImpl extends Compo
 		} else {
 			checkboxEditorSample.setSelection(false);
 		}
-		boolean readOnly = isReadOnly(EefnrextViewsRepository.CheckBoxExtendedEditorSample.Properties.checkboxEditorSample);
-		if (readOnly && checkboxEditorSample.isEnabled()) {
-			checkboxEditorSample.setEnabled(false);
-			checkboxEditorSample.setToolTipText(EefnrextMessages.CheckBoxExtendedEditorSample_ReadOnly);
-		} else if (!readOnly && !checkboxEditorSample.isEnabled()) {
-			checkboxEditorSample.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/FlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/FlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java
index 4879ca842..279ad9e9a 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/FlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/FlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java
@@ -138,6 +138,7 @@ public class FlatReferenceExtendedEditorSamplePropertiesEditionPartImpl extends
 		createDescription(parent, EefnrextViewsRepository.FlatReferenceExtendedEditorSample.Properties.flatReferenceEditorSample, EefnrextMessages.FlatReferenceExtendedEditorSamplePropertiesEditionPart_FlatReferenceEditorSampleLabel);
 		flatReferenceEditorSample = new FlatReferencesTable(parent);
 		flatReferenceEditorSample.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
 		flatReferenceEditorSample.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -186,14 +187,6 @@ public class FlatReferenceExtendedEditorSamplePropertiesEditionPartImpl extends
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
 		flatReferenceEditorSample.setInput(settings);
-		boolean readOnly = isReadOnly(EefnrextViewsRepository.FlatReferenceExtendedEditorSample.Properties.flatReferenceEditorSample);
-		if (readOnly && flatReferenceEditorSample.isEnabled()) {
-			flatReferenceEditorSample.setEnabled(false);
-			flatReferenceEditorSample.setToolTipText(EefnrextMessages.FlatReferenceExtendedEditorSample_ReadOnly);
-		} else if (!readOnly && !flatReferenceEditorSample.isEnabled()) {
-			flatReferenceEditorSample.setEnabled(true);
-		}	
-		
 	}
 
 	/**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java
index 5cdb7fe23..bcc48ff29 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java
@@ -250,14 +250,6 @@ public class SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartImpl ex
 		} else {
 			demo.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.demo);
-		if (readOnly && demo.isEnabled()) {
-			demo.setEnabled(false);
-			demo.setToolTipText(EefnrextMessages.SecondFlatReferenceExtendedEditorSample_ReadOnly);
-		} else if (!readOnly && !demo.isEnabled()) {
-			demo.setEnabled(true);
-		}	
-		
 	}
 
 	/**
@@ -282,14 +274,6 @@ public class SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartImpl ex
 		} else {
 			size.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.size);
-		if (readOnly && size.isEnabled()) {
-			size.setEnabled(false);
-			size.setToolTipText(EefnrextMessages.SecondFlatReferenceExtendedEditorSample_ReadOnly);
-		} else if (!readOnly && !size.isEnabled()) {
-			size.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartImpl.java
index 3f16b9e5e..acbe074fd 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartImpl.java
@@ -199,14 +199,6 @@ public class TableCompositionTargetExtensionEditorSamplePropertiesEditionPartImp
 		} else {
 			name.setText(""); //$NON-NLS-1$
 		}
-		boolean readOnly = isReadOnly(EefnrextViewsRepository.TableCompositionTargetExtensionEditorSample.Properties.name);
-		if (readOnly && name.isEnabled()) {
-			name.setEnabled(false);
-			name.setToolTipText(EefnrextMessages.TableCompositionTargetExtensionEditorSample_ReadOnly);
-		} else if (!readOnly && !name.isEnabled()) {
-			name.setEnabled(true);
-		}	
-		
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceOwnerSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceOwnerSamplePropertiesEditionComponent.java
index 962a82744..980e0c9ed 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceOwnerSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceOwnerSamplePropertiesEditionComponent.java
@@ -96,11 +96,10 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionComponent extends Sing
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final ConcreteReferenceOwnerSample concreteReferenceOwnerSample = (ConcreteReferenceOwnerSample)elt;
 			final ConcreteReferenceOwnerSamplePropertiesEditionPart basePart = (ConcreteReferenceOwnerSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.name))
+			if (concreteReferenceOwnerSample.getName() != null && isAccessible(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.name))
 				basePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, concreteReferenceOwnerSample.getName()));
 			
 			if (isAccessible(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.abstractTarget)) {
@@ -250,7 +249,6 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionComponent extends Sing
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			ConcreteReferenceOwnerSamplePropertiesEditionPart basePart = (ConcreteReferenceOwnerSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAbstractSample_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.name)) {
@@ -309,7 +307,4 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionComponent extends Sing
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceTargetSample1PropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceTargetSample1PropertiesEditionComponent.java
index b14b0d1fa..1c6a1edde 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceTargetSample1PropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceTargetSample1PropertiesEditionComponent.java
@@ -69,11 +69,10 @@ public class ConcreteReferenceTargetSample1PropertiesEditionComponent extends Si
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final ConcreteReferenceTargetSample1 concreteReferenceTargetSample1 = (ConcreteReferenceTargetSample1)elt;
 			final ConcreteReferenceTargetSample1PropertiesEditionPart basePart = (ConcreteReferenceTargetSample1PropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(FiltersViewsRepository.ConcreteReferenceTargetSample1.Properties.name))
+			if (concreteReferenceTargetSample1.getName() != null && isAccessible(FiltersViewsRepository.ConcreteReferenceTargetSample1.Properties.name))
 				basePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, concreteReferenceTargetSample1.getName()));
 			
 			// init filters
@@ -117,7 +116,6 @@ public class ConcreteReferenceTargetSample1PropertiesEditionComponent extends Si
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			ConcreteReferenceTargetSample1PropertiesEditionPart basePart = (ConcreteReferenceTargetSample1PropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAbstractSample_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(FiltersViewsRepository.ConcreteReferenceTargetSample1.Properties.name)) {
@@ -170,7 +168,4 @@ public class ConcreteReferenceTargetSample1PropertiesEditionComponent extends Si
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceTargetSample2PropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceTargetSample2PropertiesEditionComponent.java
index 29e5acfcb..c71b079c9 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceTargetSample2PropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceTargetSample2PropertiesEditionComponent.java
@@ -69,11 +69,10 @@ public class ConcreteReferenceTargetSample2PropertiesEditionComponent extends Si
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final ConcreteReferenceTargetSample2 concreteReferenceTargetSample2 = (ConcreteReferenceTargetSample2)elt;
 			final ConcreteReferenceTargetSample2PropertiesEditionPart basePart = (ConcreteReferenceTargetSample2PropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(FiltersViewsRepository.ConcreteReferenceTargetSample2.Properties.name))
+			if (concreteReferenceTargetSample2.getName() != null && isAccessible(FiltersViewsRepository.ConcreteReferenceTargetSample2.Properties.name))
 				basePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, concreteReferenceTargetSample2.getName()));
 			
 			// init filters
@@ -117,7 +116,6 @@ public class ConcreteReferenceTargetSample2PropertiesEditionComponent extends Si
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			ConcreteReferenceTargetSample2PropertiesEditionPart basePart = (ConcreteReferenceTargetSample2PropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAbstractSample_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(FiltersViewsRepository.ConcreteReferenceTargetSample2.Properties.name)) {
@@ -170,7 +168,4 @@ public class ConcreteReferenceTargetSample2PropertiesEditionComponent extends Si
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/naming/components/EventPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/naming/components/EventPropertiesEditionComponent.java
index 8cc830ec2..309167ef6 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/naming/components/EventPropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/naming/components/EventPropertiesEditionComponent.java
@@ -69,11 +69,10 @@ public class EventPropertiesEditionComponent extends SinglePartPropertiesEditing
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final Event event = (Event)elt;
 			final EventPropertiesEditionPart basePart = (EventPropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(NamingViewsRepository.Event.Properties.name))
+			if (event.getName() != null && isAccessible(NamingViewsRepository.Event.Properties.name))
 				basePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, event.getName()));
 			
 			// init filters
@@ -117,7 +116,6 @@ public class EventPropertiesEditionComponent extends SinglePartPropertiesEditing
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			EventPropertiesEditionPart basePart = (EventPropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAbstractSample_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(NamingViewsRepository.Event.Properties.name)) {
@@ -170,7 +168,4 @@ public class EventPropertiesEditionComponent extends SinglePartPropertiesEditing
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/AnotherSubtypeBasePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/AnotherSubtypeBasePropertiesEditionComponent.java
index 19096e9f6..6566edd3e 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/AnotherSubtypeBasePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/AnotherSubtypeBasePropertiesEditionComponent.java
@@ -66,7 +66,6 @@ public class AnotherSubtypeBasePropertiesEditionComponent extends SinglePartProp
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final AnotherSubType anotherSubType = (AnotherSubType)elt;
 			final AnotherSubtypePropertiesEditionPart basePart = (AnotherSubtypePropertiesEditionPart)editingPart;
 			// init values
@@ -117,7 +116,6 @@ public class AnotherSubtypeBasePropertiesEditionComponent extends SinglePartProp
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			AnotherSubtypePropertiesEditionPart basePart = (AnotherSubtypePropertiesEditionPart)editingPart;
 			if (NavigationPackage.eINSTANCE.getAnotherSubType_AnotherSpecialisation().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(NavigationViewsRepository.AnotherSubtype.AnotherSpecialisation.anotherSpecialisationElement))
@@ -174,7 +172,4 @@ public class AnotherSubtypeBasePropertiesEditionComponent extends SinglePartProp
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/AttributeNavigationSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/AttributeNavigationSamplePropertiesEditionComponent.java
index e23efc787..347678ef9 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/AttributeNavigationSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/AttributeNavigationSamplePropertiesEditionComponent.java
@@ -105,16 +105,10 @@ public class AttributeNavigationSamplePropertiesEditionComponent extends SingleP
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			if (editingPart instanceof CompositePropertiesEditionPart) {
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(delegate1ForSingleValuedSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(delegate2ForSingleValuedSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(delegate1ForMultiValuedSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(delegate2ForMultiValuedSettings);
-			}
 			final AttributeNavigationSample attributeNavigationSample = (AttributeNavigationSample)elt;
 			final AttributeNavigationSamplePropertiesEditionPart basePart = (AttributeNavigationSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(NavigationViewsRepository.AttributeNavigationSample.Properties.name))
+			if (attributeNavigationSample.getName() != null && isAccessible(NavigationViewsRepository.AttributeNavigationSample.Properties.name))
 				basePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, attributeNavigationSample.getName()));
 			
 			if (delegate1ForSingleValuedSettings.getValue() != null && isAccessible(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate1ForSingleValued))
@@ -212,7 +206,6 @@ public class AttributeNavigationSamplePropertiesEditionComponent extends SingleP
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			AttributeNavigationSamplePropertiesEditionPart basePart = (AttributeNavigationSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAbstractSample_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(NavigationViewsRepository.AttributeNavigationSample.Properties.name)) {
@@ -339,31 +332,4 @@ public class AttributeNavigationSamplePropertiesEditionComponent extends SingleP
 		return ret;
 	}
 
-
-	
-	/**
-	 * @ return settings for delegate1ForSingleValued editor
-	 */
-	public EEFEditorSettingsImpl getDelegate1ForSingleValuedSettings() {
-			return delegate1ForSingleValuedSettings;
-	}
-	/**
-	 * @ return settings for delegate2ForSingleValued editor
-	 */
-	public EEFEditorSettingsImpl getDelegate2ForSingleValuedSettings() {
-			return delegate2ForSingleValuedSettings;
-	}
-	/**
-	 * @ return settings for delegate1ForMultiValued editor
-	 */
-	public EEFEditorSettingsImpl getDelegate1ForMultiValuedSettings() {
-			return delegate1ForMultiValuedSettings;
-	}
-	/**
-	 * @ return settings for delegate2ForMultiValued editor
-	 */
-	public EEFEditorSettingsImpl getDelegate2ForMultiValuedSettings() {
-			return delegate2ForMultiValuedSettings;
-	}
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedFlatReferencesTableSampleEditorPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedFlatReferencesTableSampleEditorPropertiesEditionComponent.java
index e92e758d3..d4ffcbf17 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedFlatReferencesTableSampleEditorPropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedFlatReferencesTableSampleEditorPropertiesEditionComponent.java
@@ -82,13 +82,10 @@ public class DeferedFlatReferencesTableSampleEditorPropertiesEditionComponent ex
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			if (editingPart instanceof CompositePropertiesEditionPart) {
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(flatReferencesTableSampleEditorSettings);
-			}
 			final DeferedFlatReferenceTableEditorSample deferedFlatReferenceTableEditorSample = (DeferedFlatReferenceTableEditorSample)elt;
 			final DeferedFlatReferencesTableSamplePropertiesEditionPart deferedFlatReferencesTableSamplePart = (DeferedFlatReferencesTableSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.name))
+			if (deferedFlatReferenceTableEditorSample.getName() != null && isAccessible(NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.name))
 				deferedFlatReferencesTableSamplePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, deferedFlatReferenceTableEditorSample.getName()));
 			
 			if (isAccessible(NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.flatReferencesTableSampleEditor)) {
@@ -172,7 +169,6 @@ public class DeferedFlatReferencesTableSampleEditorPropertiesEditionComponent ex
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			DeferedFlatReferencesTableSamplePropertiesEditionPart deferedFlatReferencesTableSamplePart = (DeferedFlatReferencesTableSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAbstractSample_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && deferedFlatReferencesTableSamplePart != null && isAccessible(NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.name)) {
@@ -238,7 +234,4 @@ public class DeferedFlatReferencesTableSampleEditorPropertiesEditionComponent ex
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedReferencesTableSampleEditorPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedReferencesTableSampleEditorPropertiesEditionComponent.java
index ca1f97122..d52e15413 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedReferencesTableSampleEditorPropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedReferencesTableSampleEditorPropertiesEditionComponent.java
@@ -80,13 +80,10 @@ public class DeferedReferencesTableSampleEditorPropertiesEditionComponent extend
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			if (editingPart instanceof CompositePropertiesEditionPart) {
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(flatReferencesTableSampleEditorSettings);
-			}
 			final DeferedReferenceTableEditorSample deferedReferenceTableEditorSample = (DeferedReferenceTableEditorSample)elt;
 			final DeferedReferencesTableSamplePropertiesEditionPart deferedReferencesTableSamplePart = (DeferedReferencesTableSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(NavigationViewsRepository.DeferedReferencesTableSample.Properties.name))
+			if (deferedReferenceTableEditorSample.getName() != null && isAccessible(NavigationViewsRepository.DeferedReferencesTableSample.Properties.name))
 				deferedReferencesTableSamplePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, deferedReferenceTableEditorSample.getName()));
 			
 			if (isAccessible(NavigationViewsRepository.DeferedReferencesTableSample.Properties.referencesTableSampleEditor)) {
@@ -174,7 +171,6 @@ public class DeferedReferencesTableSampleEditorPropertiesEditionComponent extend
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			DeferedReferencesTableSamplePropertiesEditionPart deferedReferencesTableSamplePart = (DeferedReferencesTableSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAbstractSample_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && deferedReferencesTableSamplePart != null && isAccessible(NavigationViewsRepository.DeferedReferencesTableSample.Properties.name)) {
@@ -241,7 +237,4 @@ public class DeferedReferencesTableSampleEditorPropertiesEditionComponent extend
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/ElementBasePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/ElementBasePropertiesEditionComponent.java
index a2b1d1ba8..67b334e6f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/ElementBasePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/ElementBasePropertiesEditionComponent.java
@@ -67,7 +67,6 @@ public class ElementBasePropertiesEditionComponent extends SinglePartPropertiesE
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final Element element = (Element)elt;
 			final ElementPropertiesEditionPart basePart = (ElementPropertiesEditionPart)editingPart;
 			// init values
@@ -118,7 +117,6 @@ public class ElementBasePropertiesEditionComponent extends SinglePartPropertiesE
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			ElementPropertiesEditionPart basePart = (ElementPropertiesEditionPart)editingPart;
 			if (NavigationPackage.eINSTANCE.getElement_Visible().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(NavigationViewsRepository.Element.Properties.isVisible))
@@ -175,7 +173,4 @@ public class ElementBasePropertiesEditionComponent extends SinglePartPropertiesE
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/FirstModelNavigationSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/FirstModelNavigationSamplePropertiesEditionComponent.java
index a4e7e5ac7..d3cadb3ce 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/FirstModelNavigationSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/FirstModelNavigationSamplePropertiesEditionComponent.java
@@ -80,11 +80,10 @@ public class FirstModelNavigationSamplePropertiesEditionComponent extends Single
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final FirstModelNavigation firstModelNavigation = (FirstModelNavigation)elt;
 			final FirstNavigationSamplePropertiesEditionPart firstNavigationSamplePart = (FirstNavigationSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(NavigationViewsRepository.FirstNavigationSample.Properties.name))
+			if (firstModelNavigation.getName() != null && isAccessible(NavigationViewsRepository.FirstNavigationSample.Properties.name))
 				firstNavigationSamplePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, firstModelNavigation.getName()));
 			
 			// init filters
@@ -128,7 +127,6 @@ public class FirstModelNavigationSamplePropertiesEditionComponent extends Single
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			FirstNavigationSamplePropertiesEditionPart firstNavigationSamplePart = (FirstNavigationSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAbstractSample_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && firstNavigationSamplePart != null && isAccessible(NavigationViewsRepository.FirstNavigationSample.Properties.name)) {
@@ -181,7 +179,4 @@ public class FirstModelNavigationSamplePropertiesEditionComponent extends Single
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/NamedElementPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/NamedElementPropertiesEditionComponent.java
index 6155e0396..4b6e5c175 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/NamedElementPropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/NamedElementPropertiesEditionComponent.java
@@ -68,11 +68,10 @@ public class NamedElementPropertiesEditionComponent extends SinglePartProperties
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final NamedElement namedElement = (NamedElement)elt;
 			final NamedElementPropertiesEditionPart basePart = (NamedElementPropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(NavigationViewsRepository.NamedElement.Properties.name))
+			if (namedElement.getName() != null && isAccessible(NavigationViewsRepository.NamedElement.Properties.name))
 				basePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, namedElement.getName()));
 			
 			// init filters
@@ -116,7 +115,6 @@ public class NamedElementPropertiesEditionComponent extends SinglePartProperties
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			NamedElementPropertiesEditionPart basePart = (NamedElementPropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAbstractSample_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(NavigationViewsRepository.NamedElement.Properties.name)) {
@@ -169,7 +167,4 @@ public class NamedElementPropertiesEditionComponent extends SinglePartProperties
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/OwnerPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/OwnerPropertiesEditionComponent.java
index 470b0e0de..4ec68f4e8 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/OwnerPropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/OwnerPropertiesEditionComponent.java
@@ -157,26 +157,10 @@ public class OwnerPropertiesEditionComponent extends SinglePartPropertiesEditing
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			if (editingPart instanceof CompositePropertiesEditionPart) {
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(multipleSampleForTableCompositionSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(multipleSampleForAdvancedTableCompositionSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(multipleSampleForReferencesTableSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(multipleSampleForAdvancedReferencesTableSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(multipleSampleForFlatReferencesTablesSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(singleSampleForTableCompositionSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(singleSampleForAdvancedTableCompositionSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(singleSampleForReferencesTableSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(singleSampleForAdvancedReferencesTableSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(singleSampleForFlatReferencesTableSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(singleContainmentForEObjectFlatComboViewerSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(singleReferenceForEObjectFlatComboViewerSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(singleContainmentForAdvancedEObjectFlatComboViewerSettings);
-				((CompositePropertiesEditionPart) editingPart).getSettings().add(singleReferenceForAdvancedEObjectFlatComboViewerSettings);
-			}
 			final Owner owner = (Owner)elt;
 			final OwnerPropertiesEditionPart basePart = (OwnerPropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(NavigationViewsRepository.Owner.Properties.name))
+			if (owner.getName() != null && isAccessible(NavigationViewsRepository.Owner.Properties.name))
 				basePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, owner.getName()));
 			
 			if (isAccessible(NavigationViewsRepository.Owner.Properties.multipleSampleForTableComposition)) {
@@ -768,7 +752,6 @@ public class OwnerPropertiesEditionComponent extends SinglePartPropertiesEditing
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			OwnerPropertiesEditionPart basePart = (OwnerPropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAbstractSample_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(NavigationViewsRepository.Owner.Properties.name)) {
@@ -865,7 +848,4 @@ public class OwnerPropertiesEditionComponent extends SinglePartPropertiesEditing
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SecondModelNavigationSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SecondModelNavigationSamplePropertiesEditionComponent.java
index ec1954f3e..7de0b6cd7 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SecondModelNavigationSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SecondModelNavigationSamplePropertiesEditionComponent.java
@@ -80,11 +80,10 @@ public class SecondModelNavigationSamplePropertiesEditionComponent extends Singl
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final SecondModelNavigation secondModelNavigation = (SecondModelNavigation)elt;
 			final SecondNavigationSamplePropertiesEditionPart secondNavigationSamplePart = (SecondNavigationSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(NavigationViewsRepository.SecondNavigationSample.Properties.name))
+			if (secondModelNavigation.getName() != null && isAccessible(NavigationViewsRepository.SecondNavigationSample.Properties.name))
 				secondNavigationSamplePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, secondModelNavigation.getName()));
 			
 			// init filters
@@ -128,7 +127,6 @@ public class SecondModelNavigationSamplePropertiesEditionComponent extends Singl
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			SecondNavigationSamplePropertiesEditionPart secondNavigationSamplePart = (SecondNavigationSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAbstractSample_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && secondNavigationSamplePart != null && isAccessible(NavigationViewsRepository.SecondNavigationSample.Properties.name)) {
@@ -181,7 +179,4 @@ public class SecondModelNavigationSamplePropertiesEditionComponent extends Singl
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SmartModelNavigationSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SmartModelNavigationSamplePropertiesEditionComponent.java
index f05573756..9c8804826 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SmartModelNavigationSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SmartModelNavigationSamplePropertiesEditionComponent.java
@@ -400,19 +400,10 @@ public class SmartModelNavigationSamplePropertiesEditionComponent extends Single
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			if (editingPart instanceof CompositePropertiesEditionPart) {
-		((CompositePropertiesEditionPart) editingPart).getSettings().add(firstModelNavigationSingleValueSettings);
-		((CompositePropertiesEditionPart) editingPart).getSettings().add(firstModelNavigationMultiValueSettings);
-		((CompositePropertiesEditionPart) editingPart).getSettings().add(secondMNSingleValueWithFirstMNSingleValueSettings);
-		((CompositePropertiesEditionPart) editingPart).getSettings().add(secondMNSingleValueWithFirstMNMultiValueSettings);
-		((CompositePropertiesEditionPart) editingPart).getSettings().add(secondMNMultiValueWithFirstMNSingleValueSettings);
-		((CompositePropertiesEditionPart) editingPart).getSettings().add(secondMNMultiValueWithFirstMNMultiValueSettings);
-		((CompositePropertiesEditionPart) editingPart).getSettings().add(secondMNMultiValueWithFirstMNMultiValueWithFilterSettings);
-	}
 			final SmartModelNavigationSample smartModelNavigationSample = (SmartModelNavigationSample)elt;
 			final SmartNavigationSamplePropertiesEditionPart smartNavigationSamplePart = (SmartNavigationSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(NavigationViewsRepository.SmartNavigationSample.Properties.name))
+			if (smartModelNavigationSample.getName() != null && isAccessible(NavigationViewsRepository.SmartNavigationSample.Properties.name))
 		smartNavigationSamplePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, smartModelNavigationSample.getName()));
 	
 			if (firstModelNavigationSingleValueSettings.getValue() != null && isAccessible(NavigationViewsRepository.SmartNavigationSample.Properties.firstModelNavigationSingleValue))
@@ -541,7 +532,6 @@ public class SmartModelNavigationSamplePropertiesEditionComponent extends Single
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			SmartNavigationSamplePropertiesEditionPart smartNavigationSamplePart = (SmartNavigationSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAbstractSample_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && smartNavigationSamplePart != null && isAccessible(NavigationViewsRepository.SmartNavigationSample.Properties.name)) {
@@ -711,49 +701,4 @@ public class SmartModelNavigationSamplePropertiesEditionComponent extends Single
 			return ret;
 		}
 	
-
-	
-	/**
-	 * @ return settings for firstModelNavigationSingleValue editor
-	 */
-	public EEFEditorSettingsImpl getFirstModelNavigationSingleValueSettings() {
-			return firstModelNavigationSingleValueSettings;
-	}
-	/**
-	 * @ return settings for firstModelNavigationMultiValue editor
-	 */
-	public EEFEditorSettingsImpl getFirstModelNavigationMultiValueSettings() {
-			return firstModelNavigationMultiValueSettings;
-	}
-	/**
-	 * @ return settings for secondMNSingleValueWithFirstMNSingleValue editor
-	 */
-	public EEFEditorSettingsImpl getSecondMNSingleValueWithFirstMNSingleValueSettings() {
-			return secondMNSingleValueWithFirstMNSingleValueSettings;
-	}
-	/**
-	 * @ return settings for secondMNSingleValueWithFirstMNMultiValue editor
-	 */
-	public EEFEditorSettingsImpl getSecondMNSingleValueWithFirstMNMultiValueSettings() {
-			return secondMNSingleValueWithFirstMNMultiValueSettings;
-	}
-	/**
-	 * @ return settings for secondMNMultiValueWithFirstMNSingleValue editor
-	 */
-	public EEFEditorSettingsImpl getSecondMNMultiValueWithFirstMNSingleValueSettings() {
-			return secondMNMultiValueWithFirstMNSingleValueSettings;
-	}
-	/**
-	 * @ return settings for secondMNMultiValueWithFirstMNMultiValue editor
-	 */
-	public EEFEditorSettingsImpl getSecondMNMultiValueWithFirstMNMultiValueSettings() {
-			return secondMNMultiValueWithFirstMNMultiValueSettings;
-	}
-	/**
-	 * @ return settings for secondMNMultiValueWithFirstMNMultiValueWithFilter editor
-	 */
-	public EEFEditorSettingsImpl getSecondMNMultiValueWithFirstMNMultiValueWithFilterSettings() {
-			return secondMNMultiValueWithFirstMNMultiValueWithFilterSettings;
-	}
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SubtypeBasePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SubtypeBasePropertiesEditionComponent.java
index 2dfea6422..58d2a295f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SubtypeBasePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SubtypeBasePropertiesEditionComponent.java
@@ -73,7 +73,6 @@ public class SubtypeBasePropertiesEditionComponent extends SinglePartPropertiesE
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final Subtype subtype = (Subtype)elt;
 			final SubtypePropertiesEditionPart basePart = (SubtypePropertiesEditionPart)editingPart;
 			// init values
@@ -350,7 +349,6 @@ public class SubtypeBasePropertiesEditionComponent extends SinglePartPropertiesE
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			SubtypePropertiesEditionPart basePart = (SubtypePropertiesEditionPart)editingPart;
 			if (NavigationPackage.eINSTANCE.getSubtype_SpecialisedElement().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(NavigationViewsRepository.Subtype.Specialisation.specialisedElement))
@@ -421,7 +419,4 @@ public class SubtypeBasePropertiesEditionComponent extends SinglePartPropertiesE
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/AbstractEnabledSampleBasePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/AbstractEnabledSampleBasePropertiesEditionComponent.java
index b5758bcc4..bb6af9614 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/AbstractEnabledSampleBasePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/AbstractEnabledSampleBasePropertiesEditionComponent.java
@@ -67,7 +67,6 @@ public class AbstractEnabledSampleBasePropertiesEditionComponent extends SingleP
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final AbstractEnabledSample abstractEnabledSample = (AbstractEnabledSample)elt;
 			final AbstractEnabledSamplePropertiesEditionPart basePart = (AbstractEnabledSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -118,7 +117,6 @@ public class AbstractEnabledSampleBasePropertiesEditionComponent extends SingleP
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			AbstractEnabledSamplePropertiesEditionPart basePart = (AbstractEnabledSamplePropertiesEditionPart)editingPart;
 			if (ReferencesPackage.eINSTANCE.getAbstractEnabledSample_Enabled().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(ReferencesViewsRepository.AbstractEnabledSample.EnabledProperties.enabled))
@@ -175,7 +173,4 @@ public class AbstractEnabledSampleBasePropertiesEditionComponent extends SingleP
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/AbstractSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/AbstractSamplePropertiesEditionComponent.java
index 2e254cb9e..c7c23d737 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/AbstractSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/AbstractSamplePropertiesEditionComponent.java
@@ -68,11 +68,10 @@ public class AbstractSamplePropertiesEditionComponent extends SinglePartProperti
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final AbstractSample abstractSample = (AbstractSample)elt;
 			final AbstractSamplePropertiesEditionPart basePart = (AbstractSamplePropertiesEditionPart)editingPart;
 			// init values
-			if (isAccessible(ReferencesViewsRepository.AbstractSample.NameProperties.name))
+			if (abstractSample.getName() != null && isAccessible(ReferencesViewsRepository.AbstractSample.NameProperties.name))
 				basePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, abstractSample.getName()));
 			
 			// init filters
@@ -116,7 +115,6 @@ public class AbstractSamplePropertiesEditionComponent extends SinglePartProperti
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			AbstractSamplePropertiesEditionPart basePart = (AbstractSamplePropertiesEditionPart)editingPart;
 			if (EefnrPackage.eINSTANCE.getAbstractSample_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && basePart != null && isAccessible(ReferencesViewsRepository.AbstractSample.NameProperties.name)) {
@@ -169,7 +167,4 @@ public class AbstractSamplePropertiesEditionComponent extends SinglePartProperti
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/ReferenceEnabledSampleBasePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/ReferenceEnabledSampleBasePropertiesEditionComponent.java
index 4724eee72..e350dcc76 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/ReferenceEnabledSampleBasePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/ReferenceEnabledSampleBasePropertiesEditionComponent.java
@@ -77,7 +77,6 @@ public class ReferenceEnabledSampleBasePropertiesEditionComponent extends Single
 		setInitializing(true);
 		if (editingPart != null && key == partKey) {
 			editingPart.setContext(elt, allResource);
-			
 			final ReferenceEnabledSample referenceEnabledSample = (ReferenceEnabledSample)elt;
 			final ReferenceEnabledSamplePropertiesEditionPart basePart = (ReferenceEnabledSamplePropertiesEditionPart)editingPart;
 			// init values
@@ -154,7 +153,6 @@ public class ReferenceEnabledSampleBasePropertiesEditionComponent extends Single
 	 * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification)
 	 */
 	public void updatePart(Notification msg) {
-		super.updatePart(msg);
 		if (editingPart.isVisible()) {
 			ReferenceEnabledSamplePropertiesEditionPart basePart = (ReferenceEnabledSamplePropertiesEditionPart)editingPart;
 			if (ReferencesPackage.eINSTANCE.getReferenceEnabledSample_Reference().equals(msg.getFeature())  && isAccessible(ReferencesViewsRepository.ReferenceEnabledSample.Properties.reference))
@@ -195,7 +193,4 @@ public class ReferenceEnabledSampleBasePropertiesEditionComponent extends Single
 		return ret;
 	}
 
-
-	
-
 }
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src/org/eclipse/emf/eef/eefnr/provider/AdvancedEObjectFlatComboViewerSampleItemProvider.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src/org/eclipse/emf/eef/eefnr/provider/AdvancedEObjectFlatComboViewerSampleItemProvider.java
index c6ae80f89..a6f6078ef 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src/org/eclipse/emf/eef/eefnr/provider/AdvancedEObjectFlatComboViewerSampleItemProvider.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src/org/eclipse/emf/eef/eefnr/provider/AdvancedEObjectFlatComboViewerSampleItemProvider.java
@@ -13,6 +13,7 @@ import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -21,7 +22,9 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 
+import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.emf.eef.eefnr.AdvancedEObjectFlatComboViewerSample;
+import org.eclipse.emf.eef.eefnr.EefnrFactory;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 
 /**
@@ -133,6 +136,37 @@ public class AdvancedEObjectFlatComboViewerSampleItemProvider
 	}
 
 	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(EefnrPackage.Literals.ADVANCED_EOBJECT_FLAT_COMBO_VIEWER_SAMPLE__ADVANCEDEOBJECTFLATCOMBOVIEWER_COMPO_REQUIRED_PROPERTY);
+			childrenFeatures.add(EefnrPackage.Literals.ADVANCED_EOBJECT_FLAT_COMBO_VIEWER_SAMPLE__ADVANCEDEOBJECTFLATCOMBOVIEWER_COMPO_OPTIONAL_PROPERTY);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
 	 * This returns AdvancedEObjectFlatComboViewerSample.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -167,6 +201,13 @@ public class AdvancedEObjectFlatComboViewerSampleItemProvider
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
+
+		switch (notification.getFeatureID(AdvancedEObjectFlatComboViewerSample.class)) {
+			case EefnrPackage.ADVANCED_EOBJECT_FLAT_COMBO_VIEWER_SAMPLE__ADVANCEDEOBJECTFLATCOMBOVIEWER_COMPO_REQUIRED_PROPERTY:
+			case EefnrPackage.ADVANCED_EOBJECT_FLAT_COMBO_VIEWER_SAMPLE__ADVANCEDEOBJECTFLATCOMBOVIEWER_COMPO_OPTIONAL_PROPERTY:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
 		super.notifyChanged(notification);
 	}
 
@@ -180,6 +221,39 @@ public class AdvancedEObjectFlatComboViewerSampleItemProvider
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(EefnrPackage.Literals.ADVANCED_EOBJECT_FLAT_COMBO_VIEWER_SAMPLE__ADVANCEDEOBJECTFLATCOMBOVIEWER_COMPO_REQUIRED_PROPERTY,
+				 EefnrFactory.eINSTANCE.createTotalSample()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(EefnrPackage.Literals.ADVANCED_EOBJECT_FLAT_COMBO_VIEWER_SAMPLE__ADVANCEDEOBJECTFLATCOMBOVIEWER_COMPO_OPTIONAL_PROPERTY,
+				 EefnrFactory.eINSTANCE.createTotalSample()));
+	}
+
+	/**
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
+		Object childFeature = feature;
+		Object childObject = child;
+
+		boolean qualify =
+			childFeature == EefnrPackage.Literals.ADVANCED_EOBJECT_FLAT_COMBO_VIEWER_SAMPLE__ADVANCEDEOBJECTFLATCOMBOVIEWER_COMPO_REQUIRED_PROPERTY ||
+			childFeature == EefnrPackage.Literals.ADVANCED_EOBJECT_FLAT_COMBO_VIEWER_SAMPLE__ADVANCEDEOBJECTFLATCOMBOVIEWER_COMPO_OPTIONAL_PROPERTY;
+
+		if (qualify) {
+			return getString
+				("_UI_CreateChild_text2",
+				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		}
+		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 }