UPDATED: controler architecture

32 files changed, 429 insertions, 821 deletions

diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnr_properties.plugin.xml b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnr_properties.plugin.xml
index cd31ceb4a..c58a2b64a 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnr_properties.plugin.xml
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnr_properties.plugin.xml
@@ -25,19 +25,19 @@
    <extension
          point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider">
       <PropertiesEditionPartProvider
-            providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider">
+            providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider">
       </PropertiesEditionPartProvider>
    </extension>
    <extension
          point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider">
       <PropertiesEditionPartProvider
-            providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider">
+            providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider">
       </PropertiesEditionPartProvider>
    </extension>
    <extension
          point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider">
       <PropertiesEditionPartProvider
-            providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider">
+            providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider">
       </PropertiesEditionPartProvider>
    </extension>
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnrext_properties.plugin.xml b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnrext_properties.plugin.xml
index 61382b176..f1bff8804 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnrext_properties.plugin.xml
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnrext_properties.plugin.xml
@@ -25,19 +25,19 @@
    <extension
          point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider">
       <PropertiesEditionPartProvider
-            providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider">
+            providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider">
       </PropertiesEditionPartProvider>
    </extension>
    <extension
          point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider">
       <PropertiesEditionPartProvider
-            providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider">
+            providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider">
       </PropertiesEditionPartProvider>
    </extension>
    <extension
          point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider">
       <PropertiesEditionPartProvider
-            providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider">
+            providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider">
       </PropertiesEditionPartProvider>
    </extension>
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/navigation_properties.plugin.xml b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/navigation_properties.plugin.xml
index f80b99e9c..1c7956cf6 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/navigation_properties.plugin.xml
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/navigation_properties.plugin.xml
@@ -25,19 +25,19 @@
    <extension
          point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider">
       <PropertiesEditionPartProvider
-            providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider">
+            providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider">
       </PropertiesEditionPartProvider>
    </extension>
    <extension
          point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider">
       <PropertiesEditionPartProvider
-            providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider">
+            providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider">
       </PropertiesEditionPartProvider>
    </extension>
    <extension
          point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider">
       <PropertiesEditionPartProvider
-            providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider">
+            providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider">
       </PropertiesEditionPartProvider>
    </extension>
 
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 bd025324d..5c370677f 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
@@ -241,23 +241,13 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent exte
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.advancedeobjectflatcomboviewerRequiredProperty == event.getAffectedEditor()) {
-					updateAdvancedeobjectflatcomboviewerRequiredProperty((TotalSample)event.getNewValue());
-				}
-				if (EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.advancedeobjectflatcomboviewerOptionalProperty == event.getAffectedEditor()) {
-					updateAdvancedeobjectflatcomboviewerOptionalProperty((TotalSample)event.getNewValue());
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.advancedeobjectflatcomboviewerRequiredProperty == event.getAffectedEditor()) {
-							updateAdvancedeobjectflatcomboviewerRequiredProperty((TotalSample)event.getNewValue());
-						}
-						if (EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.advancedeobjectflatcomboviewerOptionalProperty == event.getAffectedEditor()) {
-							updateAdvancedeobjectflatcomboviewerOptionalProperty((TotalSample)event.getNewValue());
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -271,16 +261,16 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent exte
 		}
 	}
 
-	private void updateAdvancedeobjectflatcomboviewerRequiredProperty(TotalSample newValue) {
-		advancedeobjectflatcomboviewerRequiredPropertySettings.setToReference(newValue);	
-	}
-
-	private void updateAdvancedeobjectflatcomboviewerOptionalProperty(TotalSample newValue) {
-		advancedeobjectflatcomboviewerOptionalPropertySettings.setToReference(newValue);	
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.advancedeobjectflatcomboviewerRequiredProperty == event.getAffectedEditor()) {
+			advancedeobjectflatcomboviewerRequiredPropertySettings.setToReference((TotalSample)event.getNewValue());
+		}
+		if (EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.advancedeobjectflatcomboviewerOptionalProperty == event.getAffectedEditor()) {
+			advancedeobjectflatcomboviewerOptionalPropertySettings.setToReference((TotalSample)event.getNewValue());
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 ae0357956..d2baf9eba 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
@@ -275,23 +275,13 @@ if (EefnrPackage.eINSTANCE.getAdvancedReferencesTableSample_Advancedreferencesta
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.AdvancedReferencesTableSample.advancedreferencestableRequiredProperty == event.getAffectedEditor()) {
-					updateAdvancedreferencestableRequiredProperty(event);
-				}
-				if (EefnrViewsRepository.AdvancedReferencesTableSample.advancedreferencestableOptionalProperty == event.getAffectedEditor()) {
-					updateAdvancedreferencestableOptionalProperty(event);
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.AdvancedReferencesTableSample.advancedreferencestableRequiredProperty == event.getAffectedEditor()) {
-							updateAdvancedreferencestableRequiredProperty(event);
-						}
-						if (EefnrViewsRepository.AdvancedReferencesTableSample.advancedreferencestableOptionalProperty == event.getAffectedEditor()) {
-							updateAdvancedreferencestableOptionalProperty(event);
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -305,28 +295,28 @@ if (EefnrPackage.eINSTANCE.getAdvancedReferencesTableSample_Advancedreferencesta
 		}
 	}
 
-	private void updateAdvancedreferencestableRequiredProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof TotalSample) {
-				advancedreferencestableRequiredPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				advancedreferencestableRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.AdvancedReferencesTableSample.advancedreferencestableRequiredProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof TotalSample) {
+						advancedreferencestableRequiredPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						advancedreferencestableRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
 		}
-	}
-
-	private void updateAdvancedreferencestableOptionalProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof TotalSample) {
-				advancedreferencestableOptionalPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				advancedreferencestableOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+		if (EefnrViewsRepository.AdvancedReferencesTableSample.advancedreferencestableOptionalProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof TotalSample) {
+						advancedreferencestableOptionalPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						advancedreferencestableOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
 		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 a7a9063d5..0ceb8f6bc 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
@@ -267,23 +267,13 @@ if (EefnrPackage.eINSTANCE.getAdvancedTableCompositionEditorSample_Advancedtable
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.AdvancedTableCompositionEditorSample.advancedtablecompositionRequiredProperty == event.getAffectedEditor()) {
-					updateAdvancedtablecompositionRequiredProperty(event);
-				}
-				if (EefnrViewsRepository.AdvancedTableCompositionEditorSample.advancedtablecompositionOptionalProperty == event.getAffectedEditor()) {
-					updateAdvancedtablecompositionOptionalProperty(event);
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.AdvancedTableCompositionEditorSample.advancedtablecompositionRequiredProperty == event.getAffectedEditor()) {
-							updateAdvancedtablecompositionRequiredProperty(event);
-						}
-						if (EefnrViewsRepository.AdvancedTableCompositionEditorSample.advancedtablecompositionOptionalProperty == event.getAffectedEditor()) {
-							updateAdvancedtablecompositionOptionalProperty(event);
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -297,28 +287,28 @@ if (EefnrPackage.eINSTANCE.getAdvancedTableCompositionEditorSample_Advancedtable
 		}
 	}
 
-	private void updateAdvancedtablecompositionRequiredProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof Sample) {
-				advancedtablecompositionRequiredPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				advancedtablecompositionRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.AdvancedTableCompositionEditorSample.advancedtablecompositionRequiredProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof Sample) {
+						advancedtablecompositionRequiredPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						advancedtablecompositionRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
 		}
-	}
-
-	private void updateAdvancedtablecompositionOptionalProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof Sample) {
-				advancedtablecompositionOptionalPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				advancedtablecompositionOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+		if (EefnrViewsRepository.AdvancedTableCompositionEditorSample.advancedtablecompositionOptionalProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof Sample) {
+						advancedtablecompositionOptionalPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						advancedtablecompositionOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
 		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 d0acc5eb2..37c2631dc 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
@@ -226,23 +226,13 @@ public class CheckboxSamplePropertiesEditionComponent extends StandardProperties
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.CheckboxSample.checkboxRequiredProperty == event.getAffectedEditor()) {
-					updateCheckboxRequiredProperty((Boolean)event.getNewValue());
-				}
-				if (EefnrViewsRepository.CheckboxSample.checkboxOptionalProperty == event.getAffectedEditor()) {
-					updateCheckboxOptionalProperty((Boolean)event.getNewValue());
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.CheckboxSample.checkboxRequiredProperty == event.getAffectedEditor()) {
-							updateCheckboxRequiredProperty((Boolean)event.getNewValue());
-						}
-						if (EefnrViewsRepository.CheckboxSample.checkboxOptionalProperty == event.getAffectedEditor()) {
-							updateCheckboxOptionalProperty((Boolean)event.getNewValue());
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -256,16 +246,16 @@ public class CheckboxSamplePropertiesEditionComponent extends StandardProperties
 		}
 	}
 
