Merge branch 'v1_2_0_BRANCH' of ssh://git.eclipse.org/gitroot/eef/org.eclipse.eef into v1_2_0_BRANCH

139 files changed, 1200 insertions, 0 deletions

diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/checkbox/checkboxFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/checkbox/checkboxFormImpl.mtl
index bbd4e876b..d4f063bb8 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/checkbox/checkboxFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/checkbox/checkboxFormImpl.mtl
@@ -64,6 +64,9 @@ return create[editor.name.toJavaClassifier()/]Checkbox(widgetFactory, parent);
 		EditingUtils.setID([editor.elementEditorName()/], [editor.editorID()/]);
 		EditingUtils.setEEFtype([editor.elementEditorName()/], "eef::[editor.representation.name/]"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].FORM_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('Checkbox'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/checkbox/checkboxSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/checkbox/checkboxSWTImpl.mtl
index 616d8826a..5346836de 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/checkbox/checkboxSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/checkbox/checkboxSWTImpl.mtl
@@ -64,6 +64,9 @@ return create[editor.name.toJavaClassifier()/]Checkbox(parent);
 		EditingUtils.setID([editor.elementEditorName()/], [editor.editorID()/]);
 		EditingUtils.setEEFtype([editor.elementEditorName()/], "eef::[editor.representation.name/]"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].SWT_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('Checkbox'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/combo/comboFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/combo/comboFormImpl.mtl
index aab893861..bb8a6c9ef 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/combo/comboFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/combo/comboFormImpl.mtl
@@ -70,6 +70,9 @@ return create[editor.name.toJavaClassifier()/]EMFComboViewer(widgetFactory, pare
 		EditingUtils.setID([editor.elementEditorName()/].getCombo(), [editor.editorID()/]);
 		EditingUtils.setEEFtype([editor.elementEditorName()/].getCombo(), "eef::[editor.representation.name/]");
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].FORM_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('EMFComboViewer'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/combo/comboSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/combo/comboSWTImpl.mtl
index 80df68497..3634d09ba 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/combo/comboSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/combo/comboSWTImpl.mtl
@@ -69,6 +69,9 @@ return create[editor.name.toJavaClassifier()/]EMFComboViewer(parent);
 		EditingUtils.setID([editor.elementEditorName()/].getCombo(), [editor.editorID()/]);
 		EditingUtils.setEEFtype([editor.elementEditorName()/].getCombo(), "eef::[editor.representation.name/]"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].SWT_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('EMFComboViewer'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/emfcomboviewer/emfcomboviewerFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/emfcomboviewer/emfcomboviewerFormImpl.mtl
index 050e2d32d..0b7a68473 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/emfcomboviewer/emfcomboviewerFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/emfcomboviewer/emfcomboviewerFormImpl.mtl
@@ -70,6 +70,9 @@ return create[editor.name.toJavaClassifier()/]EMFComboViewer(widgetFactory, pare
 		});
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].FORM_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('EMFComboViewer'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/emfcomboviewer/emfcomboviewerSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/emfcomboviewer/emfcomboviewerSWTImpl.mtl
index d5f078c4c..fae015f78 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/emfcomboviewer/emfcomboviewerSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/emfcomboviewer/emfcomboviewerSWTImpl.mtl
@@ -68,6 +68,9 @@ return create[editor.name.toJavaClassifier()/]EMFComboViewer(parent);
 		});
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].SWT_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('EMFComboViewer'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/eobjectflatcomboviewer/eobjectflatcomboviewerFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/eobjectflatcomboviewer/eobjectflatcomboviewerFormImpl.mtl
index 6cbdef2c0..b035eca1a 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/eobjectflatcomboviewer/eobjectflatcomboviewerFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/eobjectflatcomboviewer/eobjectflatcomboviewerFormImpl.mtl
@@ -71,6 +71,9 @@ return create[editor.name.toJavaClassifier()/]FlatComboViewer(parent, widgetFact
 		});
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].FORM_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('FlatComboViewer'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
@@ -127,6 +130,9 @@ return create[editor.name.toJavaClassifier()/]FlatComboViewer(parent, widgetFact
 		[editor.elementEditorName()/].setLayoutData([editor.elementEditorName()/]Data);
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].FORM_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('FlatComboViewer'))]
+
+		// [/protected]
 		return parent;
 	}
 
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/eobjectflatcomboviewer/eobjectflatcomboviewerSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/eobjectflatcomboviewer/eobjectflatcomboviewerSWTImpl.mtl
index f08589544..41c9db768 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/eobjectflatcomboviewer/eobjectflatcomboviewerSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/eobjectflatcomboviewer/eobjectflatcomboviewerSWTImpl.mtl
@@ -63,6 +63,9 @@ return create[editor.name.toJavaClassifier()/]FlatComboViewer(parent);
 		[editor.elementEditorName()/].setLayoutData([editor.elementEditorName()/]Data);
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].SWT_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('FlatComboViewer'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
@@ -117,6 +120,9 @@ return create[editor.name.toJavaClassifier()/]AdvancedFlatComboViewer(parent);
 		[editor.elementEditorName()/].setLayoutData([editor.elementEditorName()/]Data);
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].SWT_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('AdvancedFlatComboViewer'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/flatreferencestable/flatreferencestableFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/flatreferencestable/flatreferencestableFormImpl.mtl
index b5bed18b1..47ae5b40e 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/flatreferencestable/flatreferencestableFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/flatreferencestable/flatreferencestableFormImpl.mtl
@@ -64,6 +64,9 @@ return create[editor.name.toJavaClassifier()/]FlatReferencesTable(widgetFactory,
 		[editor.elementEditorName()/].setLayoutData([editor.elementEditorName()/]Data);
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].FORM_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('FlatReferencesTable'))]
+
+		// [/protected]
 		return parent;
 	}
 
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/flatreferencestable/flatreferencestableSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/flatreferencestable/flatreferencestableSWTImpl.mtl
index f6c7cabf5..d9d6a328c 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/flatreferencestable/flatreferencestableSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/flatreferencestable/flatreferencestableSWTImpl.mtl
@@ -63,6 +63,9 @@ return create[editor.name.toJavaClassifier()/]FlatReferencesTable(parent);
 		[editor.elementEditorName()/].setLayoutData([editor.elementEditorName()/]Data);
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].SWT_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('FlatReferencesTable'))]
+
+		// [/protected]
 		return parent;
 	}
 
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/imageviewer/imageViewerFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/imageviewer/imageViewerFormImpl.mtl
index 2dc1905d0..6c38e7284 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/imageviewer/imageViewerFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/imageviewer/imageViewerFormImpl.mtl
@@ -64,6 +64,9 @@ return create[editor.name.toJavaClassifier()/]ImageViewer(widgetFactory, parent)
 		});
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].FORM_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('ImageViewer'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/imageviewer/imageViewerSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/imageviewer/imageViewerSWTImpl.mtl
index 360fc82f8..ed9e6df43 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/imageviewer/imageViewerSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/imageviewer/imageViewerSWTImpl.mtl
@@ -59,6 +59,9 @@ return create[editor.name.toJavaClassifier()/]ImageViewer(parent);
 		});
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].SWT_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('ImageViewer'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/multivaluededitor/multivaluededitorFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/multivaluededitor/multivaluededitorFormImpl.mtl
index 6244f38b5..53348ea0f 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/multivaluededitor/multivaluededitorFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/multivaluededitor/multivaluededitorFormImpl.mtl
@@ -87,6 +87,9 @@ return create[editor.name.toJavaClassifier()/]MultiValuedEditor(widgetFactory, p
 		});
 		EditingUtils.setID(edit[editor.name.toJavaClassifier()/], [editor.editorID()/]);
 		EditingUtils.setEEFtype(edit[editor.name.toJavaClassifier()/], "eef::[editor.representation.name/]::browsebutton"); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('MultiValuedEditor'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/multivaluededitor/multivaluededitorSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/multivaluededitor/multivaluededitorSWTImpl.mtl
index 8ed125d7f..c5c2981af 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/multivaluededitor/multivaluededitorSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/multivaluededitor/multivaluededitorSWTImpl.mtl
@@ -84,6 +84,9 @@ return create[editor.name.toJavaClassifier()/]MultiValuedEditor(parent);
 		});
 		EditingUtils.setID(edit[editor.name.toJavaClassifier()/], [editor.editorID()/]);
 		EditingUtils.setEEFtype(edit[editor.name.toJavaClassifier()/], "eef::[editor.representation.name/]::browsebutton"); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('MultiValuedEditor'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/radio/radioFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/radio/radioFormImpl.mtl
index a9e6f6670..0f05786e8 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/radio/radioFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/radio/radioFormImpl.mtl
@@ -55,6 +55,9 @@ return create[editor.name.toJavaClassifier()/]RadioViewer(parent);
 			}
 		});
 		[editor.elementEditorName()/]RadioViewer.setID([editor.editorID()/]);
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('RadioViewer'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/radio/radioSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/radio/radioSWTImpl.mtl
index 19c06bea3..1f301ce46 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/radio/radioSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/radio/radioSWTImpl.mtl
@@ -56,6 +56,9 @@ return create[editor.name.toJavaClassifier()/]RadioViewer(parent);
 		});
 		[editor.elementEditorName()/]RadioViewer.setID([editor.editorID()/]);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].SWT_KIND), null);
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('RadioViewer'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/referencetable/referencetableFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/referencetable/referencetableFormImpl.mtl
index f33d64215..9fc2869d8 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/referencetable/referencetableFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/referencetable/referencetableFormImpl.mtl
@@ -76,6 +76,9 @@ return create[editor.name.toJavaClassifier()/]ReferencesTable(widgetFactory, par
 		EditingUtils.setID([editor.elementEditorName()/].getTable(), [editor.editorID()/]);
 		EditingUtils.setEEFtype([editor.elementEditorName()/].getTable(), "eef::[editor.representation.name/]::field"); //$NON-NLS-1$
 		create[editor.name.toJavaClassifier()/]ControlPanel(parent, widgetFactory);
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('ReferencesTable'))]
+
+		// [/protected]
 		return parent;
 	}
 
@@ -179,6 +182,9 @@ return create[editor.name.toJavaClassifier()/]ReferencesTable(widgetFactory, par
 		});
 		EditingUtils.setID(remove[editor.name.toJavaClassifier()/], [editor.editorID()/]);
 		EditingUtils.setEEFtype(remove[editor.name.toJavaClassifier()/], "eef::[editor.representation.name/]::removebutton"); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('ControlPanel'))]