-	private void updateCheckboxRequiredProperty(Boolean newValue) {
-		checkboxSample.setCheckboxRequiredProperty(newValue);	
-	}
-
-	private void updateCheckboxOptionalProperty(Boolean newValue) {
-		checkboxSample.setCheckboxOptionalProperty(newValue);	
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.CheckboxSample.checkboxRequiredProperty == event.getAffectedEditor()) {
+			checkboxSample.setCheckboxRequiredProperty((Boolean)event.getNewValue());	
+		}
+		if (EefnrViewsRepository.CheckboxSample.checkboxOptionalProperty == event.getAffectedEditor()) {
+			checkboxSample.setCheckboxOptionalProperty((Boolean)event.getNewValue());	
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 9730ff4a8..0759e7c5a 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
@@ -227,23 +227,13 @@ public class EMFComboViewerSamplePropertiesEditionComponent extends StandardProp
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.EMFComboViewerSample.emfcomboviewerRequiredProperty == event.getAffectedEditor()) {
-					updateEmfcomboviewerRequiredProperty((ENUM_SAMPLE)event.getNewValue());
-				}
-				if (EefnrViewsRepository.EMFComboViewerSample.emfcomboviewerOptionalProperty == event.getAffectedEditor()) {
-					updateEmfcomboviewerOptionalProperty((ENUM_SAMPLE)event.getNewValue());
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.EMFComboViewerSample.emfcomboviewerRequiredProperty == event.getAffectedEditor()) {
-							updateEmfcomboviewerRequiredProperty((ENUM_SAMPLE)event.getNewValue());
-						}
-						if (EefnrViewsRepository.EMFComboViewerSample.emfcomboviewerOptionalProperty == event.getAffectedEditor()) {
-							updateEmfcomboviewerOptionalProperty((ENUM_SAMPLE)event.getNewValue());
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -257,16 +247,16 @@ public class EMFComboViewerSamplePropertiesEditionComponent extends StandardProp
 		}
 	}
 
-	private void updateEmfcomboviewerRequiredProperty(ENUM_SAMPLE newValue) {
-		eMFComboViewerSample.setEmfcomboviewerRequiredProperty(newValue);	
-	}
-
-	private void updateEmfcomboviewerOptionalProperty(ENUM_SAMPLE newValue) {
-		eMFComboViewerSample.setEmfcomboviewerOptionalProperty(newValue);	
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.EMFComboViewerSample.emfcomboviewerRequiredProperty == event.getAffectedEditor()) {
+			eMFComboViewerSample.setEmfcomboviewerRequiredProperty((ENUM_SAMPLE)event.getNewValue());
+		}
+		if (EefnrViewsRepository.EMFComboViewerSample.emfcomboviewerOptionalProperty == event.getAffectedEditor()) {
+			eMFComboViewerSample.setEmfcomboviewerOptionalProperty((ENUM_SAMPLE)event.getNewValue());
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 0838bb03e..c0783c168 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
@@ -273,23 +273,13 @@ public class EObjectFlatComboViewerSamplePropertiesEditionComponent extends Stan
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.EObjectFlatComboViewerSample.eobjectflatcomboviewerRequiredPropery == event.getAffectedEditor()) {
-					updateEobjectflatcomboviewerRequiredPropery((TotalSample)event.getNewValue());
-				}
-				if (EefnrViewsRepository.EObjectFlatComboViewerSample.eobjectflatcomboviewerOptionalPropery == event.getAffectedEditor()) {
-					updateEobjectflatcomboviewerOptionalPropery((TotalSample)event.getNewValue());
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.EObjectFlatComboViewerSample.eobjectflatcomboviewerRequiredPropery == event.getAffectedEditor()) {
-							updateEobjectflatcomboviewerRequiredPropery((TotalSample)event.getNewValue());
-						}
-						if (EefnrViewsRepository.EObjectFlatComboViewerSample.eobjectflatcomboviewerOptionalPropery == event.getAffectedEditor()) {
-							updateEobjectflatcomboviewerOptionalPropery((TotalSample)event.getNewValue());
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -303,16 +293,16 @@ public class EObjectFlatComboViewerSamplePropertiesEditionComponent extends Stan
 		}
 	}
 
-	private void updateEobjectflatcomboviewerRequiredPropery(TotalSample newValue) {
-		eobjectflatcomboviewerRequiredProperySettings.setToReference(newValue);	
-	}
-
-	private void updateEobjectflatcomboviewerOptionalPropery(TotalSample newValue) {
-		eobjectflatcomboviewerOptionalProperySettings.setToReference(newValue);	
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.EObjectFlatComboViewerSample.eobjectflatcomboviewerRequiredPropery == event.getAffectedEditor()) {
+			eobjectflatcomboviewerRequiredProperySettings.setToReference((TotalSample)event.getNewValue());
+		}
+		if (EefnrViewsRepository.EObjectFlatComboViewerSample.eobjectflatcomboviewerOptionalPropery == event.getAffectedEditor()) {
+			eobjectflatcomboviewerOptionalProperySettings.setToReference((TotalSample)event.getNewValue());
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 fbe21f03a..fb9a82f99 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
@@ -275,23 +275,13 @@ if (EefnrPackage.eINSTANCE.getFlatReferencesTableSample_FlatreferencestableOptio
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.FlatReferenceTableSample.flatreferencetableRequiredProperty == event.getAffectedEditor()) {
-					updateFlatreferencetableRequiredProperty(event);
-				}
-				if (EefnrViewsRepository.FlatReferenceTableSample.flatreferencetableOptionalProperty == event.getAffectedEditor()) {
-					updateFlatreferencetableOptionalProperty(event);
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.FlatReferenceTableSample.flatreferencetableRequiredProperty == event.getAffectedEditor()) {
-							updateFlatreferencetableRequiredProperty(event);
-						}
-						if (EefnrViewsRepository.FlatReferenceTableSample.flatreferencetableOptionalProperty == event.getAffectedEditor()) {
-							updateFlatreferencetableOptionalProperty(event);
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -305,18 +295,18 @@ if (EefnrPackage.eINSTANCE.getFlatReferencesTableSample_FlatreferencestableOptio
 		}
 	}
 
-	private void updateFlatreferencetableRequiredProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.SET)
-			flatreferencestableRequiredPropertySettings.setToReference((List<EObject>) event.getNewValue());
-	}
-
-	private void updateFlatreferencetableOptionalProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.SET)
-			flatreferencestableOptionalPropertySettings.setToReference((List<EObject>) event.getNewValue());
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.FlatReferenceTableSample.flatreferencetableRequiredProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.SET)
+					flatreferencestableRequiredPropertySettings.setToReference((List<EObject>) event.getNewValue());
+		}
+		if (EefnrViewsRepository.FlatReferenceTableSample.flatreferencetableOptionalProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.SET)
+					flatreferencestableOptionalPropertySettings.setToReference((List<EObject>) event.getNewValue());
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 fcabeb1a2..5d7881663 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
@@ -239,23 +239,13 @@ public class MultiValuedEditorSamplePropertiesEditionComponent extends StandardP
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.MultiValuedEditorSample.multivaluededitorRequiredProperty == event.getAffectedEditor()) {
-					updateMultivaluededitorRequiredProperty(event);
-				}
-				if (EefnrViewsRepository.MultiValuedEditorSample.multivaluededitorOptionalProperty == event.getAffectedEditor()) {
-					updateMultivaluededitorOptionalProperty(event);
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.MultiValuedEditorSample.multivaluededitorRequiredProperty == event.getAffectedEditor()) {
-							updateMultivaluededitorRequiredProperty(event);
-						}
-						if (EefnrViewsRepository.MultiValuedEditorSample.multivaluededitorOptionalProperty == event.getAffectedEditor()) {
-							updateMultivaluededitorOptionalProperty(event);
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -269,22 +259,22 @@ public class MultiValuedEditorSamplePropertiesEditionComponent extends StandardP
 		}
 	}
 
-	private void updateMultivaluededitorRequiredProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.SET) {
-			multiValuedEditorSample.getMultivaluededitorRequiredProperty().clear();
-			multiValuedEditorSample.getMultivaluededitorRequiredProperty().addAll(((List) event.getNewValue()));
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.MultiValuedEditorSample.multivaluededitorRequiredProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.SET) {
+					multiValuedEditorSample.getMultivaluededitorRequiredProperty().clear();
+					multiValuedEditorSample.getMultivaluededitorRequiredProperty().addAll(((List) event.getNewValue()));
+				}
 		}
-	}
-
-	private void updateMultivaluededitorOptionalProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.SET) {
-			multiValuedEditorSample.getMultivaluededitorOptionalProperty().clear();
-			multiValuedEditorSample.getMultivaluededitorOptionalProperty().addAll(((List) event.getNewValue()));
+		if (EefnrViewsRepository.MultiValuedEditorSample.multivaluededitorOptionalProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.SET) {
+					multiValuedEditorSample.getMultivaluededitorOptionalProperty().clear();
+					multiValuedEditorSample.getMultivaluededitorOptionalProperty().addAll(((List) event.getNewValue()));
+				}
 		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 749f75a61..0a64bbfb0 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
@@ -227,23 +227,13 @@ public class RadioSamplePropertiesEditionComponent extends StandardPropertiesEdi
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.RadioSample.radioRequiredProperty == event.getAffectedEditor()) {
-					updateRadioRequiredProperty((ENUM_SAMPLE)((EEnumLiteral)basePart.getRadioRequiredProperty()).getInstance());
-				}
-				if (EefnrViewsRepository.RadioSample.radioOptionalProperty == event.getAffectedEditor()) {
-					updateRadioOptionalProperty((ENUM_SAMPLE)((EEnumLiteral)basePart.getRadioOptionalProperty()).getInstance());
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.RadioSample.radioRequiredProperty == event.getAffectedEditor()) {
-							updateRadioRequiredProperty((ENUM_SAMPLE)((EEnumLiteral)basePart.getRadioRequiredProperty()).getInstance());
-						}
-						if (EefnrViewsRepository.RadioSample.radioOptionalProperty == event.getAffectedEditor()) {
-							updateRadioOptionalProperty((ENUM_SAMPLE)((EEnumLiteral)basePart.getRadioOptionalProperty()).getInstance());
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -257,16 +247,16 @@ public class RadioSamplePropertiesEditionComponent extends StandardPropertiesEdi
 		}
 	}
 
-	private void updateRadioRequiredProperty(ENUM_SAMPLE newValue) {
-		radioSample.setRadioRequiredProperty(newValue);
-	}
-
-	private void updateRadioOptionalProperty(ENUM_SAMPLE newValue) {
-		radioSample.setRadioOptionalProperty(newValue);
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.RadioSample.radioRequiredProperty == event.getAffectedEditor()) {
+			radioSample.setRadioRequiredProperty((ENUM_SAMPLE)((EEnumLiteral)basePart.getRadioRequiredProperty()).getInstance());
+		}
+		if (EefnrViewsRepository.RadioSample.radioOptionalProperty == event.getAffectedEditor()) {
+			radioSample.setRadioOptionalProperty((ENUM_SAMPLE)((EEnumLiteral)basePart.getRadioOptionalProperty()).getInstance());
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 99bd02bcf..f8f95cbe5 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
@@ -274,23 +274,13 @@ if (EefnrPackage.eINSTANCE.getReferencesTableSample_ReferencestableOptionalPrope
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.ReferencesTableSample.referencestableRequiredProperty == event.getAffectedEditor()) {
-					updateReferencestableRequiredProperty(event);
-				}
-				if (EefnrViewsRepository.ReferencesTableSample.referencestableOptionalProperty == event.getAffectedEditor()) {
-					updateReferencestableOptionalProperty(event);
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.ReferencesTableSample.referencestableRequiredProperty == event.getAffectedEditor()) {
-							updateReferencestableRequiredProperty(event);
-						}
-						if (EefnrViewsRepository.ReferencesTableSample.referencestableOptionalProperty == event.getAffectedEditor()) {
-							updateReferencestableOptionalProperty(event);
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -304,28 +294,28 @@ if (EefnrPackage.eINSTANCE.getReferencesTableSample_ReferencestableOptionalPrope
 		}
 	}
 
-	private void updateReferencestableRequiredProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof TotalSample) {
-				referencestableRequiredPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				referencestableRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.ReferencesTableSample.referencestableRequiredProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof TotalSample) {
+						referencestableRequiredPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						referencestableRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
 		}
-	}
-
-	private void updateReferencestableOptionalProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof TotalSample) {
-				referencestableOptionalPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				referencestableOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+		if (EefnrViewsRepository.ReferencesTableSample.referencestableOptionalProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof TotalSample) {
+						referencestableOptionalPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						referencestableOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
 		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 057bcf13d..acb3c5cd4 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
@@ -241,17 +241,13 @@ if (EefnrPackage.eINSTANCE.getRoot_Samples().equals(msg.getFeature()))
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.Root.samples == event.getAffectedEditor()) {
-					updateSamples(event);
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.Root.samples == event.getAffectedEditor()) {
-							updateSamples(event);
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -265,18 +261,19 @@ if (EefnrPackage.eINSTANCE.getRoot_Samples().equals(msg.getFeature()))
 		}
 	}
 
-	private void updateSamples(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof AbstractSample) {
-				samplesSettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				samplesSettings.removeFromReference((EObject) event.getNewValue());
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.Root.samples == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof AbstractSample) {
+						samplesSettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						samplesSettings.removeFromReference((EObject) event.getNewValue());
+				}
 		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 6e8332c06..08f0928e8 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