+
+		// [/protected]
 	}
 
 	/**
@@ -195,6 +201,9 @@ return create[editor.name.toJavaClassifier()/]ReferencesTable(widgetFactory, par
 			}
 
 		};
+		// [protected ('for add'.concat(editor.name.toJavaClassifier()))]
+
+		// [/protected]
 		dialog.open();
 		[editor.elementEditorName()/].refresh();
 	}
@@ -291,6 +300,9 @@ return create[editor.name.toJavaClassifier()/]ReferencesTable(widgetFactory, par
 		this.[editor.elementEditorName()/].disableMove();
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		[editor.elementEditorName()/].setEEFType("eef::[editor.representation.name/]"); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('ReferencesTable'))]
+
+		// [/protected]
 		return parent;
 	}
 
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/referencetable/referencetableSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/referencetable/referencetableSWTImpl.mtl
index bf7511f04..56d786796 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/referencetable/referencetableSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/referencetable/referencetableSWTImpl.mtl
@@ -192,6 +192,9 @@ return create[editor.name.toJavaClassifier()/]ReferencesTable(parent);
 
 		};
 		dialog.open();
+		// [protected ('for add'.concat(editor.name.toJavaClassifier()))]
+
+		// [/protected]
 		[editor.elementEditorName()/].refresh();
 	}
 
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/selectionfile/selectionDialogFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/selectionfile/selectionDialogFormImpl.mtl
index 9980b3f0c..c8913f9eb 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/selectionfile/selectionDialogFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/selectionfile/selectionDialogFormImpl.mtl
@@ -91,6 +91,9 @@ return create[editor.name.toJavaClassifier()/]SelectionDialog(widgetFactory, par
 			}
 		});
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].FORM_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('SelectionDialog'))]
+
+		// [/protected]
 		return parent;
 	}
 
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/selectionfile/selectionDialogSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/selectionfile/selectionDialogSWTImpl.mtl
index 1d65b3084..9cb6156f8 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/selectionfile/selectionDialogSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/selectionfile/selectionDialogSWTImpl.mtl
@@ -90,6 +90,9 @@ return create[editor.name.toJavaClassifier()/]SelectionDialog(parent);
 			}
 		});
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].SWT_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('SelectionDialog'))]
+
+		// [/protected]
 		return parent;
 	}
 	
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singleCompositionEditor/singlecompositioneditorFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singleCompositionEditor/singlecompositioneditorFormImpl.mtl
index 6af7b3306..2876e4425 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singleCompositionEditor/singlecompositioneditorFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singleCompositionEditor/singlecompositioneditorFormImpl.mtl
@@ -67,6 +67,9 @@ return create[editor.name.toJavaClassifier()/]SingleCompositionEditor(parent, wi
 		});
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].FORM_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('SingleCompositionEditor'))]
+
+		// [/protected]
 		return parent;
 	}
 
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singleCompositionEditor/singlecompositioneditorSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singleCompositionEditor/singlecompositioneditorSWTImpl.mtl
index 6db235be9..a29149021 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singleCompositionEditor/singlecompositioneditorSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singleCompositionEditor/singlecompositioneditorSWTImpl.mtl
@@ -65,6 +65,9 @@ return create[editor.name.toJavaClassifier()/]SingleCompositionEditor(parent);
 		});
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].SWT_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('SingleCompositionEditor'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singlecompositionviewer/singlecompositionviewerFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singlecompositionviewer/singlecompositionviewerFormImpl.mtl
index 8109f24df..6d4bf8017 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singlecompositionviewer/singlecompositionviewerFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singlecompositionviewer/singlecompositionviewerFormImpl.mtl
@@ -79,6 +79,9 @@ return create[editor.name.toJavaClassifier()/]SingleCompositionViewer(widgetFact
 				}
 			});
 		[/if]
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('SingleCompositionViewer'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singlecompositionviewer/singlecompositionviewerSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singlecompositionviewer/singlecompositionviewerSWTImpl.mtl
index 6ad346b79..acedf6be3 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singlecompositionviewer/singlecompositionviewerSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/singlecompositionviewer/singlecompositionviewerSWTImpl.mtl
@@ -92,6 +92,9 @@ return create[editor.name.toJavaClassifier()/]SingleCompositionViewer(parent);
 				}
 			});
 		[/if]
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('SingleCompositionViewer'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/tablecomposition/tablecompositionFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/tablecomposition/tablecompositionFormImpl.mtl
index 714b68256..a8da24b11 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/tablecomposition/tablecompositionFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/tablecomposition/tablecompositionFormImpl.mtl
@@ -132,6 +132,9 @@ return create[editor.name.toJavaClassifier()/]TableComposition(widgetFactory, pa
 		EditingUtils.setID([editor.elementEditorName()/].getTable(), [editor.editorID()/]);
 		EditingUtils.setEEFtype([editor.elementEditorName()/].getTable(), "eef::[editor.representation.name/]::field"); //$NON-NLS-1$
 		create[editor.name.toJavaClassifier()/]Panel(widgetFactory, tableContainer);
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('TableComposition'))]
+
+		// [/protected]
 		return container;
 	}
 
@@ -211,6 +214,9 @@ return create[editor.name.toJavaClassifier()/]TableComposition(widgetFactory, pa
 		});
 		EditingUtils.setID(edit[editor.name.toJavaClassifier()/], [editor.editorID()/]);
 		EditingUtils.setEEFtype(edit[editor.name.toJavaClassifier()/], "eef::[editor.representation.name/]::editbutton"); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('Panel'))]
+
+		// [/protected]
 		return [editor.elementEditorName()/]Panel;
 	}
 [/template]
@@ -306,6 +312,9 @@ return create[editor.name.toJavaClassifier()/]TableComposition(widgetFactory, pa
 		this.[editor.elementEditorName()/].setUpperBound([editor.involvedPropertiesEditionElement(pec).model.upperBound/]);
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		[editor.elementEditorName()/].setEEFType("eef::[editor.representation.name/]"); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('TableComposition'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/tablecomposition/tablecompositionSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/tablecomposition/tablecompositionSWTImpl.mtl
index 2c4172f95..604449b67 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/tablecomposition/tablecompositionSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/tablecomposition/tablecompositionSWTImpl.mtl
@@ -131,6 +131,9 @@ return create[editor.name.toJavaClassifier()/]TableComposition(parent);
 		EditingUtils.setID([editor.elementEditorName()/].getTable(), [editor.editorID()/]);
 		EditingUtils.setEEFtype([editor.elementEditorName()/].getTable(), "eef::[editor.representation.name/]::field"); //$NON-NLS-1$
 		create[editor.name.toJavaClassifier()/]Panel(tableContainer);
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('TableComposition'))]
+
+		// [/protected]
 		return container;
 	}
 
@@ -213,6 +216,9 @@ return create[editor.name.toJavaClassifier()/]TableComposition(parent);
 		});
 		EditingUtils.setID(edit[editor.name.toJavaClassifier()/], [editor.editorID()/]);
 		EditingUtils.setEEFtype(edit[editor.name.toJavaClassifier()/], "eef::[editor.representation.name/]::editbutton"); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('Panel'))]
+
+		// [/protected]
 		return [editor.elementEditorName()/]Panel;
 	}
 [/template]
@@ -307,6 +313,9 @@ return create[editor.name.toJavaClassifier()/]AdvancedTableComposition(parent);
 		this.[editor.elementEditorName()/].setUpperBound([editor.involvedPropertiesEditionElement(pec).model.upperBound/]);
 		[editor.elementEditorName()/].setID([editor.editorID()/]);
 		[editor.elementEditorName()/].setEEFType("eef::[editor.representation.name/]"); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('AdvancedTableComposition'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/text/textFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/text/textFormImpl.mtl
index e5e7ed80e..0c2033711 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/text/textFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/text/textFormImpl.mtl
@@ -107,6 +107,9 @@ return create[editor.name.toJavaClassifier()/]Text(widgetFactory, parent);
 		EditingUtils.setID([editor.elementEditorName()/], [editor.editorID()/]);
 		EditingUtils.setEEFtype([editor.elementEditorName()/], "eef::[editor.representation.name/]"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].FORM_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('Text'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/text/textSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/text/textSWTImpl.mtl
index b767f7e2b..b0110892d 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/text/textSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/text/textSWTImpl.mtl
@@ -87,6 +87,9 @@ return create[editor.name.toJavaClassifier()/]Text(parent);
 		EditingUtils.setID([editor.elementEditorName()/], [editor.editorID()/]);
 		EditingUtils.setEEFtype([editor.elementEditorName()/], "eef::[editor.representation.name/]"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].SWT_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('Text'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaFormImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaFormImpl.mtl
index 6f44bd18b..4673911b5 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaFormImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaFormImpl.mtl
@@ -97,6 +97,9 @@ return create[editor.name.toJavaClassifier()/]Textarea(widgetFactory, parent);
 		EditingUtils.setID([editor.elementEditorName()/], [editor.editorID()/]);
 		EditingUtils.setEEFtype([editor.elementEditorName()/], "eef::[editor.representation.name/]"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].FORM_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('TextArea'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaSWTImpl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaSWTImpl.mtl
index 57e2afe14..eed09b9ea 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaSWTImpl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaSWTImpl.mtl
@@ -72,6 +72,9 @@ return create[editor.name.toJavaClassifier()/]Textarea(parent);
 		EditingUtils.setID([editor.elementEditorName()/], [editor.editorID()/]);
 		EditingUtils.setEEFtype([editor.elementEditorName()/], "eef::[editor.representation.name/]"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent([editor.editorID()/], [editor.owningViewsRepository().vrClass()/].SWT_KIND), null); //$NON-NLS-1$
+		// [protected ('for create'.concat(editor.name.toJavaClassifier()).concat('TextArea'))]
+
+		// [/protected]
 		return parent;
 	}
 [/template]
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceOwnerSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceOwnerSamplePropertiesEditionPartForm.java
index b7e3d4621..3f3be0bf4 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceOwnerSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceOwnerSamplePropertiesEditionPartForm.java
@@ -244,6 +244,9 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionPartForm extends Secti
 		EditingUtils.setID(name, FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.name, FiltersViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -275,6 +278,9 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionPartForm extends Secti
 		this.abstractTarget.disableMove();
 		abstractTarget.setID(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.abstractTarget);
 		abstractTarget.setEEFType("eef::AdvancedReferencesTable"); //$NON-NLS-1$
+		// Start of user code for createAbstractTargetReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -373,6 +379,9 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionPartForm extends Secti
 		this.strictTyping.setUpperBound(-1);
 		strictTyping.setID(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.strictTyping);
 		strictTyping.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createStrictTypingTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample1PropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample1PropertiesEditionPartForm.java
index aecb5bfda..7a355723c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample1PropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample1PropertiesEditionPartForm.java
@@ -205,6 +205,9 @@ public class ConcreteReferenceTargetSample1PropertiesEditionPartForm extends Sec
 		EditingUtils.setID(name, FiltersViewsRepository.ConcreteReferenceTargetSample1.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(FiltersViewsRepository.ConcreteReferenceTargetSample1.Properties.name, FiltersViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample2PropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample2PropertiesEditionPartForm.java
index 1d0536c09..d537829f9 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample2PropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/forms/ConcreteReferenceTargetSample2PropertiesEditionPartForm.java
@@ -205,6 +205,9 @@ public class ConcreteReferenceTargetSample2PropertiesEditionPartForm extends Sec
 		EditingUtils.setID(name, FiltersViewsRepository.ConcreteReferenceTargetSample2.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(FiltersViewsRepository.ConcreteReferenceTargetSample2.Properties.name, FiltersViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceOwnerSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceOwnerSamplePropertiesEditionPartImpl.java
index 3b37ea0be..d088a0d80 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceOwnerSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceOwnerSamplePropertiesEditionPartImpl.java
@@ -213,6 +213,9 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionPartImpl extends Compo
 		EditingUtils.setID(name, FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.name, FiltersViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -343,6 +346,9 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionPartImpl extends Compo
 		this.strictTyping.setUpperBound(-1);
 		strictTyping.setID(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.strictTyping);
 		strictTyping.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createStrictTypingAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample1PropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample1PropertiesEditionPartImpl.java
index ce94774e5..afb564fd9 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample1PropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample1PropertiesEditionPartImpl.java
@@ -174,6 +174,9 @@ public class ConcreteReferenceTargetSample1PropertiesEditionPartImpl extends Com
 		EditingUtils.setID(name, FiltersViewsRepository.ConcreteReferenceTargetSample1.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(FiltersViewsRepository.ConcreteReferenceTargetSample1.Properties.name, FiltersViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample2PropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample2PropertiesEditionPartImpl.java
index 1bc27fff4..ba7266bb6 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample2PropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/filters/parts/impl/ConcreteReferenceTargetSample2PropertiesEditionPartImpl.java
@@ -174,6 +174,9 @@ public class ConcreteReferenceTargetSample2PropertiesEditionPartImpl extends Com
 		EditingUtils.setID(name, FiltersViewsRepository.ConcreteReferenceTargetSample2.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(FiltersViewsRepository.ConcreteReferenceTargetSample2.Properties.name, FiltersViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AnotherSubtypePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AnotherSubtypePropertiesEditionPartForm.java
index 57564c725..29584406c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AnotherSubtypePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AnotherSubtypePropertiesEditionPartForm.java
@@ -192,6 +192,9 @@ public class AnotherSubtypePropertiesEditionPartForm extends SectionPropertiesEd
 		EditingUtils.setID(anotherSpecialisationElement, NavigationViewsRepository.AnotherSubtype.AnotherSpecialisation.anotherSpecialisationElement);
 		EditingUtils.setEEFtype(anotherSpecialisationElement, "eef::Checkbox"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.AnotherSubtype.AnotherSpecialisation.anotherSpecialisationElement, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAnotherSpecialisationElementCheckbox
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AttributeNavigationSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AttributeNavigationSamplePropertiesEditionPartForm.java
index 909cce755..1160e90b4 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AttributeNavigationSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/AttributeNavigationSamplePropertiesEditionPartForm.java
@@ -227,6 +227,9 @@ public class AttributeNavigationSamplePropertiesEditionPartForm extends SectionP
 		EditingUtils.setID(name, NavigationViewsRepository.AttributeNavigationSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.AttributeNavigationSample.Properties.name, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -292,6 +295,9 @@ public class AttributeNavigationSamplePropertiesEditionPartForm extends SectionP
 		EditingUtils.setID(delegate1ForSingleValued, NavigationViewsRepository.AttributeNavigationSample.Properties.delegate1ForSingleValued);
 		EditingUtils.setEEFtype(delegate1ForSingleValued, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate1ForSingleValued, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDelegate1ForSingleValuedText
+
+		// End of user code
 		return parent;
 	}
 
@@ -357,6 +363,9 @@ public class AttributeNavigationSamplePropertiesEditionPartForm extends SectionP
 		EditingUtils.setID(delegate2ForSingleValued, NavigationViewsRepository.AttributeNavigationSample.Properties.delegate2ForSingleValued);
 		EditingUtils.setEEFtype(delegate2ForSingleValued, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate2ForSingleValued, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDelegate2ForSingleValuedText
+
+		// End of user code
 		return parent;
 	}
 
@@ -422,6 +431,9 @@ public class AttributeNavigationSamplePropertiesEditionPartForm extends SectionP
 		EditingUtils.setID(delegate1ForMultiValued, NavigationViewsRepository.AttributeNavigationSample.Properties.delegate1ForMultiValued);
 		EditingUtils.setEEFtype(delegate1ForMultiValued, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate1ForMultiValued, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDelegate1ForMultiValuedText
+
+		// End of user code
 		return parent;
 	}
 
@@ -487,6 +499,9 @@ public class AttributeNavigationSamplePropertiesEditionPartForm extends SectionP
 		EditingUtils.setID(delegate2ForMultiValued, NavigationViewsRepository.AttributeNavigationSample.Properties.delegate2ForMultiValued);
 		EditingUtils.setEEFtype(delegate2ForMultiValued, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate2ForMultiValued, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDelegate2ForMultiValuedText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedFlatReferencesTableSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedFlatReferencesTableSamplePropertiesEditionPartForm.java
index dec29d5c7..51004814d 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedFlatReferencesTableSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedFlatReferencesTableSamplePropertiesEditionPartForm.java
@@ -222,6 +222,9 @@ public class DeferedFlatReferencesTableSamplePropertiesEditionPartForm extends S
 		EditingUtils.setID(name, NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.name, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -245,6 +248,9 @@ public class DeferedFlatReferencesTableSamplePropertiesEditionPartForm extends S
 		flatReferencesTableSampleEditor.setLayoutData(flatReferencesTableSampleEditorData);
 		flatReferencesTableSampleEditor.setID(NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.flatReferencesTableSampleEditor);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.flatReferencesTableSampleEditor, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFlatReferencesTableSampleEditorFlatReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedReferencesTableSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedReferencesTableSamplePropertiesEditionPartForm.java
index c2c6c0697..8d254c1de 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedReferencesTableSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/DeferedReferencesTableSamplePropertiesEditionPartForm.java
@@ -241,6 +241,9 @@ public class DeferedReferencesTableSamplePropertiesEditionPartForm extends Secti
 		EditingUtils.setID(name, NavigationViewsRepository.DeferedReferencesTableSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.DeferedReferencesTableSample.Properties.name, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -261,6 +264,9 @@ public class DeferedReferencesTableSamplePropertiesEditionPartForm extends Secti
 		EditingUtils.setID(referencesTableSampleEditor.getTable(), NavigationViewsRepository.DeferedReferencesTableSample.Properties.referencesTableSampleEditor);
 		EditingUtils.setEEFtype(referencesTableSampleEditor.getTable(), "eef::ReferencesTable::field"); //$NON-NLS-1$
 		createReferencesTableSampleEditorControlPanel(parent, widgetFactory);
+		// Start of user code for createReferencesTableSampleEditorReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -369,6 +375,9 @@ public class DeferedReferencesTableSamplePropertiesEditionPartForm extends Secti
 		});
 		EditingUtils.setID(removeReferencesTableSampleEditor, NavigationViewsRepository.DeferedReferencesTableSample.Properties.referencesTableSampleEditor);
 		EditingUtils.setEEFtype(removeReferencesTableSampleEditor, "eef::ReferencesTable::removebutton"); //$NON-NLS-1$
+		// Start of user code for createReferencesTableSampleEditorControlPanel
+
+		// End of user code
 	}
 
 	/**
@@ -385,6 +394,9 @@ public class DeferedReferencesTableSamplePropertiesEditionPartForm extends Secti
 			}
 
 		};
+		// Start of user code for addReferencesTableSampleEditor
+
+		// End of user code
 		dialog.open();
 		referencesTableSampleEditor.refresh();
 	}
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/ElementPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/ElementPropertiesEditionPartForm.java
index 700c9f3cd..b557e095d 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/ElementPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/ElementPropertiesEditionPartForm.java
@@ -175,6 +175,9 @@ public class ElementPropertiesEditionPartForm extends SectionPropertiesEditingPa
 		EditingUtils.setID(isVisible, NavigationViewsRepository.Element.Properties.isVisible);
 		EditingUtils.setEEFtype(isVisible, "eef::Checkbox"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Element.Properties.isVisible, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createIsVisibleCheckbox
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/EventPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/EventPropertiesEditionPartForm.java
index 8a937ace9..808c933c5 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/EventPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/EventPropertiesEditionPartForm.java
@@ -205,6 +205,9 @@ public class EventPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(name, NamingViewsRepository.Event.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NamingViewsRepository.Event.Properties.name, NamingViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/FirstNavigationSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/FirstNavigationSamplePropertiesEditionPartForm.java
index ada12891c..bb4e11342 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/FirstNavigationSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/FirstNavigationSamplePropertiesEditionPartForm.java
@@ -205,6 +205,9 @@ public class FirstNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		EditingUtils.setID(name, NavigationViewsRepository.FirstNavigationSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.FirstNavigationSample.Properties.name, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/NamedElementPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/NamedElementPropertiesEditionPartForm.java
index dbe60d904..13b059c3f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/NamedElementPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/NamedElementPropertiesEditionPartForm.java
@@ -205,6 +205,9 @@ public class NamedElementPropertiesEditionPartForm extends SectionPropertiesEdit
 		EditingUtils.setID(name, NavigationViewsRepository.NamedElement.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.NamedElement.Properties.name, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/OwnerPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/OwnerPropertiesEditionPartForm.java
index 52f1a5462..6f372fb2d 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/OwnerPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/OwnerPropertiesEditionPartForm.java
@@ -358,6 +358,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(name, NavigationViewsRepository.Owner.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Owner.Properties.name, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -447,6 +450,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(multipleSampleForTableComposition.getTable(), NavigationViewsRepository.Owner.Properties.multipleSampleForTableComposition);
 		EditingUtils.setEEFtype(multipleSampleForTableComposition.getTable(), "eef::TableComposition::field"); //$NON-NLS-1$
 		createMultipleSampleForTableCompositionPanel(widgetFactory, tableContainer);
+		// Start of user code for createMultipleSampleForTableCompositionTableComposition
+
+		// End of user code
 		return container;
 	}
 
@@ -526,6 +532,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		EditingUtils.setID(editMultipleSampleForTableComposition, NavigationViewsRepository.Owner.Properties.multipleSampleForTableComposition);
 		EditingUtils.setEEFtype(editMultipleSampleForTableComposition, "eef::TableComposition::editbutton"); //$NON-NLS-1$
+		// Start of user code for createMultipleSampleForTableCompositionPanel
+
+		// End of user code
 		return multipleSampleForTableCompositionPanel;
 	}
 
@@ -574,6 +583,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		this.multipleSampleForAdvancedTableComposition.setUpperBound(1);
 		multipleSampleForAdvancedTableComposition.setID(NavigationViewsRepository.Owner.Properties.multipleSampleForAdvancedTableComposition);
 		multipleSampleForAdvancedTableComposition.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createMultipleSampleForAdvancedTableCompositionTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -594,6 +606,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(multipleSampleForReferencesTable.getTable(), NavigationViewsRepository.Owner.Properties.multipleSampleForReferencesTable);
 		EditingUtils.setEEFtype(multipleSampleForReferencesTable.getTable(), "eef::ReferencesTable::field"); //$NON-NLS-1$
 		createMultipleSampleForReferencesTableControlPanel(parent, widgetFactory);
+		// Start of user code for createMultipleSampleForReferencesTableReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -702,6 +717,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		EditingUtils.setID(removeMultipleSampleForReferencesTable, NavigationViewsRepository.Owner.Properties.multipleSampleForReferencesTable);
 		EditingUtils.setEEFtype(removeMultipleSampleForReferencesTable, "eef::ReferencesTable::removebutton"); //$NON-NLS-1$
+		// Start of user code for createMultipleSampleForReferencesTableControlPanel
+
+		// End of user code
 	}
 
 	/**
@@ -718,6 +736,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 			}
 
 		};
+		// Start of user code for addMultipleSampleForReferencesTable
+
+		// End of user code
 		dialog.open();
 		multipleSampleForReferencesTable.refresh();
 	}
@@ -762,6 +783,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		this.multipleSampleForAdvancedReferencesTable.disableMove();
 		multipleSampleForAdvancedReferencesTable.setID(NavigationViewsRepository.Owner.Properties.multipleSampleForAdvancedReferencesTable);
 		multipleSampleForAdvancedReferencesTable.setEEFType("eef::AdvancedReferencesTable"); //$NON-NLS-1$
+		// Start of user code for createMultipleSampleForAdvancedReferencesTableReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -835,6 +859,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		multipleSampleForFlatReferencesTable.setLayoutData(multipleSampleForFlatReferencesTableData);
 		multipleSampleForFlatReferencesTable.setID(NavigationViewsRepository.Owner.Properties.multipleSampleForFlatReferencesTable);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Owner.Properties.multipleSampleForFlatReferencesTable, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createMultipleSampleForFlatReferencesTableFlatReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -925,6 +952,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(singleSampleForTableComposition.getTable(), NavigationViewsRepository.Owner.Properties.singleSampleForTableComposition);
 		EditingUtils.setEEFtype(singleSampleForTableComposition.getTable(), "eef::TableComposition::field"); //$NON-NLS-1$
 		createSingleSampleForTableCompositionPanel(widgetFactory, tableContainer);
+		// Start of user code for createSingleSampleForTableCompositionTableComposition
+
+		// End of user code
 		return container;
 	}
 
@@ -1004,6 +1034,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		EditingUtils.setID(editSingleSampleForTableComposition, NavigationViewsRepository.Owner.Properties.singleSampleForTableComposition);
 		EditingUtils.setEEFtype(editSingleSampleForTableComposition, "eef::TableComposition::editbutton"); //$NON-NLS-1$
+		// Start of user code for createSingleSampleForTableCompositionPanel
+
+		// End of user code
 		return singleSampleForTableCompositionPanel;
 	}
 
@@ -1052,6 +1085,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		this.singleSampleForAdvancedTableComposition.setUpperBound(-1);
 		singleSampleForAdvancedTableComposition.setID(NavigationViewsRepository.Owner.Properties.singleSampleForAdvancedTableComposition);
 		singleSampleForAdvancedTableComposition.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createSingleSampleForAdvancedTableCompositionTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -1072,6 +1108,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(singleSampleForReferencesTable.getTable(), NavigationViewsRepository.Owner.Properties.singleSampleForReferencesTable);
 		EditingUtils.setEEFtype(singleSampleForReferencesTable.getTable(), "eef::ReferencesTable::field"); //$NON-NLS-1$
 		createSingleSampleForReferencesTableControlPanel(parent, widgetFactory);
+		// Start of user code for createSingleSampleForReferencesTableReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -1180,6 +1219,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		EditingUtils.setID(removeSingleSampleForReferencesTable, NavigationViewsRepository.Owner.Properties.singleSampleForReferencesTable);
 		EditingUtils.setEEFtype(removeSingleSampleForReferencesTable, "eef::ReferencesTable::removebutton"); //$NON-NLS-1$
+		// Start of user code for createSingleSampleForReferencesTableControlPanel
+
+		// End of user code
 	}
 
 	/**
@@ -1196,6 +1238,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 			}
 
 		};
+		// Start of user code for addSingleSampleForReferencesTable
+
+		// End of user code
 		dialog.open();
 		singleSampleForReferencesTable.refresh();
 	}
@@ -1229,6 +1274,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(singleSampleForAdvancedReferencesTable.getTable(), NavigationViewsRepository.Owner.Properties.singleSampleForAdvancedReferencesTable);
 		EditingUtils.setEEFtype(singleSampleForAdvancedReferencesTable.getTable(), "eef::ReferencesTable::field"); //$NON-NLS-1$
 		createSingleSampleForAdvancedReferencesTableControlPanel(parent, widgetFactory);
+		// Start of user code for createSingleSampleForAdvancedReferencesTableReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -1337,6 +1385,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		EditingUtils.setID(removeSingleSampleForAdvancedReferencesTable, NavigationViewsRepository.Owner.Properties.singleSampleForAdvancedReferencesTable);
 		EditingUtils.setEEFtype(removeSingleSampleForAdvancedReferencesTable, "eef::ReferencesTable::removebutton"); //$NON-NLS-1$
+		// Start of user code for createSingleSampleForAdvancedReferencesTableControlPanel
+
+		// End of user code
 	}
 
 	/**
@@ -1353,6 +1404,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 			}
 
 		};
+		// Start of user code for addSingleSampleForAdvancedReferencesTable
+
+		// End of user code
 		dialog.open();
 		singleSampleForAdvancedReferencesTable.refresh();
 	}
@@ -1389,6 +1443,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		singleSampleForFlatReferencesTable.setLayoutData(singleSampleForFlatReferencesTableData);
 		singleSampleForFlatReferencesTable.setID(NavigationViewsRepository.Owner.Properties.singleSampleForFlatReferencesTable);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Owner.Properties.singleSampleForFlatReferencesTable, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSingleSampleForFlatReferencesTableFlatReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -1420,6 +1477,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		singleContainmentForEObjectFlatComboViewer.setID(NavigationViewsRepository.Owner.Properties.singleContainmentForEObjectFlatComboViewer);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Owner.Properties.singleContainmentForEObjectFlatComboViewer, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSingleContainmentForEObjectFlatComboViewerFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -1450,6 +1510,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		singleReferencesForEObjectFlatComboViewer.setID(NavigationViewsRepository.Owner.Properties.singleReferencesForEObjectFlatComboViewer);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Owner.Properties.singleReferencesForEObjectFlatComboViewer, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSingleReferencesForEObjectFlatComboViewerFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -1480,6 +1543,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		singleContainmentForAdvancedEObjectFlatComboViewer.setLayoutData(singleContainmentForAdvancedEObjectFlatComboViewerData);
 		singleContainmentForAdvancedEObjectFlatComboViewer.setID(NavigationViewsRepository.Owner.Properties.singleContainmentForAdvancedEObjectFlatComboViewer);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Owner.Properties.singleContainmentForAdvancedEObjectFlatComboViewer, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSingleContainmentForAdvancedEObjectFlatComboViewerFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -1511,6 +1577,9 @@ public class OwnerPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		singleReferencesForAdvancedEObjectFlatComboViewer.setLayoutData(singleReferencesForAdvancedEObjectFlatComboViewerData);
 		singleReferencesForAdvancedEObjectFlatComboViewer.setID(NavigationViewsRepository.Owner.Properties.singleReferencesForAdvancedEObjectFlatComboViewer);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Owner.Properties.singleReferencesForAdvancedEObjectFlatComboViewer, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSingleReferencesForAdvancedEObjectFlatComboViewerFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SecondNavigationSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SecondNavigationSamplePropertiesEditionPartForm.java
index a7f2b7342..4a2243e59 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SecondNavigationSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SecondNavigationSamplePropertiesEditionPartForm.java
@@ -205,6 +205,9 @@ public class SecondNavigationSamplePropertiesEditionPartForm extends SectionProp
 		EditingUtils.setID(name, NavigationViewsRepository.SecondNavigationSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SecondNavigationSample.Properties.name, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SmartNavigationSampleOnglet2PropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SmartNavigationSampleOnglet2PropertiesEditionPartForm.java
index 2c26f930e..55a51df3b 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SmartNavigationSampleOnglet2PropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SmartNavigationSampleOnglet2PropertiesEditionPartForm.java
@@ -173,6 +173,9 @@ public class SmartNavigationSampleOnglet2PropertiesEditionPartForm extends Secti
 		});
 		secondModelNavigationSingleValueOnglet2.setID(NavigationViewsRepository.SmartNavigationSampleOnglet2.Properties.secondModelNavigationSingleValueOnglet2);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSampleOnglet2.Properties.secondModelNavigationSingleValueOnglet2, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSecondModelNavigationSingleValueOnglet2FlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SmartNavigationSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SmartNavigationSamplePropertiesEditionPartForm.java
index 8b0a0a0a5..887d9efd7 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SmartNavigationSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SmartNavigationSamplePropertiesEditionPartForm.java
@@ -243,6 +243,9 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		EditingUtils.setID(name, NavigationViewsRepository.SmartNavigationSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.name, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -308,6 +311,9 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		EditingUtils.setID(firstModelNavigationSingleValue, NavigationViewsRepository.SmartNavigationSample.Properties.firstModelNavigationSingleValue);
 		EditingUtils.setEEFtype(firstModelNavigationSingleValue, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.firstModelNavigationSingleValue, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFirstModelNavigationSingleValueText
+
+		// End of user code
 		return parent;
 	}
 
@@ -373,6 +379,9 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		EditingUtils.setID(secondModelNavigationSingleValue, NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationSingleValue);
 		EditingUtils.setEEFtype(secondModelNavigationSingleValue, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationSingleValue, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSecondModelNavigationSingleValueText
+
+		// End of user code
 		return parent;
 	}
 
@@ -438,6 +447,9 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		EditingUtils.setID(firstModelNavigationMultiValue, NavigationViewsRepository.SmartNavigationSample.Properties.firstModelNavigationMultiValue);
 		EditingUtils.setEEFtype(firstModelNavigationMultiValue, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.firstModelNavigationMultiValue, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFirstModelNavigationMultiValueText
+
+		// End of user code
 		return parent;
 	}
 
@@ -503,6 +515,9 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		EditingUtils.setID(secondModelNavigationMultiValue, NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValue);
 		EditingUtils.setEEFtype(secondModelNavigationMultiValue, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValue, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSecondModelNavigationMultiValueText
+
+		// End of user code
 		return parent;
 	}
 
@@ -568,6 +583,9 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		EditingUtils.setID(secondModelNavigationSingleValue2, NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationSingleValue2);
 		EditingUtils.setEEFtype(secondModelNavigationSingleValue2, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationSingleValue2, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSecondModelNavigationSingleValue2Text
+
+		// End of user code
 		return parent;
 	}
 
@@ -633,6 +651,9 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		EditingUtils.setID(secondModelNavigationMultiValue2, NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValue2);
 		EditingUtils.setEEFtype(secondModelNavigationMultiValue2, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValue2, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSecondModelNavigationMultiValue2Text
+
+		// End of user code
 		return parent;
 	}
 
@@ -698,6 +719,9 @@ public class SmartNavigationSamplePropertiesEditionPartForm extends SectionPrope
 		EditingUtils.setID(secondModelNavigationMultiValueFilter, NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValueFilter);
 		EditingUtils.setEEFtype(secondModelNavigationMultiValueFilter, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValueFilter, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSecondModelNavigationMultiValueFilterText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SubtypePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SubtypePropertiesEditionPartForm.java
index 91c0358f1..07c5add4e 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SubtypePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/forms/SubtypePropertiesEditionPartForm.java
@@ -192,6 +192,9 @@ public class SubtypePropertiesEditionPartForm extends SectionPropertiesEditingPa
 		EditingUtils.setID(specialisedElement, NavigationViewsRepository.Subtype.Specialisation.specialisedElement);
 		EditingUtils.setEEFtype(specialisedElement, "eef::Checkbox"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Subtype.Specialisation.specialisedElement, NavigationViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSpecialisedElementCheckbox
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AnotherSubtypePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AnotherSubtypePropertiesEditionPartImpl.java
index fa0619d5e..bfa8a807e 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AnotherSubtypePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AnotherSubtypePropertiesEditionPartImpl.java
@@ -181,6 +181,9 @@ public class AnotherSubtypePropertiesEditionPartImpl extends CompositeProperties
 		EditingUtils.setID(anotherSpecialisationElement, NavigationViewsRepository.AnotherSubtype.AnotherSpecialisation.anotherSpecialisationElement);
 		EditingUtils.setEEFtype(anotherSpecialisationElement, "eef::Checkbox"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.AnotherSubtype.AnotherSpecialisation.anotherSpecialisationElement, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAnotherSpecialisationElementCheckbox
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AttributeNavigationSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AttributeNavigationSamplePropertiesEditionPartImpl.java
index afc38b4bd..7f0366b00 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AttributeNavigationSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/AttributeNavigationSamplePropertiesEditionPartImpl.java
@@ -196,6 +196,9 @@ public class AttributeNavigationSamplePropertiesEditionPartImpl extends Composit
 		EditingUtils.setID(name, NavigationViewsRepository.AttributeNavigationSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.AttributeNavigationSample.Properties.name, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -242,6 +245,9 @@ public class AttributeNavigationSamplePropertiesEditionPartImpl extends Composit
 		EditingUtils.setID(delegate1ForSingleValued, NavigationViewsRepository.AttributeNavigationSample.Properties.delegate1ForSingleValued);
 		EditingUtils.setEEFtype(delegate1ForSingleValued, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate1ForSingleValued, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDelegate1ForSingleValuedText
+
+		// End of user code
 		return parent;
 	}
 
@@ -288,6 +294,9 @@ public class AttributeNavigationSamplePropertiesEditionPartImpl extends Composit
 		EditingUtils.setID(delegate2ForSingleValued, NavigationViewsRepository.AttributeNavigationSample.Properties.delegate2ForSingleValued);
 		EditingUtils.setEEFtype(delegate2ForSingleValued, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate2ForSingleValued, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDelegate2ForSingleValuedText
+
+		// End of user code
 		return parent;
 	}
 
@@ -334,6 +343,9 @@ public class AttributeNavigationSamplePropertiesEditionPartImpl extends Composit
 		EditingUtils.setID(delegate1ForMultiValued, NavigationViewsRepository.AttributeNavigationSample.Properties.delegate1ForMultiValued);
 		EditingUtils.setEEFtype(delegate1ForMultiValued, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate1ForMultiValued, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDelegate1ForMultiValuedText
+
+		// End of user code
 		return parent;
 	}
 
@@ -380,6 +392,9 @@ public class AttributeNavigationSamplePropertiesEditionPartImpl extends Composit
 		EditingUtils.setID(delegate2ForMultiValued, NavigationViewsRepository.AttributeNavigationSample.Properties.delegate2ForMultiValued);
 		EditingUtils.setEEFtype(delegate2ForMultiValued, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.AttributeNavigationSample.Properties.delegate2ForMultiValued, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDelegate2ForMultiValuedText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedFlatReferencesTableSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedFlatReferencesTableSamplePropertiesEditionPartImpl.java
index 75eb2ce28..69ab89ba9 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedFlatReferencesTableSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedFlatReferencesTableSamplePropertiesEditionPartImpl.java
@@ -191,6 +191,9 @@ public class DeferedFlatReferencesTableSamplePropertiesEditionPartImpl extends C
 		EditingUtils.setID(name, NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.name, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -214,6 +217,9 @@ public class DeferedFlatReferencesTableSamplePropertiesEditionPartImpl extends C
 		flatReferencesTableSampleEditor.setLayoutData(flatReferencesTableSampleEditorData);
 		flatReferencesTableSampleEditor.setID(NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.flatReferencesTableSampleEditor);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.flatReferencesTableSampleEditor, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFlatReferencesTableSampleEditorFlatReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedReferencesTableSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedReferencesTableSamplePropertiesEditionPartImpl.java
index 6fccd4361..f9a111bf8 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedReferencesTableSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/DeferedReferencesTableSamplePropertiesEditionPartImpl.java
@@ -210,6 +210,9 @@ public class DeferedReferencesTableSamplePropertiesEditionPartImpl extends Compo
 		EditingUtils.setID(name, NavigationViewsRepository.DeferedReferencesTableSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.DeferedReferencesTableSample.Properties.name, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -356,6 +359,9 @@ public class DeferedReferencesTableSamplePropertiesEditionPartImpl extends Compo
 
 		};
 		dialog.open();
+		// Start of user code for addReferencesTableSampleEditor
+
+		// End of user code
 		referencesTableSampleEditor.refresh();
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/ElementPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/ElementPropertiesEditionPartImpl.java
index 63ada9733..7ee221825 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/ElementPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/ElementPropertiesEditionPartImpl.java
@@ -164,6 +164,9 @@ public class ElementPropertiesEditionPartImpl extends CompositePropertiesEdition
 		EditingUtils.setID(isVisible, NavigationViewsRepository.Element.Properties.isVisible);
 		EditingUtils.setEEFtype(isVisible, "eef::Checkbox"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Element.Properties.isVisible, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createIsVisibleCheckbox
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/EventPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/EventPropertiesEditionPartImpl.java
index 6cfddd70e..16039b504 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/EventPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/EventPropertiesEditionPartImpl.java
@@ -174,6 +174,9 @@ public class EventPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		EditingUtils.setID(name, NamingViewsRepository.Event.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NamingViewsRepository.Event.Properties.name, NamingViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/FirstNavigationSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/FirstNavigationSamplePropertiesEditionPartImpl.java
index e3dfdc498..84ed07284 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/FirstNavigationSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/FirstNavigationSamplePropertiesEditionPartImpl.java
@@ -174,6 +174,9 @@ public class FirstNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		EditingUtils.setID(name, NavigationViewsRepository.FirstNavigationSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.FirstNavigationSample.Properties.name, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/NamedElementPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/NamedElementPropertiesEditionPartImpl.java
index 141731a00..47596fd03 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/NamedElementPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/NamedElementPropertiesEditionPartImpl.java
@@ -174,6 +174,9 @@ public class NamedElementPropertiesEditionPartImpl extends CompositePropertiesEd
 		EditingUtils.setID(name, NavigationViewsRepository.NamedElement.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.NamedElement.Properties.name, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/OwnerPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/OwnerPropertiesEditionPartImpl.java
index c908d2198..de3620b75 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/OwnerPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/OwnerPropertiesEditionPartImpl.java
@@ -327,6 +327,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		EditingUtils.setID(name, NavigationViewsRepository.Owner.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Owner.Properties.name, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -416,6 +419,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		EditingUtils.setID(multipleSampleForTableComposition.getTable(), NavigationViewsRepository.Owner.Properties.multipleSampleForTableComposition);
 		EditingUtils.setEEFtype(multipleSampleForTableComposition.getTable(), "eef::TableComposition::field"); //$NON-NLS-1$
 		createMultipleSampleForTableCompositionPanel(tableContainer);
+		// Start of user code for createMultipleSampleForTableCompositionTableComposition
+
+		// End of user code
 		return container;
 	}
 
@@ -498,6 +504,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		});
 		EditingUtils.setID(editMultipleSampleForTableComposition, NavigationViewsRepository.Owner.Properties.multipleSampleForTableComposition);
 		EditingUtils.setEEFtype(editMultipleSampleForTableComposition, "eef::TableComposition::editbutton"); //$NON-NLS-1$
+		// Start of user code for createMultipleSampleForTableCompositionPanel
+
+		// End of user code
 		return multipleSampleForTableCompositionPanel;
 	}
 
@@ -546,6 +555,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		this.multipleSampleForAdvancedTableComposition.setUpperBound(1);
 		multipleSampleForAdvancedTableComposition.setID(NavigationViewsRepository.Owner.Properties.multipleSampleForAdvancedTableComposition);
 		multipleSampleForAdvancedTableComposition.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createMultipleSampleForAdvancedTableCompositionAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -692,6 +704,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 
 		};
 		dialog.open();
+		// Start of user code for addMultipleSampleForReferencesTable
+
+		// End of user code
 		multipleSampleForReferencesTable.refresh();
 	}
 
@@ -809,6 +824,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		multipleSampleForFlatReferencesTable.setLayoutData(multipleSampleForFlatReferencesTableData);
 		multipleSampleForFlatReferencesTable.setID(NavigationViewsRepository.Owner.Properties.multipleSampleForFlatReferencesTable);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Owner.Properties.multipleSampleForFlatReferencesTable, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createMultipleSampleForFlatReferencesTableFlatReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -899,6 +917,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		EditingUtils.setID(singleSampleForTableComposition.getTable(), NavigationViewsRepository.Owner.Properties.singleSampleForTableComposition);
 		EditingUtils.setEEFtype(singleSampleForTableComposition.getTable(), "eef::TableComposition::field"); //$NON-NLS-1$
 		createSingleSampleForTableCompositionPanel(tableContainer);
+		// Start of user code for createSingleSampleForTableCompositionTableComposition
+
+		// End of user code
 		return container;
 	}
 
@@ -981,6 +1002,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		});
 		EditingUtils.setID(editSingleSampleForTableComposition, NavigationViewsRepository.Owner.Properties.singleSampleForTableComposition);
 		EditingUtils.setEEFtype(editSingleSampleForTableComposition, "eef::TableComposition::editbutton"); //$NON-NLS-1$
+		// Start of user code for createSingleSampleForTableCompositionPanel
+
+		// End of user code
 		return singleSampleForTableCompositionPanel;
 	}
 
@@ -1029,6 +1053,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		this.singleSampleForAdvancedTableComposition.setUpperBound(-1);
 		singleSampleForAdvancedTableComposition.setID(NavigationViewsRepository.Owner.Properties.singleSampleForAdvancedTableComposition);
 		singleSampleForAdvancedTableComposition.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createSingleSampleForAdvancedTableCompositionAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -1175,6 +1202,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 
 		};
 		dialog.open();
+		// Start of user code for addSingleSampleForReferencesTable
+
+		// End of user code
 		singleSampleForReferencesTable.refresh();
 	}
 
@@ -1333,6 +1363,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 
 		};
 		dialog.open();
+		// Start of user code for addSingleSampleForAdvancedReferencesTable
+
+		// End of user code
 		singleSampleForAdvancedReferencesTable.refresh();
 	}
 
@@ -1368,6 +1401,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		singleSampleForFlatReferencesTable.setLayoutData(singleSampleForFlatReferencesTableData);
 		singleSampleForFlatReferencesTable.setID(NavigationViewsRepository.Owner.Properties.singleSampleForFlatReferencesTable);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Owner.Properties.singleSampleForFlatReferencesTable, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSingleSampleForFlatReferencesTableFlatReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -1392,6 +1428,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		singleContainmentForEObjectFlatComboViewer.setLayoutData(singleContainmentForEObjectFlatComboViewerData);
 		singleContainmentForEObjectFlatComboViewer.setID(NavigationViewsRepository.Owner.Properties.singleContainmentForEObjectFlatComboViewer);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Owner.Properties.singleContainmentForEObjectFlatComboViewer, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSingleContainmentForEObjectFlatComboViewerFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -1415,6 +1454,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		singleReferencesForEObjectFlatComboViewer.setLayoutData(singleReferencesForEObjectFlatComboViewerData);
 		singleReferencesForEObjectFlatComboViewer.setID(NavigationViewsRepository.Owner.Properties.singleReferencesForEObjectFlatComboViewer);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Owner.Properties.singleReferencesForEObjectFlatComboViewer, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSingleReferencesForEObjectFlatComboViewerFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -1443,6 +1485,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		singleContainmentForAdvancedEObjectFlatComboViewer.setLayoutData(singleContainmentForAdvancedEObjectFlatComboViewerData);
 		singleContainmentForAdvancedEObjectFlatComboViewer.setID(NavigationViewsRepository.Owner.Properties.singleContainmentForAdvancedEObjectFlatComboViewer);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Owner.Properties.singleContainmentForAdvancedEObjectFlatComboViewer, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSingleContainmentForAdvancedEObjectFlatComboViewerAdvancedFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -1471,6 +1516,9 @@ public class OwnerPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		singleReferencesForAdvancedEObjectFlatComboViewer.setLayoutData(singleReferencesForAdvancedEObjectFlatComboViewerData);
 		singleReferencesForAdvancedEObjectFlatComboViewer.setID(NavigationViewsRepository.Owner.Properties.singleReferencesForAdvancedEObjectFlatComboViewer);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Owner.Properties.singleReferencesForAdvancedEObjectFlatComboViewer, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSingleReferencesForAdvancedEObjectFlatComboViewerAdvancedFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SecondNavigationSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SecondNavigationSamplePropertiesEditionPartImpl.java
index 0b0775c50..7a6b07bb4 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SecondNavigationSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SecondNavigationSamplePropertiesEditionPartImpl.java
@@ -174,6 +174,9 @@ public class SecondNavigationSamplePropertiesEditionPartImpl extends CompositePr
 		EditingUtils.setID(name, NavigationViewsRepository.SecondNavigationSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SecondNavigationSample.Properties.name, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SmartNavigationSampleOnglet2PropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SmartNavigationSampleOnglet2PropertiesEditionPartImpl.java
index dde1a4479..e5c58d28c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SmartNavigationSampleOnglet2PropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SmartNavigationSampleOnglet2PropertiesEditionPartImpl.java
@@ -156,6 +156,9 @@ public class SmartNavigationSampleOnglet2PropertiesEditionPartImpl extends Compo
 		secondModelNavigationSingleValueOnglet2.setLayoutData(secondModelNavigationSingleValueOnglet2Data);
 		secondModelNavigationSingleValueOnglet2.setID(NavigationViewsRepository.SmartNavigationSampleOnglet2.Properties.secondModelNavigationSingleValueOnglet2);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSampleOnglet2.Properties.secondModelNavigationSingleValueOnglet2, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSecondModelNavigationSingleValueOnglet2FlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SmartNavigationSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SmartNavigationSamplePropertiesEditionPartImpl.java
index b6004510a..9f6761aaf 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SmartNavigationSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SmartNavigationSamplePropertiesEditionPartImpl.java
@@ -212,6 +212,9 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		EditingUtils.setID(name, NavigationViewsRepository.SmartNavigationSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.name, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -258,6 +261,9 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		EditingUtils.setID(firstModelNavigationSingleValue, NavigationViewsRepository.SmartNavigationSample.Properties.firstModelNavigationSingleValue);
 		EditingUtils.setEEFtype(firstModelNavigationSingleValue, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.firstModelNavigationSingleValue, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFirstModelNavigationSingleValueText
+
+		// End of user code
 		return parent;
 	}
 
@@ -304,6 +310,9 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		EditingUtils.setID(secondModelNavigationSingleValue, NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationSingleValue);
 		EditingUtils.setEEFtype(secondModelNavigationSingleValue, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationSingleValue, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSecondModelNavigationSingleValueText
+
+		// End of user code
 		return parent;
 	}
 
@@ -350,6 +359,9 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		EditingUtils.setID(firstModelNavigationMultiValue, NavigationViewsRepository.SmartNavigationSample.Properties.firstModelNavigationMultiValue);
 		EditingUtils.setEEFtype(firstModelNavigationMultiValue, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.firstModelNavigationMultiValue, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFirstModelNavigationMultiValueText
+
+		// End of user code
 		return parent;
 	}
 
@@ -396,6 +408,9 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		EditingUtils.setID(secondModelNavigationMultiValue, NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValue);
 		EditingUtils.setEEFtype(secondModelNavigationMultiValue, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValue, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSecondModelNavigationMultiValueText
+
+		// End of user code
 		return parent;
 	}
 
@@ -442,6 +457,9 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		EditingUtils.setID(secondModelNavigationSingleValue2, NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationSingleValue2);
 		EditingUtils.setEEFtype(secondModelNavigationSingleValue2, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationSingleValue2, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSecondModelNavigationSingleValue2Text
+
+		// End of user code
 		return parent;
 	}
 
@@ -488,6 +506,9 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		EditingUtils.setID(secondModelNavigationMultiValue2, NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValue2);
 		EditingUtils.setEEFtype(secondModelNavigationMultiValue2, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValue2, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSecondModelNavigationMultiValue2Text
+
+		// End of user code
 		return parent;
 	}
 
@@ -534,6 +555,9 @@ public class SmartNavigationSamplePropertiesEditionPartImpl extends CompositePro
 		EditingUtils.setID(secondModelNavigationMultiValueFilter, NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValueFilter);
 		EditingUtils.setEEFtype(secondModelNavigationMultiValueFilter, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.SmartNavigationSample.Properties.secondModelNavigationMultiValueFilter, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSecondModelNavigationMultiValueFilterText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SubtypePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SubtypePropertiesEditionPartImpl.java
index 4c1b21b56..8b281c93a 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SubtypePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/navigation/parts/impl/SubtypePropertiesEditionPartImpl.java
@@ -181,6 +181,9 @@ public class SubtypePropertiesEditionPartImpl extends CompositePropertiesEdition
 		EditingUtils.setID(specialisedElement, NavigationViewsRepository.Subtype.Specialisation.specialisedElement);
 		EditingUtils.setEEFtype(specialisedElement, "eef::Checkbox"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(NavigationViewsRepository.Subtype.Specialisation.specialisedElement, NavigationViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSpecialisedElementCheckbox
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm.java
index 1fdc36fb3..e5eab41f2 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm.java
@@ -201,6 +201,9 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 		advancedeobjectflatcomboviewerRequiredProperty.setLayoutData(advancedeobjectflatcomboviewerRequiredPropertyData);
 		advancedeobjectflatcomboviewerRequiredProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAdvancedeobjectflatcomboviewerRequiredPropertyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -232,6 +235,9 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 		advancedeobjectflatcomboviewerOptionalProperty.setLayoutData(advancedeobjectflatcomboviewerOptionalPropertyData);
 		advancedeobjectflatcomboviewerOptionalProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerOptionalProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAdvancedeobjectflatcomboviewerOptionalPropertyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -263,6 +269,9 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 		advancedeobjectflatcomboviewerROProperty.setLayoutData(advancedeobjectflatcomboviewerROPropertyData);
 		advancedeobjectflatcomboviewerROProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerROProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerROProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAdvancedeobjectflatcomboviewerROPropertyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -292,6 +301,9 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 		});
 		advancedeobjectflatcomboviewerCompoRequiredProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAdvancedeobjectflatcomboviewerCompoRequiredPropertySingleCompositionEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -323,6 +335,9 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm exten
 		advancedeobjectflatcomboviewerCompoOptionalProperty.setLayoutData(advancedeobjectflatcomboviewerCompoOptionalPropertyData);
 		advancedeobjectflatcomboviewerCompoOptionalProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAdvancedeobjectflatcomboviewerCompoOptionalPropertyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedReferencesTableSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedReferencesTableSamplePropertiesEditionPartForm.java
index a5ee67396..12c98d811 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedReferencesTableSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedReferencesTableSamplePropertiesEditionPartForm.java
@@ -202,6 +202,9 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Sect
 		this.advancedreferencestableRequiredProperty.disableMove();
 		advancedreferencestableRequiredProperty.setID(EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableRequiredProperty);
 		advancedreferencestableRequiredProperty.setEEFType("eef::AdvancedReferencesTable"); //$NON-NLS-1$
+		// Start of user code for createAdvancedreferencestableRequiredPropertyReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -283,6 +286,9 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Sect
 		this.advancedreferencestableOptionalProperty.disableMove();
 		advancedreferencestableOptionalProperty.setID(EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableOptionalProperty);
 		advancedreferencestableOptionalProperty.setEEFType("eef::AdvancedReferencesTable"); //$NON-NLS-1$
+		// Start of user code for createAdvancedreferencestableOptionalPropertyReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -364,6 +370,9 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Sect
 		this.advancedreferencestableROProperty.disableMove();
 		advancedreferencestableROProperty.setID(EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableROProperty);
 		advancedreferencestableROProperty.setEEFType("eef::AdvancedReferencesTable"); //$NON-NLS-1$
+		// Start of user code for createAdvancedreferencestableROPropertyReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.java
index 31a3aff6c..efe5dd32b 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.java
@@ -209,6 +209,9 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten
 		this.advancedtablecompositionRequiredProperty.setUpperBound(-1);
 		advancedtablecompositionRequiredProperty.setID(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionRequiredProperty);
 		advancedtablecompositionRequiredProperty.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createAdvancedtablecompositionRequiredPropertyTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -257,6 +260,9 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten
 		this.advancedtablecompositionOptionalProperty.setUpperBound(-1);
 		advancedtablecompositionOptionalProperty.setID(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionOptionalProperty);
 		advancedtablecompositionOptionalProperty.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createAdvancedtablecompositionOptionalPropertyTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -305,6 +311,9 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten
 		this.advancedtablecompositionROProperty.setUpperBound(-1);
 		advancedtablecompositionROProperty.setID(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionROProperty);
 		advancedtablecompositionROProperty.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createAdvancedtablecompositionROPropertyTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/CheckboxSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/CheckboxSamplePropertiesEditionPartForm.java
index f46c025a7..bffb3d988 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/CheckboxSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/CheckboxSamplePropertiesEditionPartForm.java
@@ -174,6 +174,9 @@ public class CheckboxSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		EditingUtils.setID(checkboxRequiredProperty, EefnrViewsRepository.CheckboxSample.Properties.checkboxRequiredProperty);
 		EditingUtils.setEEFtype(checkboxRequiredProperty, "eef::Checkbox"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.CheckboxSample.Properties.checkboxRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCheckboxRequiredPropertyCheckbox
+
+		// End of user code
 		return parent;
 	}
 
@@ -200,6 +203,9 @@ public class CheckboxSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		EditingUtils.setID(checkboxOptionalProperty, EefnrViewsRepository.CheckboxSample.Properties.checkboxOptionalProperty);
 		EditingUtils.setEEFtype(checkboxOptionalProperty, "eef::Checkbox"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.CheckboxSample.Properties.checkboxOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCheckboxOptionalPropertyCheckbox
+
+		// End of user code
 		return parent;
 	}
 
@@ -226,6 +232,9 @@ public class CheckboxSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		EditingUtils.setID(checkboxROProperty, EefnrViewsRepository.CheckboxSample.Properties.checkboxROProperty);
 		EditingUtils.setEEFtype(checkboxROProperty, "eef::Checkbox"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.CheckboxSample.Properties.checkboxROProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCheckboxROPropertyCheckbox
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EMFComboViewerSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EMFComboViewerSamplePropertiesEditionPartForm.java
index e8b74d170..c4ebe2b9f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EMFComboViewerSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EMFComboViewerSamplePropertiesEditionPartForm.java
@@ -181,6 +181,9 @@ public class EMFComboViewerSamplePropertiesEditionPartForm extends SectionProper
 		});
 		emfcomboviewerRequiredProperty.setID(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerRequiredProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEmfcomboviewerRequiredPropertyEMFComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -208,6 +211,9 @@ public class EMFComboViewerSamplePropertiesEditionPartForm extends SectionProper
 		});
 		emfcomboviewerOptionalProperty.setID(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerOptionalProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEmfcomboviewerOptionalPropertyEMFComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -235,6 +241,9 @@ public class EMFComboViewerSamplePropertiesEditionPartForm extends SectionProper
 		});
 		emfcomboviewerROProperty.setID(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerROProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerROProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEmfcomboviewerROPropertyEMFComboViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EObjectFlatComboViewerSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EObjectFlatComboViewerSamplePropertiesEditionPartForm.java
index 0bcf57e6f..a14a19591 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EObjectFlatComboViewerSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/EObjectFlatComboViewerSamplePropertiesEditionPartForm.java
@@ -183,6 +183,9 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartForm extends Secti
 		});
 		eobjectflatcomboviewerRequiredPropery.setID(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerRequiredPropery);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerRequiredPropery, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEobjectflatcomboviewerRequiredProperyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -213,6 +216,9 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartForm extends Secti
 		});
 		eobjectflatcomboviewerOptionalPropery.setID(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerOptionalPropery);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerOptionalPropery, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEobjectflatcomboviewerOptionalProperyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -243,6 +249,9 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartForm extends Secti
 		});
 		eobjectflatcomboviewerROPropery.setID(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerROPropery);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerROPropery, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEobjectflatcomboviewerROProperyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/FlatReferenceTableSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/FlatReferenceTableSamplePropertiesEditionPartForm.java
index 360af77b3..040d07256 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/FlatReferenceTableSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/FlatReferenceTableSamplePropertiesEditionPartForm.java
@@ -175,6 +175,9 @@ public class FlatReferenceTableSamplePropertiesEditionPartForm extends SectionPr
 		flatreferencetableRequiredProperty.setLayoutData(flatreferencetableRequiredPropertyData);
 		flatreferencetableRequiredProperty.setID(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableRequiredProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFlatreferencetableRequiredPropertyFlatReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -199,6 +202,9 @@ public class FlatReferenceTableSamplePropertiesEditionPartForm extends SectionPr
 		flatreferencetableOptionalProperty.setLayoutData(flatreferencetableOptionalPropertyData);
 		flatreferencetableOptionalProperty.setID(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableOptionalProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFlatreferencetableOptionalPropertyFlatReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -223,6 +229,9 @@ public class FlatReferenceTableSamplePropertiesEditionPartForm extends SectionPr
 		flatreferencetableROProperty.setLayoutData(flatreferencetableROPropertyData);
 		flatreferencetableROProperty.setID(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableROProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableROProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFlatreferencetableROPropertyFlatReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ImageViewerSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ImageViewerSamplePropertiesEditionPartForm.java
index fcce0d824..ce9b5104f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ImageViewerSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ImageViewerSamplePropertiesEditionPartForm.java
@@ -175,6 +175,9 @@ public class ImageViewerSamplePropertiesEditionPartForm extends SectionPropertie
 		});
 		imageviewerRequiredProperty.setID(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerRequiredProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createImageviewerRequiredPropertyImageViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -201,6 +204,9 @@ public class ImageViewerSamplePropertiesEditionPartForm extends SectionPropertie
 		});
 		imageviewerOptionalProperty.setID(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerOptionalProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createImageviewerOptionalPropertyImageViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -227,6 +233,9 @@ public class ImageViewerSamplePropertiesEditionPartForm extends SectionPropertie
 		});
 		imageviewerROProperty.setID(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerROProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerROProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createImageviewerROPropertyImageViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/MultiValuedEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/MultiValuedEditorSamplePropertiesEditionPartForm.java
index 4e276e613..d3c61d933 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/MultiValuedEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/MultiValuedEditorSamplePropertiesEditionPartForm.java
@@ -207,6 +207,9 @@ public class MultiValuedEditorSamplePropertiesEditionPartForm extends SectionPro
 		});
 		EditingUtils.setID(editMultivaluededitorRequiredProperty, EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorRequiredProperty);
 		EditingUtils.setEEFtype(editMultivaluededitorRequiredProperty, "eef::MultiValuedEditor::browsebutton"); //$NON-NLS-1$
+		// Start of user code for createMultivaluededitorRequiredPropertyMultiValuedEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -250,6 +253,9 @@ public class MultiValuedEditorSamplePropertiesEditionPartForm extends SectionPro
 		});
 		EditingUtils.setID(editMultivaluededitorOptionalProperty, EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorOptionalProperty);
 		EditingUtils.setEEFtype(editMultivaluededitorOptionalProperty, "eef::MultiValuedEditor::browsebutton"); //$NON-NLS-1$
+		// Start of user code for createMultivaluededitorOptionalPropertyMultiValuedEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -294,6 +300,9 @@ public class MultiValuedEditorSamplePropertiesEditionPartForm extends SectionPro
 		});
 		EditingUtils.setID(editMultivaluededitorROProperty, EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorROProperty);
 		EditingUtils.setEEFtype(editMultivaluededitorROProperty, "eef::MultiValuedEditor::browsebutton"); //$NON-NLS-1$
+		// Start of user code for createMultivaluededitorROPropertyMultiValuedEditor
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RadioSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RadioSamplePropertiesEditionPartForm.java
index 98f2cba0e..981180fcd 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RadioSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RadioSamplePropertiesEditionPartForm.java
@@ -171,6 +171,9 @@ public class RadioSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 			}
 		});
 		radioRequiredPropertyRadioViewer.setID(EefnrViewsRepository.RadioSample.Properties.radioRequiredProperty);
+		// Start of user code for createRadioRequiredPropertyRadioViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -191,6 +194,9 @@ public class RadioSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 			}
 		});
 		radioOptionalPropertyRadioViewer.setID(EefnrViewsRepository.RadioSample.Properties.radioOptionalProperty);
+		// Start of user code for createRadioOptionalPropertyRadioViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -211,6 +217,9 @@ public class RadioSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 			}
 		});
 		radioROPropertyRadioViewer.setID(EefnrViewsRepository.RadioSample.Properties.radioROProperty);
+		// Start of user code for createRadioROPropertyRadioViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ReferencesTableSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ReferencesTableSamplePropertiesEditionPartForm.java
index 047b3bbb2..9190a6480 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ReferencesTableSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/ReferencesTableSamplePropertiesEditionPartForm.java
@@ -203,6 +203,9 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 		EditingUtils.setID(referencestableRequiredProperty.getTable(), EefnrViewsRepository.ReferencesTableSample.Properties.referencestableRequiredProperty);
 		EditingUtils.setEEFtype(referencestableRequiredProperty.getTable(), "eef::ReferencesTable::field"); //$NON-NLS-1$
 		createReferencestableRequiredPropertyControlPanel(parent, widgetFactory);
+		// Start of user code for createReferencestableRequiredPropertyReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -311,6 +314,9 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 		});
 		EditingUtils.setID(removeReferencestableRequiredProperty, EefnrViewsRepository.ReferencesTableSample.Properties.referencestableRequiredProperty);
 		EditingUtils.setEEFtype(removeReferencestableRequiredProperty, "eef::ReferencesTable::removebutton"); //$NON-NLS-1$
+		// Start of user code for createReferencestableRequiredPropertyControlPanel
+
+		// End of user code
 	}
 
 	/**
@@ -327,6 +333,9 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 			}
 
 		};
+		// Start of user code for addReferencestableRequiredProperty
+
+		// End of user code
 		dialog.open();
 		referencestableRequiredProperty.refresh();
 	}
@@ -360,6 +369,9 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 		EditingUtils.setID(referencestableOptionalProperty.getTable(), EefnrViewsRepository.ReferencesTableSample.Properties.referencestableOptionalProperty);
 		EditingUtils.setEEFtype(referencestableOptionalProperty.getTable(), "eef::ReferencesTable::field"); //$NON-NLS-1$
 		createReferencestableOptionalPropertyControlPanel(parent, widgetFactory);
+		// Start of user code for createReferencestableOptionalPropertyReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -468,6 +480,9 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 		});
 		EditingUtils.setID(removeReferencestableOptionalProperty, EefnrViewsRepository.ReferencesTableSample.Properties.referencestableOptionalProperty);
 		EditingUtils.setEEFtype(removeReferencestableOptionalProperty, "eef::ReferencesTable::removebutton"); //$NON-NLS-1$
+		// Start of user code for createReferencestableOptionalPropertyControlPanel
+
+		// End of user code
 	}
 
 	/**
@@ -484,6 +499,9 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 			}
 
 		};
+		// Start of user code for addReferencestableOptionalProperty
+
+		// End of user code
 		dialog.open();
 		referencestableOptionalProperty.refresh();
 	}
@@ -517,6 +535,9 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 		EditingUtils.setID(referencestableROProperty.getTable(), EefnrViewsRepository.ReferencesTableSample.Properties.referencestableROProperty);
 		EditingUtils.setEEFtype(referencestableROProperty.getTable(), "eef::ReferencesTable::field"); //$NON-NLS-1$
 		createReferencestableROPropertyControlPanel(parent, widgetFactory);
+		// Start of user code for createReferencestableROPropertyReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -625,6 +646,9 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 		});
 		EditingUtils.setID(removeReferencestableROProperty, EefnrViewsRepository.ReferencesTableSample.Properties.referencestableROProperty);
 		EditingUtils.setEEFtype(removeReferencestableROProperty, "eef::ReferencesTable::removebutton"); //$NON-NLS-1$
+		// Start of user code for createReferencestableROPropertyControlPanel
+
+		// End of user code
 	}
 
 	/**
@@ -641,6 +665,9 @@ public class ReferencesTableSamplePropertiesEditionPartForm extends SectionPrope
 			}
 
 		};
+		// Start of user code for addReferencestableROProperty
+
+		// End of user code
 		dialog.open();
 		referencestableROProperty.refresh();
 	}
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java
index f7abfab18..0527f3cce 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java
@@ -195,6 +195,9 @@ public class RootPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		this.samples.setUpperBound(-1);
 		samples.setID(EefnrViewsRepository.Root.Properties.samples);
 		samples.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createSamplesTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SamplePropertiesEditionPartForm.java
index f1da4c012..4b2686975 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SamplePropertiesEditionPartForm.java
@@ -210,6 +210,9 @@ public class SamplePropertiesEditionPartForm extends SectionPropertiesEditingPar
 		EditingUtils.setID(textRequiredProperty, EefnrViewsRepository.Sample.Properties.textRequiredProperty);
 		EditingUtils.setEEFtype(textRequiredProperty, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.Sample.Properties.textRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextRequiredPropertyText
+
+		// End of user code
 		return parent;
 	}
 
@@ -275,6 +278,9 @@ public class SamplePropertiesEditionPartForm extends SectionPropertiesEditingPar
 		EditingUtils.setID(textOptionalProperty, EefnrViewsRepository.Sample.Properties.textOptionalProperty);
 		EditingUtils.setEEFtype(textOptionalProperty, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.Sample.Properties.textOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextOptionalPropertyText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SelectionDialogSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SelectionDialogSamplePropertiesEditionPartForm.java
index 996e775f0..00d226bf6 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SelectionDialogSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SelectionDialogSamplePropertiesEditionPartForm.java
@@ -201,6 +201,9 @@ public class SelectionDialogSamplePropertiesEditionPartForm extends SectionPrope
 			}
 		});
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSelectionDialogRequiredPropertySelectionDialog
+
+		// End of user code
 		return parent;
 	}
 
@@ -258,6 +261,9 @@ public class SelectionDialogSamplePropertiesEditionPartForm extends SectionPrope
 			}
 		});
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSelectionDialogOptionalPropertySelectionDialog
+
+		// End of user code
 		return parent;
 	}
 
@@ -315,6 +321,9 @@ public class SelectionDialogSamplePropertiesEditionPartForm extends SectionPrope
 			}
 		});
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogROProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSelectionDialogROPropertySelectionDialog
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SingleCompositionEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SingleCompositionEditorSamplePropertiesEditionPartForm.java
index f4bf5fc26..231edeb35 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SingleCompositionEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SingleCompositionEditorSamplePropertiesEditionPartForm.java
@@ -182,6 +182,9 @@ public class SingleCompositionEditorSamplePropertiesEditionPartForm extends Sect
 		});
 		singlecompositionviewerRequiredProperty.setID(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerRequiredProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSinglecompositionviewerRequiredPropertySingleCompositionEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -211,6 +214,9 @@ public class SingleCompositionEditorSamplePropertiesEditionPartForm extends Sect
 		});
 		singlecompositionviewerOptionalProperty.setID(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerOptionalProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSinglecompositionviewerOptionalPropertySingleCompositionEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -240,6 +246,9 @@ public class SingleCompositionEditorSamplePropertiesEditionPartForm extends Sect
 		});
 		singlecompositionviewerROProperty.setID(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerROProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerROProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSinglecompositionviewerROPropertySingleCompositionEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -269,6 +278,9 @@ public class SingleCompositionEditorSamplePropertiesEditionPartForm extends Sect
 		});
 		singlecompositionviewerOnAbstractOptionalProperty.setID(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerOnAbstractOptionalProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerOnAbstractOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSinglecompositionviewerOnAbstractOptionalPropertySingleCompositionEditor
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SingleCompositionViewerSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SingleCompositionViewerSamplePropertiesEditionPartForm.java
index 0eac339e2..87dac29c8 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SingleCompositionViewerSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/SingleCompositionViewerSamplePropertiesEditionPartForm.java
@@ -205,6 +205,9 @@ public class SingleCompositionViewerSamplePropertiesEditionPartForm extends Sect
 
 				}
 			});
+		// Start of user code for createSinglecompositionviewerSingleRequiredPropertySingleCompositionViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -243,6 +246,9 @@ public class SingleCompositionViewerSamplePropertiesEditionPartForm extends Sect
 
 				}
 			});
+		// Start of user code for createSinglecompositionviewerSingleOptionalPropertySingleCompositionViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -281,6 +287,9 @@ public class SingleCompositionViewerSamplePropertiesEditionPartForm extends Sect
 
 				}
 			});
+		// Start of user code for createSinglecompositionviewerMultiRequiredPropertySingleCompositionViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -319,6 +328,9 @@ public class SingleCompositionViewerSamplePropertiesEditionPartForm extends Sect
 
 				}
 			});
+		// Start of user code for createSinglecompositionviewerMultiOptionalPropertySingleCompositionViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -330,6 +342,9 @@ public class SingleCompositionViewerSamplePropertiesEditionPartForm extends Sect
 		this.singlecompositionviewerSingleROProperty.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
 		this.singlecompositionviewerSingleROProperty.setLayoutData(singlecompositionviewerSingleROPropertyData);
 			singlecompositionviewerSingleROProperty.setEnabled(false);
+		// Start of user code for createSinglecompositionviewerSingleROPropertySingleCompositionViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionEditorSamplePropertiesEditionPartForm.java
index 2c15afed1..b8950eca6 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionEditorSamplePropertiesEditionPartForm.java
@@ -272,6 +272,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		EditingUtils.setID(tablecompositionRequiredProperty.getTable(), EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(tablecompositionRequiredProperty.getTable(), "eef::TableComposition::field"); //$NON-NLS-1$
 		createTablecompositionRequiredPropertyPanel(widgetFactory, tableContainer);
+		// Start of user code for createTablecompositionRequiredPropertyTableComposition
+
+		// End of user code
 		return container;
 	}
 
@@ -351,6 +354,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		});
 		EditingUtils.setID(editTablecompositionRequiredProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(editTablecompositionRequiredProperty, "eef::TableComposition::editbutton"); //$NON-NLS-1$
+		// Start of user code for createTablecompositionRequiredPropertyPanel
+
+		// End of user code
 		return tablecompositionRequiredPropertyPanel;
 	}
 
@@ -440,6 +446,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		EditingUtils.setID(tablecompositionOptionalProperty.getTable(), EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(tablecompositionOptionalProperty.getTable(), "eef::TableComposition::field"); //$NON-NLS-1$
 		createTablecompositionOptionalPropertyPanel(widgetFactory, tableContainer);
+		// Start of user code for createTablecompositionOptionalPropertyTableComposition
+
+		// End of user code
 		return container;
 	}
 
@@ -519,6 +528,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		});
 		EditingUtils.setID(editTablecompositionOptionalProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(editTablecompositionOptionalProperty, "eef::TableComposition::editbutton"); //$NON-NLS-1$
+		// Start of user code for createTablecompositionOptionalPropertyPanel
+
+		// End of user code
 		return tablecompositionOptionalPropertyPanel;
 	}
 
@@ -608,6 +620,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		EditingUtils.setID(tablecompositionROProperty.getTable(), EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionROProperty);
 		EditingUtils.setEEFtype(tablecompositionROProperty.getTable(), "eef::TableComposition::field"); //$NON-NLS-1$
 		createTablecompositionROPropertyPanel(widgetFactory, tableContainer);
+		// Start of user code for createTablecompositionROPropertyTableComposition
+
+		// End of user code
 		return container;
 	}
 
@@ -687,6 +702,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartForm extends Secti
 		});
 		EditingUtils.setID(editTablecompositionROProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionROProperty);
 		EditingUtils.setEEFtype(editTablecompositionROProperty, "eef::TableComposition::editbutton"); //$NON-NLS-1$
+		// Start of user code for createTablecompositionROPropertyPanel
+
+		// End of user code
 		return tablecompositionROPropertyPanel;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionExtensionEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionExtensionEditorSamplePropertiesEditionPartForm.java
index 1a2a85d35..ff9be3541 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionExtensionEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionExtensionEditorSamplePropertiesEditionPartForm.java
@@ -234,6 +234,9 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm exte
 		EditingUtils.setID(name, EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.name, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -282,6 +285,9 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm exte
 		this.tablecompositionRequiredProperty.setUpperBound(-1);
 		tablecompositionRequiredProperty.setID(EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.tablecompositionRequiredProperty);
 		tablecompositionRequiredProperty.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createTablecompositionRequiredPropertyTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -330,6 +336,9 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm exte
 		this.tablecompositionOptionalProperty.setUpperBound(-1);
 		tablecompositionOptionalProperty.setID(EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.tablecompositionOptionalProperty);
 		tablecompositionOptionalProperty.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createTablecompositionOptionalPropertyTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleFirstTabPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleFirstTabPropertiesEditionPartForm.java
index 224f7f647..bdbe911aa 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleFirstTabPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleFirstTabPropertiesEditionPartForm.java
@@ -210,6 +210,9 @@ public class TextSampleFirstTabPropertiesEditionPartForm extends SectionProperti
 		EditingUtils.setID(textRequiredPropertyInFirstTab, EefnrViewsRepository.TextSampleFirstTab.Properties.textRequiredPropertyInFirstTab);
 		EditingUtils.setEEFtype(textRequiredPropertyInFirstTab, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextSampleFirstTab.Properties.textRequiredPropertyInFirstTab, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextRequiredPropertyInFirstTabText
+
+		// End of user code
 		return parent;
 	}
 
@@ -275,6 +278,9 @@ public class TextSampleFirstTabPropertiesEditionPartForm extends SectionProperti
 		EditingUtils.setID(textOptionalPropertyInFirstTab, EefnrViewsRepository.TextSampleFirstTab.Properties.textOptionalPropertyInFirstTab);
 		EditingUtils.setEEFtype(textOptionalPropertyInFirstTab, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextSampleFirstTab.Properties.textOptionalPropertyInFirstTab, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextOptionalPropertyInFirstTabText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSamplePropertiesEditionPartForm.java
index 5825b2272..3b7a3f3a7 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSamplePropertiesEditionPartForm.java
@@ -215,6 +215,9 @@ public class TextSamplePropertiesEditionPartForm extends SectionPropertiesEditin
 		EditingUtils.setID(textRequiredProperty, EefnrViewsRepository.TextSample.Properties.textRequiredProperty);
 		EditingUtils.setEEFtype(textRequiredProperty, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextSample.Properties.textRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextRequiredPropertyText
+
+		// End of user code
 		return parent;
 	}
 
@@ -280,6 +283,9 @@ public class TextSamplePropertiesEditionPartForm extends SectionPropertiesEditin
 		EditingUtils.setID(textOptionalProperty, EefnrViewsRepository.TextSample.Properties.textOptionalProperty);
 		EditingUtils.setEEFtype(textOptionalProperty, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextSample.Properties.textOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextOptionalPropertyText
+
+		// End of user code
 		return parent;
 	}
 
@@ -345,6 +351,9 @@ public class TextSamplePropertiesEditionPartForm extends SectionPropertiesEditin
 		EditingUtils.setID(textROProperty, EefnrViewsRepository.TextSample.Properties.textROProperty);
 		EditingUtils.setEEFtype(textROProperty, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextSample.Properties.textROProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextROPropertyText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleSecondTabPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleSecondTabPropertiesEditionPartForm.java
index 4f7abf8ea..1ec85a63f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleSecondTabPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextSampleSecondTabPropertiesEditionPartForm.java
@@ -210,6 +210,9 @@ public class TextSampleSecondTabPropertiesEditionPartForm extends SectionPropert
 		EditingUtils.setID(textRequiredPropertyInSecondTab, EefnrViewsRepository.TextSampleSecondTab.Properties.textRequiredPropertyInSecondTab);
 		EditingUtils.setEEFtype(textRequiredPropertyInSecondTab, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextSampleSecondTab.Properties.textRequiredPropertyInSecondTab, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextRequiredPropertyInSecondTabText
+
+		// End of user code
 		return parent;
 	}
 
@@ -275,6 +278,9 @@ public class TextSampleSecondTabPropertiesEditionPartForm extends SectionPropert
 		EditingUtils.setID(textOptionalPropertyInSecondTab, EefnrViewsRepository.TextSampleSecondTab.Properties.textOptionalPropertyInSecondTab);
 		EditingUtils.setEEFtype(textOptionalPropertyInSecondTab, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextSampleSecondTab.Properties.textOptionalPropertyInSecondTab, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextOptionalPropertyInSecondTabText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextareaSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextareaSamplePropertiesEditionPartForm.java
index 9c9a35b8a..c6ab0aa18 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextareaSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TextareaSamplePropertiesEditionPartForm.java
@@ -205,6 +205,9 @@ public class TextareaSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		EditingUtils.setID(textareaRequiredProperty, EefnrViewsRepository.TextareaSample.Properties.textareaRequiredProperty);
 		EditingUtils.setEEFtype(textareaRequiredProperty, "eef::Textarea"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextareaSample.Properties.textareaRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextareaRequiredPropertyTextArea
+
+		// End of user code
 		return parent;
 	}
 
@@ -261,6 +264,9 @@ public class TextareaSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		EditingUtils.setID(textareaOptionalProperty, EefnrViewsRepository.TextareaSample.Properties.textareaOptionalProperty);
 		EditingUtils.setEEFtype(textareaOptionalProperty, "eef::Textarea"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextareaSample.Properties.textareaOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextareaOptionalPropertyTextArea
+
+		// End of user code
 		return parent;
 	}
 
@@ -317,6 +323,9 @@ public class TextareaSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		EditingUtils.setID(textareaROProperty, EefnrViewsRepository.TextareaSample.Properties.textareaROProperty);
 		EditingUtils.setEEFtype(textareaROProperty, "eef::Textarea"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextareaSample.Properties.textareaROProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextareaROPropertyTextArea
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TotalSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TotalSamplePropertiesEditionPartForm.java
index b09d2ece8..7bf7f31c0 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TotalSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TotalSamplePropertiesEditionPartForm.java
@@ -420,6 +420,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		EditingUtils.setID(textRequiredProperty, EefnrViewsRepository.TotalSample.Properties.textRequiredProperty);
 		EditingUtils.setEEFtype(textRequiredProperty, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.textRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextRequiredPropertyText
+
+		// End of user code
 		return parent;
 	}
 
@@ -485,6 +488,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		EditingUtils.setID(textOptionalProperty, EefnrViewsRepository.TotalSample.Properties.textOptionalProperty);
 		EditingUtils.setEEFtype(textOptionalProperty, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.textOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextOptionalPropertyText
+
+		// End of user code
 		return parent;
 	}
 
@@ -511,6 +517,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		EditingUtils.setID(checkboxRequiredProperty, EefnrViewsRepository.TotalSample.Properties.checkboxRequiredProperty);
 		EditingUtils.setEEFtype(checkboxRequiredProperty, "eef::Checkbox"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.checkboxRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCheckboxRequiredPropertyCheckbox
+
+		// End of user code
 		return parent;
 	}
 
@@ -537,6 +546,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		EditingUtils.setID(checkboxOptionalProperty, EefnrViewsRepository.TotalSample.Properties.checkboxOptionalProperty);
 		EditingUtils.setEEFtype(checkboxOptionalProperty, "eef::Checkbox"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.checkboxOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCheckboxOptionalPropertyCheckbox
+
+		// End of user code
 		return parent;
 	}
 
@@ -602,6 +614,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		EditingUtils.setID(textareaRequiredProperty, EefnrViewsRepository.TotalSample.Properties.textareaRequiredProperty);
 		EditingUtils.setEEFtype(textareaRequiredProperty, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.textareaRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextareaRequiredPropertyText
+
+		// End of user code
 		return parent;
 	}
 
@@ -667,6 +682,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		EditingUtils.setID(textareaOptionalProperty, EefnrViewsRepository.TotalSample.Properties.textareaOptionalProperty);
 		EditingUtils.setEEFtype(textareaOptionalProperty, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.textareaOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextareaOptionalPropertyText
+
+		// End of user code
 		return parent;
 	}
 
@@ -687,6 +705,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 			}
 		});
 		radioRequiredPropertyRadioViewer.setID(EefnrViewsRepository.TotalSample.Properties.radioRequiredProperty);
+		// Start of user code for createRadioRequiredPropertyRadioViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -707,6 +728,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 			}
 		});
 		radioOptionalPropertyRadioViewer.setID(EefnrViewsRepository.TotalSample.Properties.radioOptionalProperty);
+		// Start of user code for createRadioOptionalPropertyRadioViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -737,6 +761,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		});
 		eobjectflatcomboviewerRequiredProperty.setID(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerRequiredProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEobjectflatcomboviewerRequiredPropertyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -767,6 +794,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		});
 		eobjectflatcomboviewerOptionalProperty.setID(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerOptionalProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEobjectflatcomboviewerOptionalPropertyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -798,6 +828,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		this.referencestableRequiredProperty.disableMove();
 		referencestableRequiredProperty.setID(EefnrViewsRepository.TotalSample.Properties.referencestableRequiredProperty);
 		referencestableRequiredProperty.setEEFType("eef::AdvancedReferencesTable"); //$NON-NLS-1$
+		// Start of user code for createReferencestableRequiredPropertyReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -879,6 +912,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		this.referencestableOptionalProperty.disableMove();
 		referencestableOptionalProperty.setID(EefnrViewsRepository.TotalSample.Properties.referencestableOptionalProperty);
 		referencestableOptionalProperty.setEEFType("eef::AdvancedReferencesTable"); //$NON-NLS-1$
+		// Start of user code for createReferencestableOptionalPropertyReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -956,6 +992,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		});
 		emfcomboviewerRequiredProperty.setID(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerRequiredProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerRequiredProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEmfcomboviewerRequiredPropertyEMFComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -983,6 +1022,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		});
 		emfcomboviewerOptionalProperty.setID(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerOptionalProperty);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerOptionalProperty, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEmfcomboviewerOptionalPropertyEMFComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -1026,6 +1068,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		});
 		EditingUtils.setID(editMultivaluededitorRequiredProperty, EefnrViewsRepository.TotalSample.Properties.multivaluededitorRequiredProperty);
 		EditingUtils.setEEFtype(editMultivaluededitorRequiredProperty, "eef::MultiValuedEditor::browsebutton"); //$NON-NLS-1$
+		// Start of user code for createMultivaluededitorRequiredPropertyMultiValuedEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -1069,6 +1114,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		});
 		EditingUtils.setID(editMultivaluededitorOptionalProperty, EefnrViewsRepository.TotalSample.Properties.multivaluededitorOptionalProperty);
 		EditingUtils.setEEFtype(editMultivaluededitorOptionalProperty, "eef::MultiValuedEditor::browsebutton"); //$NON-NLS-1$
+		// Start of user code for createMultivaluededitorOptionalPropertyMultiValuedEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -1158,6 +1206,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		EditingUtils.setID(tablecompositionRequiredProperty.getTable(), EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(tablecompositionRequiredProperty.getTable(), "eef::TableComposition::field"); //$NON-NLS-1$
 		createTablecompositionRequiredPropertyPanel(widgetFactory, tableContainer);
+		// Start of user code for createTablecompositionRequiredPropertyTableComposition
+
+		// End of user code
 		return container;
 	}
 
@@ -1237,6 +1288,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		});
 		EditingUtils.setID(editTablecompositionRequiredProperty, EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(editTablecompositionRequiredProperty, "eef::TableComposition::editbutton"); //$NON-NLS-1$
+		// Start of user code for createTablecompositionRequiredPropertyPanel
+
+		// End of user code
 		return tablecompositionRequiredPropertyPanel;
 	}
 
@@ -1326,6 +1380,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		EditingUtils.setID(tablecompositionOptionalProperty.getTable(), EefnrViewsRepository.TotalSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(tablecompositionOptionalProperty.getTable(), "eef::TableComposition::field"); //$NON-NLS-1$
 		createTablecompositionOptionalPropertyPanel(widgetFactory, tableContainer);
+		// Start of user code for createTablecompositionOptionalPropertyTableComposition
+
+		// End of user code
 		return container;
 	}
 
@@ -1405,6 +1462,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		});
 		EditingUtils.setID(editTablecompositionOptionalProperty, EefnrViewsRepository.TotalSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(editTablecompositionOptionalProperty, "eef::TableComposition::editbutton"); //$NON-NLS-1$
+		// Start of user code for createTablecompositionOptionalPropertyPanel
+
+		// End of user code
 		return tablecompositionOptionalPropertyPanel;
 	}
 
@@ -1436,6 +1496,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		this.advancedreferencestableRequiredProperty.disableMove();
 		advancedreferencestableRequiredProperty.setID(EefnrViewsRepository.TotalSample.Properties.advancedreferencestableRequiredProperty);
 		advancedreferencestableRequiredProperty.setEEFType("eef::AdvancedReferencesTable"); //$NON-NLS-1$
+		// Start of user code for createAdvancedreferencestableRequiredPropertyReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -1517,6 +1580,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		this.advancedreferencestableOptionalProperty.disableMove();
 		advancedreferencestableOptionalProperty.setID(EefnrViewsRepository.TotalSample.Properties.advancedreferencestableOptionalProperty);
 		advancedreferencestableOptionalProperty.setEEFType("eef::AdvancedReferencesTable"); //$NON-NLS-1$
+		// Start of user code for createAdvancedreferencestableOptionalPropertyReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -1597,6 +1663,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		});
 		advancedeobjectflatcomboviewerRequiredPropery.setID(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerRequiredPropery);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerRequiredPropery, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAdvancedeobjectflatcomboviewerRequiredProperyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -1627,6 +1696,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		});
 		advancedeobjectflatcomboviewerOptionalPropery.setID(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerOptionalPropery);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerOptionalPropery, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAdvancedeobjectflatcomboviewerOptionalProperyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -1675,6 +1747,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		this.advancedtablecompositionRequiredProperty.setUpperBound(-1);
 		advancedtablecompositionRequiredProperty.setID(EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionRequiredProperty);
 		advancedtablecompositionRequiredProperty.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createAdvancedtablecompositionRequiredPropertyTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -1723,6 +1798,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		this.advancedtablecompositionOptionalProperty.setUpperBound(-1);
 		advancedtablecompositionOptionalProperty.setID(EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionOptionalProperty);
 		advancedtablecompositionOptionalProperty.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createAdvancedtablecompositionOptionalPropertyTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -1788,6 +1866,9 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi
 		EditingUtils.setID(name, EefnrViewsRepository.TotalSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.name, EefnrViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl.java
index 425f5d2e0..f3e595aa8 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl.java
@@ -187,6 +187,9 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		advancedeobjectflatcomboviewerRequiredProperty.setLayoutData(advancedeobjectflatcomboviewerRequiredPropertyData);
 		advancedeobjectflatcomboviewerRequiredProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAdvancedeobjectflatcomboviewerRequiredPropertyAdvancedFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -215,6 +218,9 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		advancedeobjectflatcomboviewerOptionalProperty.setLayoutData(advancedeobjectflatcomboviewerOptionalPropertyData);
 		advancedeobjectflatcomboviewerOptionalProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerOptionalProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAdvancedeobjectflatcomboviewerOptionalPropertyAdvancedFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -243,6 +249,9 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		advancedeobjectflatcomboviewerROProperty.setLayoutData(advancedeobjectflatcomboviewerROPropertyData);
 		advancedeobjectflatcomboviewerROProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerROProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerROProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAdvancedeobjectflatcomboviewerROPropertyAdvancedFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -270,6 +279,9 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		});
 		advancedeobjectflatcomboviewerCompoRequiredProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAdvancedeobjectflatcomboviewerCompoRequiredPropertySingleCompositionEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -298,6 +310,9 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartImpl exten
 		advancedeobjectflatcomboviewerCompoOptionalProperty.setLayoutData(advancedeobjectflatcomboviewerCompoOptionalPropertyData);
 		advancedeobjectflatcomboviewerCompoOptionalProperty.setID(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerCompoOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAdvancedeobjectflatcomboviewerCompoOptionalPropertyAdvancedFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.java
index c62e9bf6f..f19ad415c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.java
@@ -199,6 +199,9 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl exten
 		this.advancedtablecompositionRequiredProperty.setUpperBound(-1);
 		advancedtablecompositionRequiredProperty.setID(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionRequiredProperty);
 		advancedtablecompositionRequiredProperty.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createAdvancedtablecompositionRequiredPropertyAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -247,6 +250,9 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl exten
 		this.advancedtablecompositionOptionalProperty.setUpperBound(-1);
 		advancedtablecompositionOptionalProperty.setID(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionOptionalProperty);
 		advancedtablecompositionOptionalProperty.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createAdvancedtablecompositionOptionalPropertyAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -295,6 +301,9 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl exten
 		this.advancedtablecompositionROProperty.setUpperBound(-1);
 		advancedtablecompositionROProperty.setID(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionROProperty);
 		advancedtablecompositionROProperty.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createAdvancedtablecompositionROPropertyAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/CheckboxSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/CheckboxSamplePropertiesEditionPartImpl.java
index c3a8c12ee..b1e02c6e3 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/CheckboxSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/CheckboxSamplePropertiesEditionPartImpl.java
@@ -163,6 +163,9 @@ public class CheckboxSamplePropertiesEditionPartImpl extends CompositeProperties
 		EditingUtils.setID(checkboxRequiredProperty, EefnrViewsRepository.CheckboxSample.Properties.checkboxRequiredProperty);
 		EditingUtils.setEEFtype(checkboxRequiredProperty, "eef::Checkbox"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.CheckboxSample.Properties.checkboxRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCheckboxRequiredPropertyCheckbox
+
+		// End of user code
 		return parent;
 	}
 
@@ -190,6 +193,9 @@ public class CheckboxSamplePropertiesEditionPartImpl extends CompositeProperties
 		EditingUtils.setID(checkboxOptionalProperty, EefnrViewsRepository.CheckboxSample.Properties.checkboxOptionalProperty);
 		EditingUtils.setEEFtype(checkboxOptionalProperty, "eef::Checkbox"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.CheckboxSample.Properties.checkboxOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCheckboxOptionalPropertyCheckbox
+
+		// End of user code
 		return parent;
 	}
 
@@ -217,6 +223,9 @@ public class CheckboxSamplePropertiesEditionPartImpl extends CompositeProperties
 		EditingUtils.setID(checkboxROProperty, EefnrViewsRepository.CheckboxSample.Properties.checkboxROProperty);
 		EditingUtils.setEEFtype(checkboxROProperty, "eef::Checkbox"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.CheckboxSample.Properties.checkboxROProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCheckboxROPropertyCheckbox
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EMFComboViewerSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EMFComboViewerSamplePropertiesEditionPartImpl.java
index 1c43f6cdf..0637a1f41 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EMFComboViewerSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EMFComboViewerSamplePropertiesEditionPartImpl.java
@@ -169,6 +169,9 @@ public class EMFComboViewerSamplePropertiesEditionPartImpl extends CompositeProp
 		});
 		emfcomboviewerRequiredProperty.setID(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerRequiredProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEmfcomboviewerRequiredPropertyEMFComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -196,6 +199,9 @@ public class EMFComboViewerSamplePropertiesEditionPartImpl extends CompositeProp
 		});
 		emfcomboviewerOptionalProperty.setID(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerOptionalProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEmfcomboviewerOptionalPropertyEMFComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -223,6 +229,9 @@ public class EMFComboViewerSamplePropertiesEditionPartImpl extends CompositeProp
 		});
 		emfcomboviewerROProperty.setID(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerROProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerROProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEmfcomboviewerROPropertyEMFComboViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EObjectFlatComboViewerSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EObjectFlatComboViewerSamplePropertiesEditionPartImpl.java
index 1872e5878..84bdfce64 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EObjectFlatComboViewerSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/EObjectFlatComboViewerSamplePropertiesEditionPartImpl.java
@@ -166,6 +166,9 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartImpl extends Compo
 		eobjectflatcomboviewerRequiredPropery.setLayoutData(eobjectflatcomboviewerRequiredProperyData);
 		eobjectflatcomboviewerRequiredPropery.setID(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerRequiredPropery);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerRequiredPropery, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEobjectflatcomboviewerRequiredProperyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -189,6 +192,9 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartImpl extends Compo
 		eobjectflatcomboviewerOptionalPropery.setLayoutData(eobjectflatcomboviewerOptionalProperyData);
 		eobjectflatcomboviewerOptionalPropery.setID(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerOptionalPropery);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerOptionalPropery, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEobjectflatcomboviewerOptionalProperyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -212,6 +218,9 @@ public class EObjectFlatComboViewerSamplePropertiesEditionPartImpl extends Compo
 		eobjectflatcomboviewerROPropery.setLayoutData(eobjectflatcomboviewerROProperyData);
 		eobjectflatcomboviewerROPropery.setID(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerROPropery);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerROPropery, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEobjectflatcomboviewerROProperyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/FlatReferenceTableSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/FlatReferenceTableSamplePropertiesEditionPartImpl.java
index 53b8a715e..eabdbd3cd 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/FlatReferenceTableSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/FlatReferenceTableSamplePropertiesEditionPartImpl.java
@@ -165,6 +165,9 @@ public class FlatReferenceTableSamplePropertiesEditionPartImpl extends Composite
 		flatreferencetableRequiredProperty.setLayoutData(flatreferencetableRequiredPropertyData);
 		flatreferencetableRequiredProperty.setID(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableRequiredProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFlatreferencetableRequiredPropertyFlatReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -189,6 +192,9 @@ public class FlatReferenceTableSamplePropertiesEditionPartImpl extends Composite
 		flatreferencetableOptionalProperty.setLayoutData(flatreferencetableOptionalPropertyData);
 		flatreferencetableOptionalProperty.setID(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableOptionalProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFlatreferencetableOptionalPropertyFlatReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
@@ -213,6 +219,9 @@ public class FlatReferenceTableSamplePropertiesEditionPartImpl extends Composite
 		flatreferencetableROProperty.setLayoutData(flatreferencetableROPropertyData);
 		flatreferencetableROProperty.setID(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableROProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableROProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFlatreferencetableROPropertyFlatReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ImageViewerSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ImageViewerSamplePropertiesEditionPartImpl.java
index 113ec3efd..70c1c2b80 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ImageViewerSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ImageViewerSamplePropertiesEditionPartImpl.java
@@ -163,6 +163,9 @@ public class ImageViewerSamplePropertiesEditionPartImpl extends CompositePropert
 		});
 		imageviewerRequiredProperty.setID(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerRequiredProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createImageviewerRequiredPropertyImageViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -189,6 +192,9 @@ public class ImageViewerSamplePropertiesEditionPartImpl extends CompositePropert
 		});
 		imageviewerOptionalProperty.setID(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerOptionalProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createImageviewerOptionalPropertyImageViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -215,6 +221,9 @@ public class ImageViewerSamplePropertiesEditionPartImpl extends CompositePropert
 		});
 		imageviewerROProperty.setID(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerROProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.ImageViewerSample.Properties.imageviewerROProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createImageviewerROPropertyImageViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/MultiValuedEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/MultiValuedEditorSamplePropertiesEditionPartImpl.java
index 02b7cd646..32297efe3 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/MultiValuedEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/MultiValuedEditorSamplePropertiesEditionPartImpl.java
@@ -193,6 +193,9 @@ public class MultiValuedEditorSamplePropertiesEditionPartImpl extends CompositeP
 		});
 		EditingUtils.setID(editMultivaluededitorRequiredProperty, EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorRequiredProperty);
 		EditingUtils.setEEFtype(editMultivaluededitorRequiredProperty, "eef::MultiValuedEditor::browsebutton"); //$NON-NLS-1$
+		// Start of user code for createMultivaluededitorRequiredPropertyMultiValuedEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -233,6 +236,9 @@ public class MultiValuedEditorSamplePropertiesEditionPartImpl extends CompositeP
 		});
 		EditingUtils.setID(editMultivaluededitorOptionalProperty, EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorOptionalProperty);
 		EditingUtils.setEEFtype(editMultivaluededitorOptionalProperty, "eef::MultiValuedEditor::browsebutton"); //$NON-NLS-1$
+		// Start of user code for createMultivaluededitorOptionalPropertyMultiValuedEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -274,6 +280,9 @@ public class MultiValuedEditorSamplePropertiesEditionPartImpl extends CompositeP
 		});
 		EditingUtils.setID(editMultivaluededitorROProperty, EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorROProperty);
 		EditingUtils.setEEFtype(editMultivaluededitorROProperty, "eef::MultiValuedEditor::browsebutton"); //$NON-NLS-1$
+		// Start of user code for createMultivaluededitorROPropertyMultiValuedEditor
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RadioSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RadioSamplePropertiesEditionPartImpl.java
index 7e0c0790a..460567bd2 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RadioSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RadioSamplePropertiesEditionPartImpl.java
@@ -160,6 +160,9 @@ public class RadioSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		radioRequiredPropertyRadioViewer.setID(EefnrViewsRepository.RadioSample.Properties.radioRequiredProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.RadioSample.Properties.radioRequiredProperty, EefnrViewsRepository.SWT_KIND), null);
+		// Start of user code for createRadioRequiredPropertyRadioViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -181,6 +184,9 @@ public class RadioSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		radioOptionalPropertyRadioViewer.setID(EefnrViewsRepository.RadioSample.Properties.radioOptionalProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.RadioSample.Properties.radioOptionalProperty, EefnrViewsRepository.SWT_KIND), null);
+		// Start of user code for createRadioOptionalPropertyRadioViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -202,6 +208,9 @@ public class RadioSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		radioROPropertyRadioViewer.setID(EefnrViewsRepository.RadioSample.Properties.radioROProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.RadioSample.Properties.radioROProperty, EefnrViewsRepository.SWT_KIND), null);
+		// Start of user code for createRadioROPropertyRadioViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ReferencesTableSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ReferencesTableSamplePropertiesEditionPartImpl.java
index a7eb0b2e4..3a6fd4622 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ReferencesTableSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/ReferencesTableSamplePropertiesEditionPartImpl.java
@@ -317,6 +317,9 @@ public class ReferencesTableSamplePropertiesEditionPartImpl extends CompositePro
 
 		};
 		dialog.open();
+		// Start of user code for addReferencestableRequiredProperty
+
+		// End of user code
 		referencestableRequiredProperty.refresh();
 	}
 
@@ -475,6 +478,9 @@ public class ReferencesTableSamplePropertiesEditionPartImpl extends CompositePro
 
 		};
 		dialog.open();
+		// Start of user code for addReferencestableOptionalProperty
+
+		// End of user code
 		referencestableOptionalProperty.refresh();
 	}
 
@@ -633,6 +639,9 @@ public class ReferencesTableSamplePropertiesEditionPartImpl extends CompositePro
 
 		};
 		dialog.open();
+		// Start of user code for addReferencestableROProperty
+
+		// End of user code
 		referencestableROProperty.refresh();
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java
index be3d2c60b..4e0ce1fdb 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java
@@ -185,6 +185,9 @@ public class RootPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		this.samples.setUpperBound(-1);
 		samples.setID(EefnrViewsRepository.Root.Properties.samples);
 		samples.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createSamplesAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SamplePropertiesEditionPartImpl.java
index 5535c8c8b..42beeb106 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SamplePropertiesEditionPartImpl.java
@@ -179,6 +179,9 @@ public class SamplePropertiesEditionPartImpl extends CompositePropertiesEditionP
 		EditingUtils.setID(textRequiredProperty, EefnrViewsRepository.Sample.Properties.textRequiredProperty);
 		EditingUtils.setEEFtype(textRequiredProperty, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.Sample.Properties.textRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextRequiredPropertyText
+
+		// End of user code
 		return parent;
 	}
 
@@ -225,6 +228,9 @@ public class SamplePropertiesEditionPartImpl extends CompositePropertiesEditionP
 		EditingUtils.setID(textOptionalProperty, EefnrViewsRepository.Sample.Properties.textOptionalProperty);
 		EditingUtils.setEEFtype(textOptionalProperty, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.Sample.Properties.textOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextOptionalPropertyText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SelectionDialogSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SelectionDialogSamplePropertiesEditionPartImpl.java
index 65f708fa4..11b145fbd 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SelectionDialogSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SelectionDialogSamplePropertiesEditionPartImpl.java
@@ -189,6 +189,9 @@ public class SelectionDialogSamplePropertiesEditionPartImpl extends CompositePro
 			}
 		});
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSelectionDialogRequiredPropertySelectionDialog
+
+		// End of user code
 		return parent;
 	}
 	
@@ -246,6 +249,9 @@ public class SelectionDialogSamplePropertiesEditionPartImpl extends CompositePro
 			}
 		});
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSelectionDialogOptionalPropertySelectionDialog
+
+		// End of user code
 		return parent;
 	}
 	
@@ -303,6 +309,9 @@ public class SelectionDialogSamplePropertiesEditionPartImpl extends CompositePro
 			}
 		});
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.SelectionDialogSample.Properties.selectionDialogROProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSelectionDialogROPropertySelectionDialog
+
+		// End of user code
 		return parent;
 	}
 	
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SingleCompositionEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SingleCompositionEditorSamplePropertiesEditionPartImpl.java
index 0aabe2e63..c8c10b78a 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SingleCompositionEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SingleCompositionEditorSamplePropertiesEditionPartImpl.java
@@ -169,6 +169,9 @@ public class SingleCompositionEditorSamplePropertiesEditionPartImpl extends Comp
 		});
 		singlecompositionviewerRequiredProperty.setID(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerRequiredProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSinglecompositionviewerRequiredPropertySingleCompositionEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -196,6 +199,9 @@ public class SingleCompositionEditorSamplePropertiesEditionPartImpl extends Comp
 		});
 		singlecompositionviewerOptionalProperty.setID(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerOptionalProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSinglecompositionviewerOptionalPropertySingleCompositionEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -223,6 +229,9 @@ public class SingleCompositionEditorSamplePropertiesEditionPartImpl extends Comp
 		});
 		singlecompositionviewerROProperty.setID(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerROProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerROProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSinglecompositionviewerROPropertySingleCompositionEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -250,6 +259,9 @@ public class SingleCompositionEditorSamplePropertiesEditionPartImpl extends Comp
 		});
 		singlecompositionviewerOnAbstractOptionalProperty.setID(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerOnAbstractOptionalProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.SingleCompositionEditorSample.Properties.singlecompositionviewerOnAbstractOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSinglecompositionviewerOnAbstractOptionalPropertySingleCompositionEditor
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SingleCompositionViewerSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SingleCompositionViewerSamplePropertiesEditionPartImpl.java
index 4ac85a97f..061266afc 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SingleCompositionViewerSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/SingleCompositionViewerSamplePropertiesEditionPartImpl.java
@@ -210,6 +210,9 @@ public class SingleCompositionViewerSamplePropertiesEditionPartImpl extends Comp
 
 				}
 			});
+		// Start of user code for createSinglecompositionviewerSingleRequiredPropertySingleCompositionViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -258,6 +261,9 @@ public class SingleCompositionViewerSamplePropertiesEditionPartImpl extends Comp
 
 				}
 			});
+		// Start of user code for createSinglecompositionviewerSingleOptionalPropertySingleCompositionViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -306,6 +312,9 @@ public class SingleCompositionViewerSamplePropertiesEditionPartImpl extends Comp
 
 				}
 			});
+		// Start of user code for createSinglecompositionviewerMultiRequiredPropertySingleCompositionViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -354,6 +363,9 @@ public class SingleCompositionViewerSamplePropertiesEditionPartImpl extends Comp
 
 				}
 			});
+		// Start of user code for createSinglecompositionviewerMultiOptionalPropertySingleCompositionViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -365,6 +377,9 @@ public class SingleCompositionViewerSamplePropertiesEditionPartImpl extends Comp
 		this.singlecompositionviewerSingleROProperty.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
 		this.singlecompositionviewerSingleROProperty.setLayoutData(singlecompositionviewerSingleROPropertyData);
 			singlecompositionviewerSingleROProperty.setEnabled(false);
+		// Start of user code for createSinglecompositionviewerSingleROPropertySingleCompositionViewer
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionEditorSamplePropertiesEditionPartImpl.java
index 7f3b27142..dec6e41dd 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionEditorSamplePropertiesEditionPartImpl.java
@@ -260,6 +260,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		EditingUtils.setID(tablecompositionRequiredProperty.getTable(), EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(tablecompositionRequiredProperty.getTable(), "eef::TableComposition::field"); //$NON-NLS-1$
 		createTablecompositionRequiredPropertyPanel(tableContainer);
+		// Start of user code for createTablecompositionRequiredPropertyTableComposition
+
+		// End of user code
 		return container;
 	}
 
@@ -342,6 +345,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		});
 		EditingUtils.setID(editTablecompositionRequiredProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(editTablecompositionRequiredProperty, "eef::TableComposition::editbutton"); //$NON-NLS-1$
+		// Start of user code for createTablecompositionRequiredPropertyPanel
+
+		// End of user code
 		return tablecompositionRequiredPropertyPanel;
 	}
 
@@ -431,6 +437,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		EditingUtils.setID(tablecompositionOptionalProperty.getTable(), EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(tablecompositionOptionalProperty.getTable(), "eef::TableComposition::field"); //$NON-NLS-1$
 		createTablecompositionOptionalPropertyPanel(tableContainer);
+		// Start of user code for createTablecompositionOptionalPropertyTableComposition
+
+		// End of user code
 		return container;
 	}
 
@@ -513,6 +522,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		});
 		EditingUtils.setID(editTablecompositionOptionalProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(editTablecompositionOptionalProperty, "eef::TableComposition::editbutton"); //$NON-NLS-1$
+		// Start of user code for createTablecompositionOptionalPropertyPanel
+
+		// End of user code
 		return tablecompositionOptionalPropertyPanel;
 	}
 
@@ -602,6 +614,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		EditingUtils.setID(tablecompositionROProperty.getTable(), EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionROProperty);
 		EditingUtils.setEEFtype(tablecompositionROProperty.getTable(), "eef::TableComposition::field"); //$NON-NLS-1$
 		createTablecompositionROPropertyPanel(tableContainer);
+		// Start of user code for createTablecompositionROPropertyTableComposition
+
+		// End of user code
 		return container;
 	}
 
@@ -684,6 +699,9 @@ public class TableCompositionEditorSamplePropertiesEditionPartImpl extends Compo
 		});
 		EditingUtils.setID(editTablecompositionROProperty, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionROProperty);
 		EditingUtils.setEEFtype(editTablecompositionROProperty, "eef::TableComposition::editbutton"); //$NON-NLS-1$
+		// Start of user code for createTablecompositionROPropertyPanel
+
+		// End of user code
 		return tablecompositionROPropertyPanel;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionExtensionEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionExtensionEditorSamplePropertiesEditionPartImpl.java
index a9af93d9b..8e49bdef8 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionExtensionEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionExtensionEditorSamplePropertiesEditionPartImpl.java
@@ -204,6 +204,9 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartImpl exte
 		EditingUtils.setID(name, EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.name, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -252,6 +255,9 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartImpl exte
 		this.tablecompositionRequiredProperty.setUpperBound(-1);
 		tablecompositionRequiredProperty.setID(EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.tablecompositionRequiredProperty);
 		tablecompositionRequiredProperty.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createTablecompositionRequiredPropertyAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -300,6 +306,9 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartImpl exte
 		this.tablecompositionOptionalProperty.setUpperBound(-1);
 		tablecompositionOptionalProperty.setID(EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.tablecompositionOptionalProperty);
 		tablecompositionOptionalProperty.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createTablecompositionOptionalPropertyAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleFirstTabPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleFirstTabPropertiesEditionPartImpl.java
index 8d75be5e9..5fb4def0d 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleFirstTabPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleFirstTabPropertiesEditionPartImpl.java
@@ -179,6 +179,9 @@ public class TextSampleFirstTabPropertiesEditionPartImpl extends CompositeProper
 		EditingUtils.setID(textRequiredPropertyInFirstTab, EefnrViewsRepository.TextSampleFirstTab.Properties.textRequiredPropertyInFirstTab);
 		EditingUtils.setEEFtype(textRequiredPropertyInFirstTab, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextSampleFirstTab.Properties.textRequiredPropertyInFirstTab, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextRequiredPropertyInFirstTabText
+
+		// End of user code
 		return parent;
 	}
 
@@ -225,6 +228,9 @@ public class TextSampleFirstTabPropertiesEditionPartImpl extends CompositeProper
 		EditingUtils.setID(textOptionalPropertyInFirstTab, EefnrViewsRepository.TextSampleFirstTab.Properties.textOptionalPropertyInFirstTab);
 		EditingUtils.setEEFtype(textOptionalPropertyInFirstTab, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextSampleFirstTab.Properties.textOptionalPropertyInFirstTab, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextOptionalPropertyInFirstTabText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSamplePropertiesEditionPartImpl.java
index 92f1f1c2d..b0727c22e 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSamplePropertiesEditionPartImpl.java
@@ -184,6 +184,9 @@ public class TextSamplePropertiesEditionPartImpl extends CompositePropertiesEdit
 		EditingUtils.setID(textRequiredProperty, EefnrViewsRepository.TextSample.Properties.textRequiredProperty);
 		EditingUtils.setEEFtype(textRequiredProperty, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextSample.Properties.textRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextRequiredPropertyText
+
+		// End of user code
 		return parent;
 	}
 
@@ -230,6 +233,9 @@ public class TextSamplePropertiesEditionPartImpl extends CompositePropertiesEdit
 		EditingUtils.setID(textOptionalProperty, EefnrViewsRepository.TextSample.Properties.textOptionalProperty);
 		EditingUtils.setEEFtype(textOptionalProperty, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextSample.Properties.textOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextOptionalPropertyText
+
+		// End of user code
 		return parent;
 	}
 
@@ -276,6 +282,9 @@ public class TextSamplePropertiesEditionPartImpl extends CompositePropertiesEdit
 		EditingUtils.setID(textROProperty, EefnrViewsRepository.TextSample.Properties.textROProperty);
 		EditingUtils.setEEFtype(textROProperty, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextSample.Properties.textROProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextROPropertyText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleSecondTabPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleSecondTabPropertiesEditionPartImpl.java
index 4f154ec5d..8e9707bc4 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleSecondTabPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextSampleSecondTabPropertiesEditionPartImpl.java
@@ -179,6 +179,9 @@ public class TextSampleSecondTabPropertiesEditionPartImpl extends CompositePrope
 		EditingUtils.setID(textRequiredPropertyInSecondTab, EefnrViewsRepository.TextSampleSecondTab.Properties.textRequiredPropertyInSecondTab);
 		EditingUtils.setEEFtype(textRequiredPropertyInSecondTab, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextSampleSecondTab.Properties.textRequiredPropertyInSecondTab, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextRequiredPropertyInSecondTabText
+
+		// End of user code
 		return parent;
 	}
 
@@ -225,6 +228,9 @@ public class TextSampleSecondTabPropertiesEditionPartImpl extends CompositePrope
 		EditingUtils.setID(textOptionalPropertyInSecondTab, EefnrViewsRepository.TextSampleSecondTab.Properties.textOptionalPropertyInSecondTab);
 		EditingUtils.setEEFtype(textOptionalPropertyInSecondTab, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextSampleSecondTab.Properties.textOptionalPropertyInSecondTab, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextOptionalPropertyInSecondTabText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextareaSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextareaSamplePropertiesEditionPartImpl.java
index 1ced1f05c..f7d460653 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextareaSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TextareaSamplePropertiesEditionPartImpl.java
@@ -169,6 +169,9 @@ public class TextareaSamplePropertiesEditionPartImpl extends CompositeProperties
 		EditingUtils.setID(textareaRequiredProperty, EefnrViewsRepository.TextareaSample.Properties.textareaRequiredProperty);
 		EditingUtils.setEEFtype(textareaRequiredProperty, "eef::Textarea"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextareaSample.Properties.textareaRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextareaRequiredPropertyTextArea
+
+		// End of user code
 		return parent;
 	}
 
@@ -201,6 +204,9 @@ public class TextareaSamplePropertiesEditionPartImpl extends CompositeProperties
 		EditingUtils.setID(textareaOptionalProperty, EefnrViewsRepository.TextareaSample.Properties.textareaOptionalProperty);
 		EditingUtils.setEEFtype(textareaOptionalProperty, "eef::Textarea"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextareaSample.Properties.textareaOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextareaOptionalPropertyTextArea
+
+		// End of user code
 		return parent;
 	}
 
@@ -233,6 +239,9 @@ public class TextareaSamplePropertiesEditionPartImpl extends CompositeProperties
 		EditingUtils.setID(textareaROProperty, EefnrViewsRepository.TextareaSample.Properties.textareaROProperty);
 		EditingUtils.setEEFtype(textareaROProperty, "eef::Textarea"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TextareaSample.Properties.textareaROProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextareaROPropertyTextArea
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TotalSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TotalSamplePropertiesEditionPartImpl.java
index bb9492cca..a800d88c5 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TotalSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TotalSamplePropertiesEditionPartImpl.java
@@ -386,6 +386,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		EditingUtils.setID(textRequiredProperty, EefnrViewsRepository.TotalSample.Properties.textRequiredProperty);
 		EditingUtils.setEEFtype(textRequiredProperty, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.textRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextRequiredPropertyText
+
+		// End of user code
 		return parent;
 	}
 
@@ -432,6 +435,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		EditingUtils.setID(textOptionalProperty, EefnrViewsRepository.TotalSample.Properties.textOptionalProperty);
 		EditingUtils.setEEFtype(textOptionalProperty, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.textOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextOptionalPropertyText
+
+		// End of user code
 		return parent;
 	}
 
@@ -459,6 +465,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		EditingUtils.setID(checkboxRequiredProperty, EefnrViewsRepository.TotalSample.Properties.checkboxRequiredProperty);
 		EditingUtils.setEEFtype(checkboxRequiredProperty, "eef::Checkbox"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.checkboxRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCheckboxRequiredPropertyCheckbox
+
+		// End of user code
 		return parent;
 	}
 
@@ -486,6 +495,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		EditingUtils.setID(checkboxOptionalProperty, EefnrViewsRepository.TotalSample.Properties.checkboxOptionalProperty);
 		EditingUtils.setEEFtype(checkboxOptionalProperty, "eef::Checkbox"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.checkboxOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCheckboxOptionalPropertyCheckbox
+
+		// End of user code
 		return parent;
 	}
 
@@ -532,6 +544,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		EditingUtils.setID(textareaRequiredProperty, EefnrViewsRepository.TotalSample.Properties.textareaRequiredProperty);
 		EditingUtils.setEEFtype(textareaRequiredProperty, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.textareaRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextareaRequiredPropertyText
+
+		// End of user code
 		return parent;
 	}
 
@@ -578,6 +593,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		EditingUtils.setID(textareaOptionalProperty, EefnrViewsRepository.TotalSample.Properties.textareaOptionalProperty);
 		EditingUtils.setEEFtype(textareaOptionalProperty, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.textareaOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTextareaOptionalPropertyText
+
+		// End of user code
 		return parent;
 	}
 
@@ -599,6 +617,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		radioRequiredPropertyRadioViewer.setID(EefnrViewsRepository.TotalSample.Properties.radioRequiredProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.radioRequiredProperty, EefnrViewsRepository.SWT_KIND), null);
+		// Start of user code for createRadioRequiredPropertyRadioViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -620,6 +641,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		radioOptionalPropertyRadioViewer.setID(EefnrViewsRepository.TotalSample.Properties.radioOptionalProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.radioOptionalProperty, EefnrViewsRepository.SWT_KIND), null);
+		// Start of user code for createRadioOptionalPropertyRadioViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -643,6 +667,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		eobjectflatcomboviewerRequiredProperty.setLayoutData(eobjectflatcomboviewerRequiredPropertyData);
 		eobjectflatcomboviewerRequiredProperty.setID(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerRequiredProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEobjectflatcomboviewerRequiredPropertyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -666,6 +693,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		eobjectflatcomboviewerOptionalProperty.setLayoutData(eobjectflatcomboviewerOptionalPropertyData);
 		eobjectflatcomboviewerOptionalProperty.setID(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerOptionalProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEobjectflatcomboviewerOptionalPropertyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -857,6 +887,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		emfcomboviewerRequiredProperty.setID(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerRequiredProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerRequiredProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEmfcomboviewerRequiredPropertyEMFComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -884,6 +917,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		emfcomboviewerOptionalProperty.setID(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerOptionalProperty);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.emfcomboviewerOptionalProperty, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEmfcomboviewerOptionalPropertyEMFComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -924,6 +960,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		EditingUtils.setID(editMultivaluededitorRequiredProperty, EefnrViewsRepository.TotalSample.Properties.multivaluededitorRequiredProperty);
 		EditingUtils.setEEFtype(editMultivaluededitorRequiredProperty, "eef::MultiValuedEditor::browsebutton"); //$NON-NLS-1$
+		// Start of user code for createMultivaluededitorRequiredPropertyMultiValuedEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -964,6 +1003,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		EditingUtils.setID(editMultivaluededitorOptionalProperty, EefnrViewsRepository.TotalSample.Properties.multivaluededitorOptionalProperty);
 		EditingUtils.setEEFtype(editMultivaluededitorOptionalProperty, "eef::MultiValuedEditor::browsebutton"); //$NON-NLS-1$
+		// Start of user code for createMultivaluededitorOptionalPropertyMultiValuedEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -1053,6 +1095,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		EditingUtils.setID(tablecompositionRequiredProperty.getTable(), EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(tablecompositionRequiredProperty.getTable(), "eef::TableComposition::field"); //$NON-NLS-1$
 		createTablecompositionRequiredPropertyPanel(tableContainer);
+		// Start of user code for createTablecompositionRequiredPropertyTableComposition
+
+		// End of user code
 		return container;
 	}
 
@@ -1135,6 +1180,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		EditingUtils.setID(editTablecompositionRequiredProperty, EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty);
 		EditingUtils.setEEFtype(editTablecompositionRequiredProperty, "eef::TableComposition::editbutton"); //$NON-NLS-1$
+		// Start of user code for createTablecompositionRequiredPropertyPanel
+
+		// End of user code
 		return tablecompositionRequiredPropertyPanel;
 	}
 
@@ -1224,6 +1272,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		EditingUtils.setID(tablecompositionOptionalProperty.getTable(), EefnrViewsRepository.TotalSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(tablecompositionOptionalProperty.getTable(), "eef::TableComposition::field"); //$NON-NLS-1$
 		createTablecompositionOptionalPropertyPanel(tableContainer);
+		// Start of user code for createTablecompositionOptionalPropertyTableComposition
+
+		// End of user code
 		return container;
 	}
 
@@ -1306,6 +1357,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		});
 		EditingUtils.setID(editTablecompositionOptionalProperty, EefnrViewsRepository.TotalSample.Properties.tablecompositionOptionalProperty);
 		EditingUtils.setEEFtype(editTablecompositionOptionalProperty, "eef::TableComposition::editbutton"); //$NON-NLS-1$
+		// Start of user code for createTablecompositionOptionalPropertyPanel
+
+		// End of user code
 		return tablecompositionOptionalPropertyPanel;
 	}
 
@@ -1493,6 +1547,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		advancedeobjectflatcomboviewerRequiredPropery.setLayoutData(advancedeobjectflatcomboviewerRequiredProperyData);
 		advancedeobjectflatcomboviewerRequiredPropery.setID(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerRequiredPropery);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerRequiredPropery, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAdvancedeobjectflatcomboviewerRequiredProperyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -1516,6 +1573,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		advancedeobjectflatcomboviewerOptionalPropery.setLayoutData(advancedeobjectflatcomboviewerOptionalProperyData);
 		advancedeobjectflatcomboviewerOptionalPropery.setID(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerOptionalPropery);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerOptionalPropery, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAdvancedeobjectflatcomboviewerOptionalProperyFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -1564,6 +1624,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		this.advancedtablecompositionRequiredProperty.setUpperBound(-1);
 		advancedtablecompositionRequiredProperty.setID(EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionRequiredProperty);
 		advancedtablecompositionRequiredProperty.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createAdvancedtablecompositionRequiredPropertyAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -1612,6 +1675,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		this.advancedtablecompositionOptionalProperty.setUpperBound(-1);
 		advancedtablecompositionOptionalProperty.setID(EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionOptionalProperty);
 		advancedtablecompositionOptionalProperty.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createAdvancedtablecompositionOptionalPropertyAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -1658,6 +1724,9 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi
 		EditingUtils.setID(name, EefnrViewsRepository.TotalSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrViewsRepository.TotalSample.Properties.name, EefnrViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractEnabledSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractEnabledSamplePropertiesEditionPartForm.java
index 1ac267b99..5cada5a17 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractEnabledSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractEnabledSamplePropertiesEditionPartForm.java
@@ -175,6 +175,9 @@ public class AbstractEnabledSamplePropertiesEditionPartForm extends SectionPrope
 		EditingUtils.setID(enabled, ReferencesViewsRepository.AbstractEnabledSample.EnabledProperties.enabled);
 		EditingUtils.setEEFtype(enabled, "eef::Checkbox"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ReferencesViewsRepository.AbstractEnabledSample.EnabledProperties.enabled, ReferencesViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEnabledCheckbox
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractSamplePropertiesEditionPartForm.java
index a99531f52..03d177189 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/AbstractSamplePropertiesEditionPartForm.java
@@ -205,6 +205,9 @@ public class AbstractSamplePropertiesEditionPartForm extends SectionPropertiesEd
 		EditingUtils.setID(name, ReferencesViewsRepository.AbstractSample.NameProperties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ReferencesViewsRepository.AbstractSample.NameProperties.name, ReferencesViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/ReferenceEnabledSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/ReferenceEnabledSamplePropertiesEditionPartForm.java
index cc6c25d24..92e2b2867 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/ReferenceEnabledSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/ReferenceEnabledSamplePropertiesEditionPartForm.java
@@ -199,6 +199,9 @@ public class ReferenceEnabledSamplePropertiesEditionPartForm extends SectionProp
 		this.reference.disableMove();
 		reference.setID(ReferencesViewsRepository.ReferenceEnabledSample.Properties.reference);
 		reference.setEEFType("eef::AdvancedReferencesTable"); //$NON-NLS-1$
+		// Start of user code for createReferenceReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractEnabledSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractEnabledSamplePropertiesEditionPartImpl.java
index a5ecb0fed..a8d456b74 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractEnabledSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractEnabledSamplePropertiesEditionPartImpl.java
@@ -164,6 +164,9 @@ public class AbstractEnabledSamplePropertiesEditionPartImpl extends CompositePro
 		EditingUtils.setID(enabled, ReferencesViewsRepository.AbstractEnabledSample.EnabledProperties.enabled);
 		EditingUtils.setEEFtype(enabled, "eef::Checkbox"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ReferencesViewsRepository.AbstractEnabledSample.EnabledProperties.enabled, ReferencesViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEnabledCheckbox
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractSamplePropertiesEditionPartImpl.java
index 2f87397fa..5bdfc7d4c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/AbstractSamplePropertiesEditionPartImpl.java
@@ -174,6 +174,9 @@ public class AbstractSamplePropertiesEditionPartImpl extends CompositeProperties
 		EditingUtils.setID(name, ReferencesViewsRepository.AbstractSample.NameProperties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ReferencesViewsRepository.AbstractSample.NameProperties.name, ReferencesViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/CheckBoxExtendedEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/CheckBoxExtendedEditorSamplePropertiesEditionPartForm.java
index 7e33bd9f3..7e656640a 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/CheckBoxExtendedEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/CheckBoxExtendedEditorSamplePropertiesEditionPartForm.java
@@ -177,6 +177,9 @@ public class CheckBoxExtendedEditorSamplePropertiesEditionPartForm extends Secti
 		EditingUtils.setID(checkboxEditorSample, EefnrextViewsRepository.CheckBoxExtendedEditorSample.Properties.checkboxEditorSample);
 		EditingUtils.setEEFtype(checkboxEditorSample, "eef::Checkbox"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrextViewsRepository.CheckBoxExtendedEditorSample.Properties.checkboxEditorSample, EefnrextViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCheckboxEditorSampleCheckbox
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/FlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/FlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java
index 75d9b07ec..8de1d56c6 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/FlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/FlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java
@@ -176,6 +176,9 @@ public class FlatReferenceExtendedEditorSamplePropertiesEditionPartForm extends
 		flatReferenceEditorSample.setLayoutData(flatReferenceEditorSampleData);
 		flatReferenceEditorSample.setID(EefnrextViewsRepository.FlatReferenceExtendedEditorSample.Properties.flatReferenceEditorSample);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrextViewsRepository.FlatReferenceExtendedEditorSample.Properties.flatReferenceEditorSample, EefnrextViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFlatReferenceEditorSampleFlatReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java
index 892272930..ab1cb0db6 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartForm.java
@@ -210,6 +210,9 @@ public class SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartForm ex
 		EditingUtils.setID(demo, EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.demo);
 		EditingUtils.setEEFtype(demo, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.demo, EefnrextViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDemoText
+
+		// End of user code
 		return parent;
 	}
 
@@ -275,6 +278,9 @@ public class SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartForm ex
 		EditingUtils.setID(size, EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.size);
 		EditingUtils.setEEFtype(size, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.size, EefnrextViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSizeText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartForm.java
index 7b66625a1..a62977176 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/forms/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartForm.java
@@ -205,6 +205,9 @@ public class TableCompositionTargetExtensionEditorSamplePropertiesEditionPartFor
 		EditingUtils.setID(name, EefnrextViewsRepository.TableCompositionTargetExtensionEditorSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EefnrextViewsRepository.TableCompositionTargetExtensionEditorSample.Properties.name, EefnrextViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/CheckBoxExtendedEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/CheckBoxExtendedEditorSamplePropertiesEditionPartImpl.java
index 594e8fd20..5bd321d88 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/CheckBoxExtendedEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/CheckBoxExtendedEditorSamplePropertiesEditionPartImpl.java
@@ -166,6 +166,9 @@ public class CheckBoxExtendedEditorSamplePropertiesEditionPartImpl extends Compo
 		EditingUtils.setID(checkboxEditorSample, EefnrextViewsRepository.CheckBoxExtendedEditorSample.Properties.checkboxEditorSample);
 		EditingUtils.setEEFtype(checkboxEditorSample, "eef::Checkbox"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrextViewsRepository.CheckBoxExtendedEditorSample.Properties.checkboxEditorSample, EefnrextViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCheckboxEditorSampleCheckbox
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/FlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/FlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java
index 1368c0d33..1cac143bb 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/FlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/FlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java
@@ -166,6 +166,9 @@ public class FlatReferenceExtendedEditorSamplePropertiesEditionPartImpl extends
 		flatReferenceEditorSample.setLayoutData(flatReferenceEditorSampleData);
 		flatReferenceEditorSample.setID(EefnrextViewsRepository.FlatReferenceExtendedEditorSample.Properties.flatReferenceEditorSample);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrextViewsRepository.FlatReferenceExtendedEditorSample.Properties.flatReferenceEditorSample, EefnrextViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFlatReferenceEditorSampleFlatReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java
index 451c5a2e9..121ea435e 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartImpl.java
@@ -179,6 +179,9 @@ public class SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartImpl ex
 		EditingUtils.setID(demo, EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.demo);
 		EditingUtils.setEEFtype(demo, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.demo, EefnrextViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDemoText
+
+		// End of user code
 		return parent;
 	}
 
@@ -225,6 +228,9 @@ public class SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartImpl ex
 		EditingUtils.setID(size, EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.size);
 		EditingUtils.setEEFtype(size, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.size, EefnrextViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createSizeText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartImpl.java
index 4336085d4..865e296a9 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/parts/impl/TableCompositionTargetExtensionEditorSamplePropertiesEditionPartImpl.java
@@ -174,6 +174,9 @@ public class TableCompositionTargetExtensionEditorSamplePropertiesEditionPartImp
 		EditingUtils.setID(name, EefnrextViewsRepository.TableCompositionTargetExtensionEditorSample.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EefnrextViewsRepository.TableCompositionTargetExtensionEditorSample.Properties.name, EefnrextViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/ConferencePropertiesEditionPartForm.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/ConferencePropertiesEditionPartForm.java
index 1d4aea0d0..68860db6a 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/ConferencePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/ConferencePropertiesEditionPartForm.java
@@ -211,6 +211,9 @@ public class ConferencePropertiesEditionPartForm extends SectionPropertiesEditin
 		EditingUtils.setID(name, ConferenceViewsRepository.Conference_.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Conference_.Properties.name, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -267,6 +270,9 @@ public class ConferencePropertiesEditionPartForm extends SectionPropertiesEditin
 		EditingUtils.setID(overview, ConferenceViewsRepository.Conference_.Properties.overview);
 		EditingUtils.setEEFtype(overview, "eef::Textarea"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Conference_.Properties.overview, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createOverviewTextArea
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/LocalisationPropertiesEditionPartForm.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/LocalisationPropertiesEditionPartForm.java
index 81720484d..33fcf8858 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/LocalisationPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/LocalisationPropertiesEditionPartForm.java
@@ -203,6 +203,9 @@ public class LocalisationPropertiesEditionPartForm extends SectionPropertiesEdit
 		EditingUtils.setID(place, ConferenceViewsRepository.Localisation.place);
 		EditingUtils.setEEFtype(place, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Localisation.place, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createPlaceText
+
+		// End of user code
 		return parent;
 	}
 
@@ -251,6 +254,9 @@ public class LocalisationPropertiesEditionPartForm extends SectionPropertiesEdit
 		this.sites.setUpperBound(-1);
 		sites.setID(ConferenceViewsRepository.Localisation.sites);
 		sites.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createSitesTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/ParticipantsPropertiesEditionPartForm.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/ParticipantsPropertiesEditionPartForm.java
index f40de403c..d1331f75b 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/ParticipantsPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/ParticipantsPropertiesEditionPartForm.java
@@ -171,6 +171,9 @@ public class ParticipantsPropertiesEditionPartForm extends SectionPropertiesEdit
 		this.participants.setUpperBound(-1);
 		participants.setID(ConferenceViewsRepository.Participants.participants_);
 		participants.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createParticipantsTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/PersonPropertiesEditionPartForm.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/PersonPropertiesEditionPartForm.java
index b1f718abe..ad2ed4f04 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/PersonPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/PersonPropertiesEditionPartForm.java
@@ -252,6 +252,9 @@ public class PersonPropertiesEditionPartForm extends SectionPropertiesEditingPar
 		EditingUtils.setID(firstname, ConferenceViewsRepository.Person.Identity.firstname);
 		EditingUtils.setEEFtype(firstname, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Person.Identity.firstname, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFirstnameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -317,6 +320,9 @@ public class PersonPropertiesEditionPartForm extends SectionPropertiesEditingPar
 		EditingUtils.setID(lastname, ConferenceViewsRepository.Person.Identity.lastname);
 		EditingUtils.setEEFtype(lastname, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Person.Identity.lastname, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createLastnameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -382,6 +388,9 @@ public class PersonPropertiesEditionPartForm extends SectionPropertiesEditingPar
 		EditingUtils.setID(age, ConferenceViewsRepository.Person.Identity.age);
 		EditingUtils.setEEFtype(age, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Person.Identity.age, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAgeText
+
+		// End of user code
 		return parent;
 	}
 
@@ -409,6 +418,9 @@ public class PersonPropertiesEditionPartForm extends SectionPropertiesEditingPar
 		});
 		gender.setID(ConferenceViewsRepository.Person.Identity.gender);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Person.Identity.gender, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createGenderEMFComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -452,6 +464,9 @@ public class PersonPropertiesEditionPartForm extends SectionPropertiesEditingPar
 		EditingUtils.setID(eclipseCommiter, ConferenceViewsRepository.Person.EclipseStatus.eclipseCommiter);
 		EditingUtils.setEEFtype(eclipseCommiter, "eef::Checkbox"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Person.EclipseStatus.eclipseCommiter, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEclipseCommiterCheckbox
+
+		// End of user code
 		return parent;
 	}
 
@@ -478,6 +493,9 @@ public class PersonPropertiesEditionPartForm extends SectionPropertiesEditingPar
 		EditingUtils.setID(isRegistered, ConferenceViewsRepository.Person.EclipseStatus.isRegistered);
 		EditingUtils.setEEFtype(isRegistered, "eef::Checkbox"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Person.EclipseStatus.isRegistered, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createIsRegisteredCheckbox
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/PresencePropertiesEditionPartForm.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/PresencePropertiesEditionPartForm.java
index 5125f0197..4d4a0ce29 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/PresencePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/PresencePropertiesEditionPartForm.java
@@ -188,6 +188,9 @@ public class PresencePropertiesEditionPartForm extends SectionPropertiesEditingP
 		this.assists.disableMove();
 		assists.setID(ConferenceViewsRepository.Presence.Talks.assists);
 		assists.setEEFType("eef::AdvancedReferencesTable"); //$NON-NLS-1$
+		// Start of user code for createAssistsReferencesTable
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/RoomPropertiesEditionPartForm.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/RoomPropertiesEditionPartForm.java
index e2452ae78..2806e2dbd 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/RoomPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/RoomPropertiesEditionPartForm.java
@@ -210,6 +210,9 @@ public class RoomPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(name, ConferenceViewsRepository.Room.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Room.Properties.name, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -275,6 +278,9 @@ public class RoomPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(capacity, ConferenceViewsRepository.Room.Properties.capacity);
 		EditingUtils.setEEFtype(capacity, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Room.Properties.capacity, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCapacityText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/SitePropertiesEditionPartForm.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/SitePropertiesEditionPartForm.java
index a59fa5f85..e87444a56 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/SitePropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/SitePropertiesEditionPartForm.java
@@ -233,6 +233,9 @@ public class SitePropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(name, ConferenceViewsRepository.Site.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Site.Properties.name, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -289,6 +292,9 @@ public class SitePropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(documentation, ConferenceViewsRepository.Site.Properties.documentation);
 		EditingUtils.setEEFtype(documentation, "eef::Textarea"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Site.Properties.documentation, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDocumentationTextArea
+
+		// End of user code
 		return parent;
 	}
 
@@ -337,6 +343,9 @@ public class SitePropertiesEditionPartForm extends SectionPropertiesEditingPart
 		this.rooms.setUpperBound(-1);
 		rooms.setID(ConferenceViewsRepository.Site.Properties.rooms);
 		rooms.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createRoomsTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TalkPropertiesEditionPartForm.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TalkPropertiesEditionPartForm.java
index fb1336e41..9f438719d 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TalkPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TalkPropertiesEditionPartForm.java
@@ -252,6 +252,9 @@ public class TalkPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(title_, ConferenceViewsRepository.Talk.Properties.title_);
 		EditingUtils.setEEFtype(title_, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Talk.Properties.title_, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTitle_Text
+
+		// End of user code
 		return parent;
 	}
 
@@ -282,6 +285,9 @@ public class TalkPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		topic.setID(ConferenceViewsRepository.Talk.Properties.topic);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Talk.Properties.topic, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTopicFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -309,6 +315,9 @@ public class TalkPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		type.setID(ConferenceViewsRepository.Talk.Properties.type);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Talk.Properties.type, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTypeEMFComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -339,6 +348,9 @@ public class TalkPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		presenter.setID(ConferenceViewsRepository.Talk.Properties.presenter);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Talk.Properties.presenter, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createPresenterFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -369,6 +381,9 @@ public class TalkPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		creator.setID(ConferenceViewsRepository.Talk.Properties.creator);
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Talk.Properties.creator, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCreatorFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -425,6 +440,9 @@ public class TalkPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(documentation, ConferenceViewsRepository.Talk.Properties.documentation);
 		EditingUtils.setEEFtype(documentation, "eef::Textarea"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Talk.Properties.documentation, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDocumentationTextArea
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TalksAndTopicsPropertiesEditionPartForm.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TalksAndTopicsPropertiesEditionPartForm.java
index 448429d2c..7838aebcf 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TalksAndTopicsPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TalksAndTopicsPropertiesEditionPartForm.java
@@ -178,6 +178,9 @@ public class TalksAndTopicsPropertiesEditionPartForm extends SectionPropertiesEd
 		this.talks.setUpperBound(-1);
 		talks.setID(ConferenceViewsRepository.TalksAndTopics.talks);
 		talks.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createTalksTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -226,6 +229,9 @@ public class TalksAndTopicsPropertiesEditionPartForm extends SectionPropertiesEd
 		this.topics.setUpperBound(-1);
 		topics.setID(ConferenceViewsRepository.TalksAndTopics.topics);
 		topics.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createTopicsTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TopicPropertiesEditionPartForm.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TopicPropertiesEditionPartForm.java
index 3e4aa3f52..c384292be 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TopicPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TopicPropertiesEditionPartForm.java
@@ -231,6 +231,9 @@ public class TopicPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(description, ConferenceViewsRepository.Topic.Properties.description);
 		EditingUtils.setEEFtype(description, "eef::Text"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Topic.Properties.description, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDescriptionText
+
+		// End of user code
 		return parent;
 	}
 
@@ -274,6 +277,9 @@ public class TopicPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		});
 		EditingUtils.setID(editReferences, ConferenceViewsRepository.Topic.Properties.references);
 		EditingUtils.setEEFtype(editReferences, "eef::MultiValuedEditor::browsebutton"); //$NON-NLS-1$
+		// Start of user code for createReferencesMultiValuedEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -330,6 +336,9 @@ public class TopicPropertiesEditionPartForm extends SectionPropertiesEditingPart
 		EditingUtils.setID(documentation, ConferenceViewsRepository.Topic.Properties.documentation);
 		EditingUtils.setEEFtype(documentation, "eef::Textarea"); //$NON-NLS-1$
 		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Topic.Properties.documentation, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDocumentationTextArea
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/ConferencePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/ConferencePropertiesEditionPartImpl.java
index 7e59b99da..bf712039d 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/ConferencePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/ConferencePropertiesEditionPartImpl.java
@@ -180,6 +180,9 @@ public class ConferencePropertiesEditionPartImpl extends CompositePropertiesEdit
 		EditingUtils.setID(name, ConferenceViewsRepository.Conference_.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Conference_.Properties.name, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -212,6 +215,9 @@ public class ConferencePropertiesEditionPartImpl extends CompositePropertiesEdit
 		EditingUtils.setID(overview, ConferenceViewsRepository.Conference_.Properties.overview);
 		EditingUtils.setEEFtype(overview, "eef::Textarea"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Conference_.Properties.overview, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createOverviewTextArea
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/LocalisationPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/LocalisationPropertiesEditionPartImpl.java
index f2a026f1a..1455fc308 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/LocalisationPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/LocalisationPropertiesEditionPartImpl.java
@@ -175,6 +175,9 @@ public class LocalisationPropertiesEditionPartImpl extends CompositePropertiesEd
 		EditingUtils.setID(place, ConferenceViewsRepository.Localisation.place);
 		EditingUtils.setEEFtype(place, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Localisation.place, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createPlaceText
+
+		// End of user code
 		return parent;
 	}
 
@@ -223,6 +226,9 @@ public class LocalisationPropertiesEditionPartImpl extends CompositePropertiesEd
 		this.sites.setUpperBound(-1);
 		sites.setID(ConferenceViewsRepository.Localisation.sites);
 		sites.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createSitesAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/ParticipantsPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/ParticipantsPropertiesEditionPartImpl.java
index 98f095a4f..50126d278 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/ParticipantsPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/ParticipantsPropertiesEditionPartImpl.java
@@ -163,6 +163,9 @@ public class ParticipantsPropertiesEditionPartImpl extends CompositePropertiesEd
 		this.participants.setUpperBound(-1);
 		participants.setID(ConferenceViewsRepository.Participants.participants_);
 		participants.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createParticipantsAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/PersonPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/PersonPropertiesEditionPartImpl.java
index c70f5209d..ebce30777 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/PersonPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/PersonPropertiesEditionPartImpl.java
@@ -219,6 +219,9 @@ public class PersonPropertiesEditionPartImpl extends CompositePropertiesEditionP
 		EditingUtils.setID(firstname, ConferenceViewsRepository.Person.Identity.firstname);
 		EditingUtils.setEEFtype(firstname, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Person.Identity.firstname, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createFirstnameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -265,6 +268,9 @@ public class PersonPropertiesEditionPartImpl extends CompositePropertiesEditionP
 		EditingUtils.setID(lastname, ConferenceViewsRepository.Person.Identity.lastname);
 		EditingUtils.setEEFtype(lastname, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Person.Identity.lastname, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createLastnameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -311,6 +317,9 @@ public class PersonPropertiesEditionPartImpl extends CompositePropertiesEditionP
 		EditingUtils.setID(age, ConferenceViewsRepository.Person.Identity.age);
 		EditingUtils.setEEFtype(age, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Person.Identity.age, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createAgeText
+
+		// End of user code
 		return parent;
 	}
 
@@ -338,6 +347,9 @@ public class PersonPropertiesEditionPartImpl extends CompositePropertiesEditionP
 		});
 		gender.setID(ConferenceViewsRepository.Person.Identity.gender);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Person.Identity.gender, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createGenderEMFComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -380,6 +392,9 @@ public class PersonPropertiesEditionPartImpl extends CompositePropertiesEditionP
 		EditingUtils.setID(eclipseCommiter, ConferenceViewsRepository.Person.EclipseStatus.eclipseCommiter);
 		EditingUtils.setEEFtype(eclipseCommiter, "eef::Checkbox"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Person.EclipseStatus.eclipseCommiter, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createEclipseCommiterCheckbox
+
+		// End of user code
 		return parent;
 	}
 
@@ -407,6 +422,9 @@ public class PersonPropertiesEditionPartImpl extends CompositePropertiesEditionP
 		EditingUtils.setID(isRegistered, ConferenceViewsRepository.Person.EclipseStatus.isRegistered);
 		EditingUtils.setEEFtype(isRegistered, "eef::Checkbox"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Person.EclipseStatus.isRegistered, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createIsRegisteredCheckbox
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/RoomPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/RoomPropertiesEditionPartImpl.java
index 058100e65..3bf2e50ed 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/RoomPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/RoomPropertiesEditionPartImpl.java
@@ -179,6 +179,9 @@ public class RoomPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		EditingUtils.setID(name, ConferenceViewsRepository.Room.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Room.Properties.name, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -225,6 +228,9 @@ public class RoomPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		EditingUtils.setID(capacity, ConferenceViewsRepository.Room.Properties.capacity);
 		EditingUtils.setEEFtype(capacity, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Room.Properties.capacity, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCapacityText
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/SitePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/SitePropertiesEditionPartImpl.java
index 432530948..f00d12a63 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/SitePropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/SitePropertiesEditionPartImpl.java
@@ -203,6 +203,9 @@ public class SitePropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		EditingUtils.setID(name, ConferenceViewsRepository.Site.Properties.name);
 		EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Site.Properties.name, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createNameText
+
+		// End of user code
 		return parent;
 	}
 
@@ -235,6 +238,9 @@ public class SitePropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		EditingUtils.setID(documentation, ConferenceViewsRepository.Site.Properties.documentation);
 		EditingUtils.setEEFtype(documentation, "eef::Textarea"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Site.Properties.documentation, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDocumentationTextArea
+
+		// End of user code
 		return parent;
 	}
 
@@ -283,6 +289,9 @@ public class SitePropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		this.rooms.setUpperBound(-1);
 		rooms.setID(ConferenceViewsRepository.Site.Properties.rooms);
 		rooms.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createRoomsAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TalkPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TalkPropertiesEditionPartImpl.java
index 25f054eb9..9d60b2ca4 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TalkPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TalkPropertiesEditionPartImpl.java
@@ -219,6 +219,9 @@ public class TalkPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		EditingUtils.setID(title_, ConferenceViewsRepository.Talk.Properties.title_);
 		EditingUtils.setEEFtype(title_, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Talk.Properties.title_, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTitle_Text
+
+		// End of user code
 		return parent;
 	}
 
@@ -242,6 +245,9 @@ public class TalkPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		topic.setLayoutData(topicData);
 		topic.setID(ConferenceViewsRepository.Talk.Properties.topic);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Talk.Properties.topic, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTopicFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -269,6 +275,9 @@ public class TalkPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		});
 		type.setID(ConferenceViewsRepository.Talk.Properties.type);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Talk.Properties.type, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createTypeEMFComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -292,6 +301,9 @@ public class TalkPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		presenter.setLayoutData(presenterData);
 		presenter.setID(ConferenceViewsRepository.Talk.Properties.presenter);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Talk.Properties.presenter, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createPresenterFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -315,6 +327,9 @@ public class TalkPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		creator.setLayoutData(creatorData);
 		creator.setID(ConferenceViewsRepository.Talk.Properties.creator);
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Talk.Properties.creator, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createCreatorFlatComboViewer
+
+		// End of user code
 		return parent;
 	}
 
@@ -347,6 +362,9 @@ public class TalkPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		EditingUtils.setID(documentation, ConferenceViewsRepository.Talk.Properties.documentation);
 		EditingUtils.setEEFtype(documentation, "eef::Textarea"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Talk.Properties.documentation, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDocumentationTextArea
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TalksAndTopicsPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TalksAndTopicsPropertiesEditionPartImpl.java
index c5dc1c5c9..319406afc 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TalksAndTopicsPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TalksAndTopicsPropertiesEditionPartImpl.java
@@ -170,6 +170,9 @@ public class TalksAndTopicsPropertiesEditionPartImpl extends CompositeProperties
 		this.talks.setUpperBound(-1);
 		talks.setID(ConferenceViewsRepository.TalksAndTopics.talks);
 		talks.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createTalksAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
@@ -218,6 +221,9 @@ public class TalksAndTopicsPropertiesEditionPartImpl extends CompositeProperties
 		this.topics.setUpperBound(-1);
 		topics.setID(ConferenceViewsRepository.TalksAndTopics.topics);
 		topics.setEEFType("eef::AdvancedTableComposition"); //$NON-NLS-1$
+		// Start of user code for createTopicsAdvancedTableComposition
+
+		// End of user code
 		return parent;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TopicPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TopicPropertiesEditionPartImpl.java
index cf55e6216..28baa9dee 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TopicPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TopicPropertiesEditionPartImpl.java
@@ -200,6 +200,9 @@ public class TopicPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		EditingUtils.setID(description, ConferenceViewsRepository.Topic.Properties.description);
 		EditingUtils.setEEFtype(description, "eef::Text"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Topic.Properties.description, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDescriptionText
+
+		// End of user code
 		return parent;
 	}
 
@@ -240,6 +243,9 @@ public class TopicPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		});
 		EditingUtils.setID(editReferences, ConferenceViewsRepository.Topic.Properties.references);
 		EditingUtils.setEEFtype(editReferences, "eef::MultiValuedEditor::browsebutton"); //$NON-NLS-1$
+		// Start of user code for createReferencesMultiValuedEditor
+
+		// End of user code
 		return parent;
 	}
 
@@ -272,6 +278,9 @@ public class TopicPropertiesEditionPartImpl extends CompositePropertiesEditionPa
 		EditingUtils.setID(documentation, ConferenceViewsRepository.Topic.Properties.documentation);
 		EditingUtils.setEEFtype(documentation, "eef::Textarea"); //$NON-NLS-1$
 		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Topic.Properties.documentation, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$
+		// Start of user code for createDocumentationTextArea
+
+		// End of user code
 		return parent;
 	}