@@ -238,23 +238,13 @@ public class SamplePropertiesEditionComponent extends StandardPropertiesEditionC
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.Sample.textRequiredProperty == event.getAffectedEditor()) {
-					updateTextRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
-				if (EefnrViewsRepository.Sample.textOptionalProperty == event.getAffectedEditor()) {
-					updateTextOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.Sample.textRequiredProperty == event.getAffectedEditor()) {
-							updateTextRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
-						if (EefnrViewsRepository.Sample.textOptionalProperty == event.getAffectedEditor()) {
-							updateTextOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -268,16 +258,16 @@ public class SamplePropertiesEditionComponent extends StandardPropertiesEditionC
 		}
 	}
 
-	private void updateTextRequiredProperty(java.lang.String newValue) {
-		sample.setTextRequiredProperty(newValue);	
-	}
-
-	private void updateTextOptionalProperty(java.lang.String newValue) {
-		sample.setTextOptionalProperty(newValue);	
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.Sample.textRequiredProperty == event.getAffectedEditor()) {
+			sample.setTextRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
+		if (EefnrViewsRepository.Sample.textOptionalProperty == event.getAffectedEditor()) {
+			sample.setTextOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 9770df2c3..64010f485 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
@@ -267,23 +267,13 @@ if (EefnrPackage.eINSTANCE.getTableCompositionEditorSample_TablecompositionOptio
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.TableCompositionEditorSample.tablecompositionRequiredProperty == event.getAffectedEditor()) {
-					updateTablecompositionRequiredProperty(event);
-				}
-				if (EefnrViewsRepository.TableCompositionEditorSample.tablecompositionOptionalProperty == event.getAffectedEditor()) {
-					updateTablecompositionOptionalProperty(event);
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.TableCompositionEditorSample.tablecompositionRequiredProperty == event.getAffectedEditor()) {
-							updateTablecompositionRequiredProperty(event);
-						}
-						if (EefnrViewsRepository.TableCompositionEditorSample.tablecompositionOptionalProperty == event.getAffectedEditor()) {
-							updateTablecompositionOptionalProperty(event);
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -297,28 +287,28 @@ if (EefnrPackage.eINSTANCE.getTableCompositionEditorSample_TablecompositionOptio
 		}
 	}
 
-	private void updateTablecompositionRequiredProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof Sample) {
-				tablecompositionRequiredPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				tablecompositionRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.TableCompositionEditorSample.tablecompositionRequiredProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof Sample) {
+						tablecompositionRequiredPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						tablecompositionRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
 		}
-	}
-
-	private void updateTablecompositionOptionalProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof Sample) {
-				tablecompositionOptionalPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				tablecompositionOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+		if (EefnrViewsRepository.TableCompositionEditorSample.tablecompositionOptionalProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof Sample) {
+						tablecompositionOptionalPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						tablecompositionOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
 		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 066098ec9..6a0ec6d0a 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
@@ -267,23 +267,13 @@ if (EefnrPackage.eINSTANCE.getTableCompositionExtensionEditorSample_Tablecomposi
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.TableCompositionExtensionEditorSample.tablecompositionRequiredProperty == event.getAffectedEditor()) {
-					updateTablecompositionRequiredProperty(event);
-				}
-				if (EefnrViewsRepository.TableCompositionExtensionEditorSample.tablecompositionOptionalProperty == event.getAffectedEditor()) {
-					updateTablecompositionOptionalProperty(event);
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.TableCompositionExtensionEditorSample.tablecompositionRequiredProperty == event.getAffectedEditor()) {
-							updateTablecompositionRequiredProperty(event);
-						}
-						if (EefnrViewsRepository.TableCompositionExtensionEditorSample.tablecompositionOptionalProperty == event.getAffectedEditor()) {
-							updateTablecompositionOptionalProperty(event);
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -297,28 +287,28 @@ if (EefnrPackage.eINSTANCE.getTableCompositionExtensionEditorSample_Tablecomposi
 		}
 	}
 
-	private void updateTablecompositionRequiredProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof AbstractTableCompositionTargetExtensionEditorSample) {
-				tablecompositionRequiredPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				tablecompositionRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.TableCompositionExtensionEditorSample.tablecompositionRequiredProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof AbstractTableCompositionTargetExtensionEditorSample) {
+						tablecompositionRequiredPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						tablecompositionRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
 		}
-	}
-
-	private void updateTablecompositionOptionalProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof AbstractTableCompositionTargetExtensionEditorSample) {
-				tablecompositionOptionalPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				tablecompositionOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+		if (EefnrViewsRepository.TableCompositionExtensionEditorSample.tablecompositionOptionalProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof AbstractTableCompositionTargetExtensionEditorSample) {
+						tablecompositionOptionalPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						tablecompositionOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
 		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 5c488825b..e7b714dd6 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
@@ -238,23 +238,13 @@ public class TextSamplePropertiesEditionComponent extends StandardPropertiesEdit
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.TextSample.textRequiredProperty == event.getAffectedEditor()) {
-					updateTextRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
-				if (EefnrViewsRepository.TextSample.textOptionalProperty == event.getAffectedEditor()) {
-					updateTextOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.TextSample.textRequiredProperty == event.getAffectedEditor()) {
-							updateTextRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
-						if (EefnrViewsRepository.TextSample.textOptionalProperty == event.getAffectedEditor()) {
-							updateTextOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -268,16 +258,16 @@ public class TextSamplePropertiesEditionComponent extends StandardPropertiesEdit
 		}
 	}
 
-	private void updateTextRequiredProperty(java.lang.String newValue) {
-		textSample.setTextRequiredProperty(newValue);	
-	}
-
-	private void updateTextOptionalProperty(java.lang.String newValue) {
-		textSample.setTextOptionalProperty(newValue);	
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.TextSample.textRequiredProperty == event.getAffectedEditor()) {
+			textSample.setTextRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
+		if (EefnrViewsRepository.TextSample.textOptionalProperty == event.getAffectedEditor()) {
+			textSample.setTextOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 127d60e71..cd447bc01 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
@@ -238,23 +238,13 @@ public class TextSampleWithTwoTabsTextSampleFirstTabPropertiesEditionComponent e
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.TextSampleFirstTab.textOptionalPropertyInFirstTab == event.getAffectedEditor()) {
-					updateTextOptionalPropertyInFirstTab((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
-				if (EefnrViewsRepository.TextSampleFirstTab.textRequiredPropertyInFirstTab == event.getAffectedEditor()) {
-					updateTextRequiredPropertyInFirstTab((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.TextSampleFirstTab.textOptionalPropertyInFirstTab == event.getAffectedEditor()) {
-							updateTextOptionalPropertyInFirstTab((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
-						if (EefnrViewsRepository.TextSampleFirstTab.textRequiredPropertyInFirstTab == event.getAffectedEditor()) {
-							updateTextRequiredPropertyInFirstTab((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -268,16 +258,16 @@ public class TextSampleWithTwoTabsTextSampleFirstTabPropertiesEditionComponent e
 		}
 	}
 
-	private void updateTextOptionalPropertyInFirstTab(java.lang.String newValue) {
-		textSampleWithTwoTabs.setTextOptionalPropertyInFirstTab(newValue);	
-	}
-
-	private void updateTextRequiredPropertyInFirstTab(java.lang.String newValue) {
-		textSampleWithTwoTabs.setTextRequiredPropertyInFirstTab(newValue);	
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.TextSampleFirstTab.textOptionalPropertyInFirstTab == event.getAffectedEditor()) {
+			textSampleWithTwoTabs.setTextOptionalPropertyInFirstTab((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
+		if (EefnrViewsRepository.TextSampleFirstTab.textRequiredPropertyInFirstTab == event.getAffectedEditor()) {
+			textSampleWithTwoTabs.setTextRequiredPropertyInFirstTab((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 689b28c7d..1b3a68b4c 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
@@ -238,23 +238,13 @@ public class TextSampleWithTwoTabsTextSampleSecondTabPropertiesEditionComponent
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.TextSampleSecondTab.textOptionalPropertyInSecondTab == event.getAffectedEditor()) {
-					updateTextOptionalPropertyInSecondTab((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
-				if (EefnrViewsRepository.TextSampleSecondTab.textRequiredPropertyInSecondTab == event.getAffectedEditor()) {
-					updateTextRequiredPropertyInSecondTab((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.TextSampleSecondTab.textOptionalPropertyInSecondTab == event.getAffectedEditor()) {
-							updateTextOptionalPropertyInSecondTab((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
-						if (EefnrViewsRepository.TextSampleSecondTab.textRequiredPropertyInSecondTab == event.getAffectedEditor()) {
-							updateTextRequiredPropertyInSecondTab((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -268,16 +258,16 @@ public class TextSampleWithTwoTabsTextSampleSecondTabPropertiesEditionComponent
 		}
 	}
 
-	private void updateTextOptionalPropertyInSecondTab(java.lang.String newValue) {
-		textSampleWithTwoTabs.setTextOptionalPropertyInSecondTab(newValue);	
-	}
-
-	private void updateTextRequiredPropertyInSecondTab(java.lang.String newValue) {
-		textSampleWithTwoTabs.setTextRequiredPropertyInSecondTab(newValue);	
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.TextSampleSecondTab.textOptionalPropertyInSecondTab == event.getAffectedEditor()) {
+			textSampleWithTwoTabs.setTextOptionalPropertyInSecondTab((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
+		if (EefnrViewsRepository.TextSampleSecondTab.textRequiredPropertyInSecondTab == event.getAffectedEditor()) {
+			textSampleWithTwoTabs.setTextRequiredPropertyInSecondTab((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 ce0aa62a1..840133417 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
@@ -236,23 +236,13 @@ public class TextareaSamplePropertiesEditionComponent extends StandardProperties
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.TextareaSample.textareaRequiredProperty == event.getAffectedEditor()) {
-					updateTextareaRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
-				if (EefnrViewsRepository.TextareaSample.textareaOptionalProperty == event.getAffectedEditor()) {
-					updateTextareaOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.TextareaSample.textareaRequiredProperty == event.getAffectedEditor()) {
-							updateTextareaRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
-						if (EefnrViewsRepository.TextareaSample.textareaOptionalProperty == event.getAffectedEditor()) {
-							updateTextareaOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -266,16 +256,16 @@ public class TextareaSamplePropertiesEditionComponent extends StandardProperties
 		}
 	}
 
-	private void updateTextareaRequiredProperty(java.lang.String newValue) {
-		textareaSample.setTextareaRequiredProperty(newValue);	
-	}
-
-	private void updateTextareaOptionalProperty(java.lang.String newValue) {
-		textareaSample.setTextareaOptionalProperty(newValue);	
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.TextareaSample.textareaRequiredProperty == event.getAffectedEditor()) {
+			textareaSample.setTextareaRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
+		if (EefnrViewsRepository.TextareaSample.textareaOptionalProperty == event.getAffectedEditor()) {
+			textareaSample.setTextareaOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 0f9a26b09..172f305a5 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
@@ -686,161 +686,13 @@ if (EefnrPackage.eINSTANCE.getTotalSample_AdvancedtablecompositionOptionalProper
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrViewsRepository.TotalSample.textRequiredProperty == event.getAffectedEditor()) {
-					updateTextRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
-				if (EefnrViewsRepository.TotalSample.textOptionalProperty == event.getAffectedEditor()) {
-					updateTextOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
-				if (EefnrViewsRepository.TotalSample.checkboxRequiredProperty == event.getAffectedEditor()) {
-					updateCheckboxRequiredProperty((Boolean)event.getNewValue());
-				}
-				if (EefnrViewsRepository.TotalSample.checkboxOptionalProperty == event.getAffectedEditor()) {
-					updateCheckboxOptionalProperty((Boolean)event.getNewValue());
-				}
-				if (EefnrViewsRepository.TotalSample.textareaRequiredProperty == event.getAffectedEditor()) {
-					updateTextareaRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
-				if (EefnrViewsRepository.TotalSample.textareaOptionalProperty == event.getAffectedEditor()) {
-					updateTextareaOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
-				if (EefnrViewsRepository.TotalSample.radioRequiredProperty == event.getAffectedEditor()) {
-					updateRadioRequiredProperty((ENUM_SAMPLE)event.getNewValue());
-				}
-				if (EefnrViewsRepository.TotalSample.radioOptionalProperty == event.getAffectedEditor()) {
-					updateRadioOptionalProperty((ENUM_SAMPLE)event.getNewValue());
-				}
-				if (EefnrViewsRepository.TotalSample.eobjectflatcomboviewerRequiredProperty == event.getAffectedEditor()) {
-					updateEobjectflatcomboviewerRequiredProperty((TotalSample)event.getNewValue());
-				}
-				if (EefnrViewsRepository.TotalSample.eobjectflatcomboviewerOptionalProperty == event.getAffectedEditor()) {
-					updateEobjectflatcomboviewerOptionalProperty((TotalSample)event.getNewValue());
-				}
-				if (EefnrViewsRepository.TotalSample.referencestableRequiredProperty == event.getAffectedEditor()) {
-					updateReferencestableRequiredProperty(event);
-				}
-				if (EefnrViewsRepository.TotalSample.referencestableOptionalProperty == event.getAffectedEditor()) {
-					updateReferencestableOptionalProperty(event);
-				}
-				if (EefnrViewsRepository.TotalSample.emfcomboviewerRequiredProperty == event.getAffectedEditor()) {
-					updateEmfcomboviewerRequiredProperty((ENUM_SAMPLE)event.getNewValue());
-				}
-				if (EefnrViewsRepository.TotalSample.emfcomboviewerOptionalProperty == event.getAffectedEditor()) {
-					updateEmfcomboviewerOptionalProperty((ENUM_SAMPLE)event.getNewValue());
-				}
-				if (EefnrViewsRepository.TotalSample.multivaluededitorRequiredProperty == event.getAffectedEditor()) {
-					updateMultivaluededitorRequiredProperty(event);
-				}
-				if (EefnrViewsRepository.TotalSample.multivaluededitorOptionalProperty == event.getAffectedEditor()) {
-					updateMultivaluededitorOptionalProperty(event);
-				}
-				if (EefnrViewsRepository.TotalSample.tablecompositionRequiredProperty == event.getAffectedEditor()) {
-					updateTablecompositionRequiredProperty(event);
-				}
-				if (EefnrViewsRepository.TotalSample.tablecompositionOptionalProperty == event.getAffectedEditor()) {
-					updateTablecompositionOptionalProperty(event);
-				}
-				if (EefnrViewsRepository.TotalSample.advancedreferencestableRequiredProperty == event.getAffectedEditor()) {
-					updateAdvancedreferencestableRequiredProperty(event);
-				}
-				if (EefnrViewsRepository.TotalSample.advancedreferencestableOptionalProperty == event.getAffectedEditor()) {
-					updateAdvancedreferencestableOptionalProperty(event);
-				}
-				if (EefnrViewsRepository.TotalSample.advancedeobjectflatcomboviewerRequiredPropery == event.getAffectedEditor()) {
-					updateAdvancedeobjectflatcomboviewerRequiredPropery((TotalSample)event.getNewValue());
-				}
-				if (EefnrViewsRepository.TotalSample.advancedeobjectflatcomboviewerOptionalPropery == event.getAffectedEditor()) {
-					updateAdvancedeobjectflatcomboviewerOptionalPropery((TotalSample)event.getNewValue());
-				}
-				if (EefnrViewsRepository.TotalSample.advancedtablecompositionRequiredProperty == event.getAffectedEditor()) {
-					updateAdvancedtablecompositionRequiredProperty(event);
-				}
-				if (EefnrViewsRepository.TotalSample.advancedtablecompositionOptionalProperty == event.getAffectedEditor()) {
-					updateAdvancedtablecompositionOptionalProperty(event);
-				}
-				if (EefnrViewsRepository.TotalSample.name == event.getAffectedEditor()) {
-					updateName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrViewsRepository.TotalSample.textRequiredProperty == event.getAffectedEditor()) {
-							updateTextRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
-						if (EefnrViewsRepository.TotalSample.textOptionalProperty == event.getAffectedEditor()) {
-							updateTextOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
-						if (EefnrViewsRepository.TotalSample.checkboxRequiredProperty == event.getAffectedEditor()) {
-							updateCheckboxRequiredProperty((Boolean)event.getNewValue());
-						}
-						if (EefnrViewsRepository.TotalSample.checkboxOptionalProperty == event.getAffectedEditor()) {
-							updateCheckboxOptionalProperty((Boolean)event.getNewValue());
-						}
-						if (EefnrViewsRepository.TotalSample.textareaRequiredProperty == event.getAffectedEditor()) {
-							updateTextareaRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
-						if (EefnrViewsRepository.TotalSample.textareaOptionalProperty == event.getAffectedEditor()) {
-							updateTextareaOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
-						if (EefnrViewsRepository.TotalSample.radioRequiredProperty == event.getAffectedEditor()) {
-							updateRadioRequiredProperty((ENUM_SAMPLE)event.getNewValue());
-						}
-						if (EefnrViewsRepository.TotalSample.radioOptionalProperty == event.getAffectedEditor()) {
-							updateRadioOptionalProperty((ENUM_SAMPLE)event.getNewValue());
-						}
-						if (EefnrViewsRepository.TotalSample.eobjectflatcomboviewerRequiredProperty == event.getAffectedEditor()) {
-							updateEobjectflatcomboviewerRequiredProperty((TotalSample)event.getNewValue());
-						}
-						if (EefnrViewsRepository.TotalSample.eobjectflatcomboviewerOptionalProperty == event.getAffectedEditor()) {
-							updateEobjectflatcomboviewerOptionalProperty((TotalSample)event.getNewValue());
-						}
-						if (EefnrViewsRepository.TotalSample.referencestableRequiredProperty == event.getAffectedEditor()) {
-							updateReferencestableRequiredProperty(event);
-						}
-						if (EefnrViewsRepository.TotalSample.referencestableOptionalProperty == event.getAffectedEditor()) {
-							updateReferencestableOptionalProperty(event);
-						}
-						if (EefnrViewsRepository.TotalSample.emfcomboviewerRequiredProperty == event.getAffectedEditor()) {
-							updateEmfcomboviewerRequiredProperty((ENUM_SAMPLE)event.getNewValue());
-						}
-						if (EefnrViewsRepository.TotalSample.emfcomboviewerOptionalProperty == event.getAffectedEditor()) {
-							updateEmfcomboviewerOptionalProperty((ENUM_SAMPLE)event.getNewValue());
-						}
-						if (EefnrViewsRepository.TotalSample.multivaluededitorRequiredProperty == event.getAffectedEditor()) {
-							updateMultivaluededitorRequiredProperty(event);
-						}
-						if (EefnrViewsRepository.TotalSample.multivaluededitorOptionalProperty == event.getAffectedEditor()) {
-							updateMultivaluededitorOptionalProperty(event);
-						}
-						if (EefnrViewsRepository.TotalSample.tablecompositionRequiredProperty == event.getAffectedEditor()) {
-							updateTablecompositionRequiredProperty(event);
-						}
-						if (EefnrViewsRepository.TotalSample.tablecompositionOptionalProperty == event.getAffectedEditor()) {
-							updateTablecompositionOptionalProperty(event);
-						}
-						if (EefnrViewsRepository.TotalSample.advancedreferencestableRequiredProperty == event.getAffectedEditor()) {
-							updateAdvancedreferencestableRequiredProperty(event);
-						}
-						if (EefnrViewsRepository.TotalSample.advancedreferencestableOptionalProperty == event.getAffectedEditor()) {
-							updateAdvancedreferencestableOptionalProperty(event);
-						}
-						if (EefnrViewsRepository.TotalSample.advancedeobjectflatcomboviewerRequiredPropery == event.getAffectedEditor()) {
-							updateAdvancedeobjectflatcomboviewerRequiredPropery((TotalSample)event.getNewValue());
-						}
-						if (EefnrViewsRepository.TotalSample.advancedeobjectflatcomboviewerOptionalPropery == event.getAffectedEditor()) {
-							updateAdvancedeobjectflatcomboviewerOptionalPropery((TotalSample)event.getNewValue());
-						}
-						if (EefnrViewsRepository.TotalSample.advancedtablecompositionRequiredProperty == event.getAffectedEditor()) {
-							updateAdvancedtablecompositionRequiredProperty(event);
-						}
-						if (EefnrViewsRepository.TotalSample.advancedtablecompositionOptionalProperty == event.getAffectedEditor()) {
-							updateAdvancedtablecompositionOptionalProperty(event);
-						}
-						if (EefnrViewsRepository.TotalSample.name == event.getAffectedEditor()) {
-							updateName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -854,161 +706,138 @@ if (EefnrPackage.eINSTANCE.getTotalSample_AdvancedtablecompositionOptionalProper
 		}
 	}
 
-	private void updateTextRequiredProperty(java.lang.String newValue) {
-		totalSample.setTextRequiredProperty(newValue);	
-	}
-
-	private void updateTextOptionalProperty(java.lang.String newValue) {
-		totalSample.setTextOptionalProperty(newValue);	
-	}
-
-	private void updateCheckboxRequiredProperty(Boolean newValue) {
-		totalSample.setCheckboxRequiredProperty(newValue);	
-	}
-
-	private void updateCheckboxOptionalProperty(Boolean newValue) {
-		totalSample.setCheckboxOptionalProperty(newValue);	
-	}
-
-	private void updateTextareaRequiredProperty(java.lang.String newValue) {
-		totalSample.setTextareaRequiredProperty(newValue);	
-	}
-
-	private void updateTextareaOptionalProperty(java.lang.String newValue) {
-		totalSample.setTextareaOptionalProperty(newValue);	
-	}
-
-	private void updateRadioRequiredProperty(ENUM_SAMPLE newValue) {
-		totalSample.setRadioRequiredProperty(newValue);	
-	}
-
-	private void updateRadioOptionalProperty(ENUM_SAMPLE newValue) {
-		totalSample.setRadioOptionalProperty(newValue);	
-	}
-
-	private void updateEobjectflatcomboviewerRequiredProperty(TotalSample newValue) {
-		eobjectflatcomboviewerRequiredPropertySettings.setToReference(newValue);	
-	}
-
-	private void updateEobjectflatcomboviewerOptionalProperty(TotalSample newValue) {
-		eobjectflatcomboviewerOptionalPropertySettings.setToReference(newValue);	
-	}
-
-	private void updateReferencestableRequiredProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof TotalSample) {
-				referencestableRequiredPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				referencestableRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrViewsRepository.TotalSample.textRequiredProperty == event.getAffectedEditor()) {
+			totalSample.setTextRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
 		}
-	}
-
-	private void updateReferencestableOptionalProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof TotalSample) {
-				referencestableOptionalPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				referencestableOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+		if (EefnrViewsRepository.TotalSample.textOptionalProperty == event.getAffectedEditor()) {
+			totalSample.setTextOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
 		}
-	}
-
-	private void updateEmfcomboviewerRequiredProperty(ENUM_SAMPLE newValue) {
-		totalSample.setEmfcomboviewerRequiredProperty(newValue);	
-	}
-
-	private void updateEmfcomboviewerOptionalProperty(ENUM_SAMPLE newValue) {
-		totalSample.setEmfcomboviewerOptionalProperty(newValue);	
-	}
-
-	private void updateMultivaluededitorRequiredProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.SET) {
-			totalSample.getMultivaluededitorRequiredProperty().clear();
-			totalSample.getMultivaluededitorRequiredProperty().addAll(((List) event.getNewValue()));
+		if (EefnrViewsRepository.TotalSample.checkboxRequiredProperty == event.getAffectedEditor()) {
+			totalSample.setCheckboxRequiredProperty((Boolean)event.getNewValue());	
 		}
-	}
-
-	private void updateMultivaluededitorOptionalProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.SET) {
-			totalSample.getMultivaluededitorOptionalProperty().clear();
-			totalSample.getMultivaluededitorOptionalProperty().addAll(((List) event.getNewValue()));
+		if (EefnrViewsRepository.TotalSample.checkboxOptionalProperty == event.getAffectedEditor()) {
+			totalSample.setCheckboxOptionalProperty((Boolean)event.getNewValue());	
 		}
-	}
-
-	private void updateTablecompositionRequiredProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof Sample) {
-				tablecompositionRequiredPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				tablecompositionRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+		if (EefnrViewsRepository.TotalSample.textareaRequiredProperty == event.getAffectedEditor()) {
+			totalSample.setTextareaRequiredProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
 		}
-	}
-
-	private void updateTablecompositionOptionalProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof Sample) {
-				tablecompositionOptionalPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				tablecompositionOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+		if (EefnrViewsRepository.TotalSample.textareaOptionalProperty == event.getAffectedEditor()) {
+			totalSample.setTextareaOptionalProperty((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
 		}
-	}
-
-	private void updateAdvancedreferencestableRequiredProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof TotalSample) {
-				advancedreferencestableRequiredPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				advancedreferencestableRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+		if (EefnrViewsRepository.TotalSample.radioRequiredProperty == event.getAffectedEditor()) {
+			totalSample.setRadioRequiredProperty((ENUM_SAMPLE)event.getNewValue());
 		}
-	}
-
-	private void updateAdvancedreferencestableOptionalProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof TotalSample) {
-				advancedreferencestableOptionalPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				advancedreferencestableOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+		if (EefnrViewsRepository.TotalSample.radioOptionalProperty == event.getAffectedEditor()) {
+			totalSample.setRadioOptionalProperty((ENUM_SAMPLE)event.getNewValue());
 		}
-	}
-
-	private void updateAdvancedeobjectflatcomboviewerRequiredPropery(TotalSample newValue) {
-		advancedeobjectflatcomboviewerRequiredProperySettings.setToReference(newValue);	
-	}
-
-	private void updateAdvancedeobjectflatcomboviewerOptionalPropery(TotalSample newValue) {
-		advancedeobjectflatcomboviewerOptionalProperySettings.setToReference(newValue);	
-	}
-
-	private void updateAdvancedtablecompositionRequiredProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof Sample) {
-				advancedtablecompositionRequiredPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				advancedtablecompositionRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+		if (EefnrViewsRepository.TotalSample.eobjectflatcomboviewerRequiredProperty == event.getAffectedEditor()) {
+			eobjectflatcomboviewerRequiredPropertySettings.setToReference((TotalSample)event.getNewValue());
 		}
-	}
-
-	private void updateAdvancedtablecompositionOptionalProperty(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof Sample) {
-				advancedtablecompositionOptionalPropertySettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				advancedtablecompositionOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+		if (EefnrViewsRepository.TotalSample.eobjectflatcomboviewerOptionalProperty == event.getAffectedEditor()) {
+			eobjectflatcomboviewerOptionalPropertySettings.setToReference((TotalSample)event.getNewValue());
+		}
+		if (EefnrViewsRepository.TotalSample.referencestableRequiredProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof TotalSample) {
+						referencestableRequiredPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						referencestableRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
+		}
+		if (EefnrViewsRepository.TotalSample.referencestableOptionalProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof TotalSample) {
+						referencestableOptionalPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						referencestableOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
+		}
+		if (EefnrViewsRepository.TotalSample.emfcomboviewerRequiredProperty == event.getAffectedEditor()) {
+			totalSample.setEmfcomboviewerRequiredProperty((ENUM_SAMPLE)event.getNewValue());
+		}
+		if (EefnrViewsRepository.TotalSample.emfcomboviewerOptionalProperty == event.getAffectedEditor()) {
+			totalSample.setEmfcomboviewerOptionalProperty((ENUM_SAMPLE)event.getNewValue());
+		}
+		if (EefnrViewsRepository.TotalSample.multivaluededitorRequiredProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.SET) {
+					totalSample.getMultivaluededitorRequiredProperty().clear();
+					totalSample.getMultivaluededitorRequiredProperty().addAll(((List) event.getNewValue()));
+				}
+		}
+		if (EefnrViewsRepository.TotalSample.multivaluededitorOptionalProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.SET) {
+					totalSample.getMultivaluededitorOptionalProperty().clear();
+					totalSample.getMultivaluededitorOptionalProperty().addAll(((List) event.getNewValue()));
+				}
+		}
+		if (EefnrViewsRepository.TotalSample.tablecompositionRequiredProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof Sample) {
+						tablecompositionRequiredPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						tablecompositionRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
+		}
+		if (EefnrViewsRepository.TotalSample.tablecompositionOptionalProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof Sample) {
+						tablecompositionOptionalPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						tablecompositionOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
+		}
+		if (EefnrViewsRepository.TotalSample.advancedreferencestableRequiredProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof TotalSample) {
+						advancedreferencestableRequiredPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						advancedreferencestableRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
+		}
+		if (EefnrViewsRepository.TotalSample.advancedreferencestableOptionalProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof TotalSample) {
+						advancedreferencestableOptionalPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						advancedreferencestableOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
+		}
+		if (EefnrViewsRepository.TotalSample.advancedeobjectflatcomboviewerRequiredPropery == event.getAffectedEditor()) {
+			advancedeobjectflatcomboviewerRequiredProperySettings.setToReference((TotalSample)event.getNewValue());
+		}
+		if (EefnrViewsRepository.TotalSample.advancedeobjectflatcomboviewerOptionalPropery == event.getAffectedEditor()) {
+			advancedeobjectflatcomboviewerOptionalProperySettings.setToReference((TotalSample)event.getNewValue());
+		}
+		if (EefnrViewsRepository.TotalSample.advancedtablecompositionRequiredProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof Sample) {
+						advancedtablecompositionRequiredPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						advancedtablecompositionRequiredPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
+		}
+		if (EefnrViewsRepository.TotalSample.advancedtablecompositionOptionalProperty == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof Sample) {
+						advancedtablecompositionOptionalPropertySettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						advancedtablecompositionOptionalPropertySettings.removeFromReference((EObject) event.getNewValue());
+				}
+		}
+		if (EefnrViewsRepository.TotalSample.name == event.getAffectedEditor()) {
+			totalSample.setName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
 		}
 	}
 
-	private void updateName(java.lang.String newValue) {
-		totalSample.setName(newValue);	
-	}
-
-
 
 	/**
 	 * {@inheritDoc}
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 4240cf410..e1f0820c7 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
@@ -223,17 +223,13 @@ public class CheckBoxExtendedEditorSampleBasePropertiesEditionComponent extends
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrextViewsRepository.CheckBoxExtendedEditorSample.checkboxEditorSample == event.getAffectedEditor()) {
-					updateCheckboxEditorSample((Boolean)event.getNewValue());
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrextViewsRepository.CheckBoxExtendedEditorSample.checkboxEditorSample == event.getAffectedEditor()) {
-							updateCheckboxEditorSample((Boolean)event.getNewValue());
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -247,12 +243,13 @@ public class CheckBoxExtendedEditorSampleBasePropertiesEditionComponent extends
 		}
 	}
 
-	private void updateCheckboxEditorSample(Boolean newValue) {
-		checkBoxExtendedEditorSample.setCheckboxEditorSample(newValue);	
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrextViewsRepository.CheckBoxExtendedEditorSample.checkboxEditorSample == event.getAffectedEditor()) {
+			checkBoxExtendedEditorSample.setCheckboxEditorSample((Boolean)event.getNewValue());	
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 4bb1318c5..a606bdd40 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
@@ -251,17 +251,13 @@ if (EefnrextPackage.eINSTANCE.getFlatReferenceExtendedEditorSample_FlatReference
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrextViewsRepository.FlatReferenceExtendedEditorSample.flatReferenceEditorSample == event.getAffectedEditor()) {
-					updateFlatReferenceEditorSample(event);
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrextViewsRepository.FlatReferenceExtendedEditorSample.flatReferenceEditorSample == event.getAffectedEditor()) {
-							updateFlatReferenceEditorSample(event);
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -275,13 +271,14 @@ if (EefnrextPackage.eINSTANCE.getFlatReferenceExtendedEditorSample_FlatReference
 		}
 	}
 
-	private void updateFlatReferenceEditorSample(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.SET)
-			flatReferenceEditorSampleSettings.setToReference((List<EObject>) event.getNewValue());
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrextViewsRepository.FlatReferenceExtendedEditorSample.flatReferenceEditorSample == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.SET)
+					flatReferenceEditorSampleSettings.setToReference((List<EObject>) event.getNewValue());
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 e7dde4362..132396a25 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
@@ -237,23 +237,13 @@ public class FlatReferenceExtendedEditorSampleSecondFlatReferenceExtendedEditorS
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.demo == event.getAffectedEditor()) {
-					updateDemo((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
-				if (EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.size == event.getAffectedEditor()) {
-					updateSize((EEFConverterUtil.createIntFromString(EcorePackage.eINSTANCE.getEInt(), (String)event.getNewValue())));
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.demo == event.getAffectedEditor()) {
-							updateDemo((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
-						if (EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.size == event.getAffectedEditor()) {
-							updateSize((EEFConverterUtil.createIntFromString(EcorePackage.eINSTANCE.getEInt(), (String)event.getNewValue())));
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -267,16 +257,16 @@ public class FlatReferenceExtendedEditorSampleSecondFlatReferenceExtendedEditorS
 		}
 	}
 
-	private void updateDemo(java.lang.String newValue) {
-		flatReferenceExtendedEditorSample.setDemo(newValue);	
-	}
-
-	private void updateSize(int newValue) {
-		flatReferenceExtendedEditorSample.setSize(newValue);	
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.demo == event.getAffectedEditor()) {
+			flatReferenceExtendedEditorSample.setDemo((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
+		if (EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.size == event.getAffectedEditor()) {
+			flatReferenceExtendedEditorSample.setSize((EEFConverterUtil.createIntFromString(EcorePackage.eINSTANCE.getEInt(), (String)event.getNewValue())));
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 932002e6b..1a4fd527b 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
@@ -226,17 +226,13 @@ public class TableCompositionTargetExtensionEditorSamplePropertiesEditionCompone
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (EefnrextViewsRepository.TableCompositionTargetExtensionEditorSample.name == event.getAffectedEditor()) {
-					updateName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (EefnrextViewsRepository.TableCompositionTargetExtensionEditorSample.name == event.getAffectedEditor()) {
-							updateName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -250,12 +246,13 @@ public class TableCompositionTargetExtensionEditorSamplePropertiesEditionCompone
 		}
 	}
 
-	private void updateName(java.lang.String newValue) {
-		tableCompositionTargetExtensionEditorSample.setName(newValue);	
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (EefnrextViewsRepository.TableCompositionTargetExtensionEditorSample.name == event.getAffectedEditor()) {
+			tableCompositionTargetExtensionEditorSample.setName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 f27f7f2dd..39e7e638a 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
@@ -264,23 +264,13 @@ if (flatreferenceEditorSettings.isAffectingFeature((EStructuralFeature)msg.getFe
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (NavigationViewsRepository.DeferedFlatReferencesTableSample.name == event.getAffectedEditor()) {
-					updateName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
-				if (NavigationViewsRepository.DeferedFlatReferencesTableSample.flatReferencesTableSampleEditor == event.getAffectedEditor()) {
-					updateFlatReferencesTableSampleEditor(event);
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (NavigationViewsRepository.DeferedFlatReferencesTableSample.name == event.getAffectedEditor()) {
-							updateName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
-						if (NavigationViewsRepository.DeferedFlatReferencesTableSample.flatReferencesTableSampleEditor == event.getAffectedEditor()) {
-							updateFlatReferencesTableSampleEditor(event);
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -294,17 +284,17 @@ if (flatreferenceEditorSettings.isAffectingFeature((EStructuralFeature)msg.getFe
 		}
 	}
 
-	private void updateName(java.lang.String newValue) {
-		deferedFlatReferenceTableEditorSample.setName(newValue);	
-	}
-
-	private void updateFlatReferencesTableSampleEditor(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.SET)
-			flatreferenceEditorSettings.setToReference((List<EObject>) event.getNewValue());
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (NavigationViewsRepository.DeferedFlatReferencesTableSample.name == event.getAffectedEditor()) {
+			deferedFlatReferenceTableEditorSample.setName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
+		if (NavigationViewsRepository.DeferedFlatReferencesTableSample.flatReferencesTableSampleEditor == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.SET)
+					flatreferenceEditorSettings.setToReference((List<EObject>) event.getNewValue());
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 d93f0283a..bda5508d9 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
@@ -259,23 +259,13 @@ if (flatreferenceEditorSettings.isAffectingFeature((EStructuralFeature)msg.getFe
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (NavigationViewsRepository.DeferedReferencesTableSample.name == event.getAffectedEditor()) {
-					updateName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
-				if (NavigationViewsRepository.DeferedReferencesTableSample.referencesTableSampleEditor == event.getAffectedEditor()) {
-					updateFlatReferencesTableSampleEditor(event);
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (NavigationViewsRepository.DeferedReferencesTableSample.name == event.getAffectedEditor()) {
-							updateName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
-						if (NavigationViewsRepository.DeferedReferencesTableSample.referencesTableSampleEditor == event.getAffectedEditor()) {
-							updateFlatReferencesTableSampleEditor(event);
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -289,22 +279,22 @@ if (flatreferenceEditorSettings.isAffectingFeature((EStructuralFeature)msg.getFe
 		}
 	}
 
-	private void updateName(java.lang.String newValue) {
-		deferedReferenceTableEditorSample.setName(newValue);	
-	}
-
-	private void updateFlatReferencesTableSampleEditor(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof TotalSample) {
-				flatreferenceEditorSettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				flatreferenceEditorSettings.removeFromReference((EObject) event.getNewValue());
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (NavigationViewsRepository.DeferedReferencesTableSample.name == event.getAffectedEditor()) {
+			deferedReferenceTableEditorSample.setName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
+		if (NavigationViewsRepository.DeferedReferencesTableSample.referencesTableSampleEditor == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof TotalSample) {
+						flatreferenceEditorSettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						flatreferenceEditorSettings.removeFromReference((EObject) event.getNewValue());
+				}
 		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 582d43875..00df0f6cc 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
@@ -222,17 +222,13 @@ public class AbstractEnabledSampleBasePropertiesEditionComponent extends Standar
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (ReferencesViewsRepository.AbstractEnabledSample.enabled == event.getAffectedEditor()) {
-					updateEnabled((Boolean)event.getNewValue());
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (ReferencesViewsRepository.AbstractEnabledSample.enabled == event.getAffectedEditor()) {
-							updateEnabled((Boolean)event.getNewValue());
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -246,12 +242,13 @@ public class AbstractEnabledSampleBasePropertiesEditionComponent extends Standar
 		}
 	}
 
-	private void updateEnabled(Boolean newValue) {
-		abstractEnabledSample.setEnabled(newValue);	
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (ReferencesViewsRepository.AbstractEnabledSample.enabled == event.getAffectedEditor()) {
+			abstractEnabledSample.setEnabled((Boolean)event.getNewValue());	
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 a49acfd12..b42b71be8 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
@@ -226,17 +226,13 @@ public class AbstractSamplePropertiesEditionComponent extends StandardProperties
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (ReferencesViewsRepository.AbstractSample.name == event.getAffectedEditor()) {
-					updateName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (ReferencesViewsRepository.AbstractSample.name == event.getAffectedEditor()) {
-							updateName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -250,12 +246,13 @@ public class AbstractSamplePropertiesEditionComponent extends StandardProperties
 		}
 	}
 
-	private void updateName(java.lang.String newValue) {
-		abstractSample.setName(newValue);	
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (ReferencesViewsRepository.AbstractSample.name == event.getAffectedEditor()) {
+			abstractSample.setName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue()));
+		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
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 bf9b706b4..f6701423f 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
@@ -247,17 +247,13 @@ if (ReferencesPackage.eINSTANCE.getReferenceEnabledSample_Reference().equals(msg
 		if (!isInitializing()) {
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
-				if (ReferencesViewsRepository.ReferenceEnabledSample.reference == event.getAffectedEditor()) {
-					updateReference(event);
-				}
+				updatePart(event);
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
 				liveEditingDomain.getCommandStack().execute(new StandardEditingCommand() {
 					
 					public void execute() {
-						if (ReferencesViewsRepository.ReferenceEnabledSample.reference == event.getAffectedEditor()) {
-							updateReference(event);
-						}
+						updatePart(event);
 					}
 				});			
 			}
@@ -271,18 +267,19 @@ if (ReferencesPackage.eINSTANCE.getReferenceEnabledSample_Reference().equals(msg
 		}
 	}
 
-	private void updateReference(final IPropertiesEditionEvent event) {
-		if (event.getKind() == PropertiesEditionEvent.ADD)  {
-			if (event.getNewValue() instanceof TotalSample) {
-				referenceSettings.addToReference((EObject) event.getNewValue());
-			}
-		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
-				referenceSettings.removeFromReference((EObject) event.getNewValue());
+	protected void updatePart(final IPropertiesEditionEvent event) {
+		if (ReferencesViewsRepository.ReferenceEnabledSample.reference == event.getAffectedEditor()) {
+				if (event.getKind() == PropertiesEditionEvent.ADD)  {
+					if (event.getNewValue() instanceof TotalSample) {
+						referenceSettings.addToReference((EObject) event.getNewValue());
+					}
+				} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+						referenceSettings.removeFromReference((EObject) event.getNewValue());
+				}
 		}
 	}
 
 
-
 	/**
 	 * {@inheritDoc}
 	 * 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/references_properties.plugin.xml b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/references_properties.plugin.xml
index 2f230fb6e..ef01ffd06 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/references_properties.plugin.xml
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/references_properties.plugin.xml
@@ -25,19 +25,19 @@
    <extension
          point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider">
       <PropertiesEditionPartProvider
-            providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider">
+            providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider">
       </PropertiesEditionPartProvider>
    </extension>
    <extension
          point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider">
       <PropertiesEditionPartProvider
-            providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider">
+            providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider">
       </PropertiesEditionPartProvider>
    </extension>
    <extension
          point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider">
       <PropertiesEditionPartProvider
-            providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider">
+            providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider">
       </PropertiesEditionPartProvider>
    </extension>