Patch from Axel Richard axel.richard@obeo.fr

Improvements of ModelingBot
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=391098

68 files changed, 778 insertions, 193 deletions

diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/ComboSample.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/ComboSample.java
new file mode 100644
index 000000000..4d7ad2cc8
--- /dev/null
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/ComboSample.java
@@ -0,0 +1,80 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.emf.eef.eefnr;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Combo Sample</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.emf.eef.eefnr.ComboSample#getComboRequiredReferenceProperty <em>Combo Required Reference Property</em>}</li>

+ *   <li>{@link org.eclipse.emf.eef.eefnr.ComboSample#getComboOptionalReferenceProperty <em>Combo Optional Reference Property</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.emf.eef.eefnr.EefnrPackage#getComboSample()

+ * @model

+ * @generated

+ */

+public interface ComboSample extends AbstractSample {

+	/**

+	 * Returns the value of the '<em><b>Combo Required Reference Property</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Combo Required Reference Property</em>' reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Combo Required Reference Property</em>' reference.

+	 * @see #setComboRequiredReferenceProperty(TotalSample)

+	 * @see org.eclipse.emf.eef.eefnr.EefnrPackage#getComboSample_ComboRequiredReferenceProperty()

+	 * @model required="true"

+	 * @generated

+	 */

+	TotalSample getComboRequiredReferenceProperty();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.emf.eef.eefnr.ComboSample#getComboRequiredReferenceProperty <em>Combo Required Reference Property</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Combo Required Reference Property</em>' reference.

+	 * @see #getComboRequiredReferenceProperty()

+	 * @generated

+	 */

+	void setComboRequiredReferenceProperty(TotalSample value);

+

+	/**

+	 * Returns the value of the '<em><b>Combo Optional Reference Property</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Combo Optional Reference Property</em>' reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Combo Optional Reference Property</em>' reference.

+	 * @see #setComboOptionalReferenceProperty(TotalSample)

+	 * @see org.eclipse.emf.eef.eefnr.EefnrPackage#getComboSample_ComboOptionalReferenceProperty()

+	 * @model

+	 * @generated

+	 */

+	TotalSample getComboOptionalReferenceProperty();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.emf.eef.eefnr.ComboSample#getComboOptionalReferenceProperty <em>Combo Optional Reference Property</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Combo Optional Reference Property</em>' reference.

+	 * @see #getComboOptionalReferenceProperty()

+	 * @generated

+	 */

+	void setComboOptionalReferenceProperty(TotalSample value);

+

+} // ComboSample

diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/EefnrFactory.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/EefnrFactory.java
index 4a4afd19b..d14c21eed 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/EefnrFactory.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/EefnrFactory.java
@@ -107,6 +107,15 @@ public interface EefnrFactory extends EFactory {
 	EMFComboViewerSample createEMFComboViewerSample();
 
 	/**
+	 * Returns a new object of class '<em>Combo Sample</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Combo Sample</em>'.
+	 * @generated
+	 */
+	ComboSample createComboSample();
+
+	/**
 	 * Returns a new object of class '<em>Multi Valued Editor Sample</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/EefnrPackage.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/EefnrPackage.java
index 60a6c5e4e..729c538b5 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/EefnrPackage.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/EefnrPackage.java
@@ -370,13 +370,31 @@ public interface EefnrPackage extends EPackage {
 	int TOTAL_SAMPLE__TABLECOMPOSITION_OPTIONAL_PROPERTY = ABSTRACT_SAMPLE_FEATURE_COUNT + 25;
 
 	/**
+	 * The feature id for the '<em><b>Combo Required Reference Property TS</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TOTAL_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY_TS = ABSTRACT_SAMPLE_FEATURE_COUNT + 26;
+
+	/**
+	 * The feature id for the '<em><b>Combo Optional Reference Property TS</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TOTAL_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY_TS = ABSTRACT_SAMPLE_FEATURE_COUNT + 27;
+
+	/**
 	 * The number of structural features of the '<em>Total Sample</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TOTAL_SAMPLE_FEATURE_COUNT = ABSTRACT_SAMPLE_FEATURE_COUNT + 26;
+	int TOTAL_SAMPLE_FEATURE_COUNT = ABSTRACT_SAMPLE_FEATURE_COUNT + 28;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.eef.eefnr.impl.TextSampleImpl <em>Text Sample</em>}' class.
@@ -701,6 +719,52 @@ public interface EefnrPackage extends EPackage {
 	int EMF_COMBO_VIEWER_SAMPLE_FEATURE_COUNT = ABSTRACT_SAMPLE_FEATURE_COUNT + 2;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.emf.eef.eefnr.impl.ComboSampleImpl <em>Combo Sample</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.eef.eefnr.impl.ComboSampleImpl
+	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getComboSample()
+	 * @generated
+	 */
+	int COMBO_SAMPLE = 10;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMBO_SAMPLE__NAME = ABSTRACT_SAMPLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Combo Required Reference Property</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMBO_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY = ABSTRACT_SAMPLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Combo Optional Reference Property</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMBO_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY = ABSTRACT_SAMPLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Combo Sample</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMBO_SAMPLE_FEATURE_COUNT = ABSTRACT_SAMPLE_FEATURE_COUNT + 2;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.emf.eef.eefnr.impl.MultiValuedEditorSampleImpl <em>Multi Valued Editor Sample</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -708,7 +772,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getMultiValuedEditorSample()
 	 * @generated
 	 */
-	int MULTI_VALUED_EDITOR_SAMPLE = 10;
+	int MULTI_VALUED_EDITOR_SAMPLE = 11;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -754,7 +818,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getTableCompositionEditorSample()
 	 * @generated
 	 */
-	int TABLE_COMPOSITION_EDITOR_SAMPLE = 11;
+	int TABLE_COMPOSITION_EDITOR_SAMPLE = 12;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -800,7 +864,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getAdvancedReferencesTableSample()
 	 * @generated
 	 */
-	int ADVANCED_REFERENCES_TABLE_SAMPLE = 12;
+	int ADVANCED_REFERENCES_TABLE_SAMPLE = 13;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -846,7 +910,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getAdvancedEObjectFlatComboViewerSample()
 	 * @generated
 	 */
-	int ADVANCED_EOBJECT_FLAT_COMBO_VIEWER_SAMPLE = 13;
+	int ADVANCED_EOBJECT_FLAT_COMBO_VIEWER_SAMPLE = 14;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -892,7 +956,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getAdvancedTableCompositionEditorSample()
 	 * @generated
 	 */
-	int ADVANCED_TABLE_COMPOSITION_EDITOR_SAMPLE = 14;
+	int ADVANCED_TABLE_COMPOSITION_EDITOR_SAMPLE = 15;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -938,7 +1002,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getFlatReferencesTableSample()
 	 * @generated
 	 */
-	int FLAT_REFERENCES_TABLE_SAMPLE = 15;
+	int FLAT_REFERENCES_TABLE_SAMPLE = 16;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -984,7 +1048,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getSample()
 	 * @generated
 	 */
-	int SAMPLE = 16;
+	int SAMPLE = 17;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1030,7 +1094,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getTextSampleWithTwoTabs()
 	 * @generated
 	 */
-	int TEXT_SAMPLE_WITH_TWO_TABS = 17;
+	int TEXT_SAMPLE_WITH_TWO_TABS = 18;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1094,7 +1158,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getTableCompositionExtensionEditorSample()
 	 * @generated
 	 */
-	int TABLE_COMPOSITION_EXTENSION_EDITOR_SAMPLE = 18;
+	int TABLE_COMPOSITION_EXTENSION_EDITOR_SAMPLE = 19;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1140,7 +1204,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getAbstractTableCompositionTargetExtensionEditorSample()
 	 * @generated
 	 */
-	int ABSTRACT_TABLE_COMPOSITION_TARGET_EXTENSION_EDITOR_SAMPLE = 19;
+	int ABSTRACT_TABLE_COMPOSITION_TARGET_EXTENSION_EDITOR_SAMPLE = 20;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1168,7 +1232,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getNamedElement()
 	 * @generated
 	 */
-	int NAMED_ELEMENT = 20;
+	int NAMED_ELEMENT = 21;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1196,7 +1260,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getImageViewerSample()
 	 * @generated
 	 */
-	int IMAGE_VIEWER_SAMPLE = 21;
+	int IMAGE_VIEWER_SAMPLE = 22;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1242,7 +1306,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getSelectionDialogSample()
 	 * @generated
 	 */
-	int SELECTION_DIALOG_SAMPLE = 22;
+	int SELECTION_DIALOG_SAMPLE = 23;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1288,7 +1352,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getSingleCompositionViewerSample()
 	 * @generated
 	 */
-	int SINGLE_COMPOSITION_VIEWER_SAMPLE = 23;
+	int SINGLE_COMPOSITION_VIEWER_SAMPLE = 24;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1352,7 +1416,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getENUM_SAMPLE()
 	 * @generated
 	 */
-	int ENUM_SAMPLE = 24;
+	int ENUM_SAMPLE = 25;
 
 
 	/**
@@ -1617,6 +1681,28 @@ public interface EefnrPackage extends EPackage {
 	EReference getTotalSample_TablecompositionOptionalProperty();
 
 	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.eef.eefnr.TotalSample#getComboRequiredReferencePropertyTS <em>Combo Required Reference Property TS</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Combo Required Reference Property TS</em>'.
+	 * @see org.eclipse.emf.eef.eefnr.TotalSample#getComboRequiredReferencePropertyTS()
+	 * @see #getTotalSample()
+	 * @generated
+	 */
+	EReference getTotalSample_ComboRequiredReferencePropertyTS();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.eef.eefnr.TotalSample#getComboOptionalReferencePropertyTS <em>Combo Optional Reference Property TS</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Combo Optional Reference Property TS</em>'.
+	 * @see org.eclipse.emf.eef.eefnr.TotalSample#getComboOptionalReferencePropertyTS()
+	 * @see #getTotalSample()
+	 * @generated
+	 */
+	EReference getTotalSample_ComboOptionalReferencePropertyTS();
+
+	/**
 	 * Returns the meta object for the reference list '{@link org.eclipse.emf.eef.eefnr.TotalSample#getAdvancedreferencestableRequiredProperty <em>Advancedreferencestable Required Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1918,6 +2004,38 @@ public interface EefnrPackage extends EPackage {
 	EAttribute getEMFComboViewerSample_EmfcomboviewerOptionalProperty();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.eef.eefnr.ComboSample <em>Combo Sample</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Combo Sample</em>'.
+	 * @see org.eclipse.emf.eef.eefnr.ComboSample
+	 * @generated
+	 */
+	EClass getComboSample();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.eef.eefnr.ComboSample#getComboRequiredReferenceProperty <em>Combo Required Reference Property</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Combo Required Reference Property</em>'.
+	 * @see org.eclipse.emf.eef.eefnr.ComboSample#getComboRequiredReferenceProperty()
+	 * @see #getComboSample()
+	 * @generated
+	 */
+	EReference getComboSample_ComboRequiredReferenceProperty();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.eef.eefnr.ComboSample#getComboOptionalReferenceProperty <em>Combo Optional Reference Property</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Combo Optional Reference Property</em>'.
+	 * @see org.eclipse.emf.eef.eefnr.ComboSample#getComboOptionalReferenceProperty()
+	 * @see #getComboSample()
+	 * @generated
+	 */
+	EReference getComboSample_ComboOptionalReferenceProperty();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.eef.eefnr.MultiValuedEditorSample <em>Multi Valued Editor Sample</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2596,6 +2714,22 @@ public interface EefnrPackage extends EPackage {
 		EReference TOTAL_SAMPLE__TABLECOMPOSITION_OPTIONAL_PROPERTY = eINSTANCE.getTotalSample_TablecompositionOptionalProperty();
 
 		/**
+		 * The meta object literal for the '<em><b>Combo Required Reference Property TS</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TOTAL_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY_TS = eINSTANCE.getTotalSample_ComboRequiredReferencePropertyTS();
+
+		/**
+		 * The meta object literal for the '<em><b>Combo Optional Reference Property TS</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TOTAL_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY_TS = eINSTANCE.getTotalSample_ComboOptionalReferencePropertyTS();
+
+		/**
 		 * The meta object literal for the '<em><b>Advancedreferencestable Required Property</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -2834,6 +2968,32 @@ public interface EefnrPackage extends EPackage {
 		EAttribute EMF_COMBO_VIEWER_SAMPLE__EMFCOMBOVIEWER_OPTIONAL_PROPERTY = eINSTANCE.getEMFComboViewerSample_EmfcomboviewerOptionalProperty();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.eef.eefnr.impl.ComboSampleImpl <em>Combo Sample</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.eef.eefnr.impl.ComboSampleImpl
+		 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getComboSample()
+		 * @generated
+		 */
+		EClass COMBO_SAMPLE = eINSTANCE.getComboSample();
+
+		/**
+		 * The meta object literal for the '<em><b>Combo Required Reference Property</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference COMBO_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY = eINSTANCE.getComboSample_ComboRequiredReferenceProperty();
+
+		/**
+		 * The meta object literal for the '<em><b>Combo Optional Reference Property</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference COMBO_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY = eINSTANCE.getComboSample_ComboOptionalReferenceProperty();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.eef.eefnr.impl.MultiValuedEditorSampleImpl <em>Multi Valued Editor Sample</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/Root.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/Root.java
index 248f0390f..a4a4402f4 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/Root.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/Root.java
@@ -7,7 +7,6 @@
 package org.eclipse.emf.eef.eefnr;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/TotalSample.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/TotalSample.java
index 484fe0961..f633b6de2 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/TotalSample.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/TotalSample.java
@@ -42,6 +42,8 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.emf.eef.eefnr.TotalSample#getAdvancedtablecompositionOptionalProperty <em>Advancedtablecomposition Optional Property</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.eefnr.TotalSample#getTablecompositionRequiredProperty <em>Tablecomposition Required Property</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.eefnr.TotalSample#getTablecompositionOptionalProperty <em>Tablecomposition Optional Property</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.eefnr.TotalSample#getComboRequiredReferencePropertyTS <em>Combo Required Reference Property TS</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.eefnr.TotalSample#getComboOptionalReferencePropertyTS <em>Combo Optional Reference Property TS</em>}</li>
  * </ul>
  * </p>
  *
@@ -487,6 +489,58 @@ public interface TotalSample extends AbstractSample {
 	EList<Sample> getTablecompositionOptionalProperty();
 
 	/**
+	 * Returns the value of the '<em><b>Combo Required Reference Property TS</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Combo Required Reference Property TS</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Combo Required Reference Property TS</em>' reference.
+	 * @see #setComboRequiredReferencePropertyTS(TotalSample)
+	 * @see org.eclipse.emf.eef.eefnr.EefnrPackage#getTotalSample_ComboRequiredReferencePropertyTS()
+	 * @model required="true"
+	 * @generated
+	 */
+	TotalSample getComboRequiredReferencePropertyTS();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.eef.eefnr.TotalSample#getComboRequiredReferencePropertyTS <em>Combo Required Reference Property TS</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Combo Required Reference Property TS</em>' reference.
+	 * @see #getComboRequiredReferencePropertyTS()
+	 * @generated
+	 */
+	void setComboRequiredReferencePropertyTS(TotalSample value);
+
+	/**
+	 * Returns the value of the '<em><b>Combo Optional Reference Property TS</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Combo Optional Reference Property TS</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Combo Optional Reference Property TS</em>' reference.
+	 * @see #setComboOptionalReferencePropertyTS(TotalSample)
+	 * @see org.eclipse.emf.eef.eefnr.EefnrPackage#getTotalSample_ComboOptionalReferencePropertyTS()
+	 * @model
+	 * @generated
+	 */
+	TotalSample getComboOptionalReferencePropertyTS();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.eef.eefnr.TotalSample#getComboOptionalReferencePropertyTS <em>Combo Optional Reference Property TS</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Combo Optional Reference Property TS</em>' reference.
+	 * @see #getComboOptionalReferencePropertyTS()
+	 * @generated
+	 */
+	void setComboOptionalReferencePropertyTS(TotalSample value);
+
+	/**
 	 * Returns the value of the '<em><b>Advancedreferencestable Required Property</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.emf.eef.eefnr.TotalSample}.
 	 * <!-- begin-user-doc -->
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/AbstractReferenceOwnerSample.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/AbstractReferenceOwnerSample.java
index 0f4b9bf96..2a358d0ab 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/AbstractReferenceOwnerSample.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/AbstractReferenceOwnerSample.java
@@ -7,7 +7,6 @@
 package org.eclipse.emf.eef.eefnr.filters;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.eef.eefnr.AbstractSample;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/FiltersPackage.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/FiltersPackage.java
index 30b2e66b1..ee8b205f3 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/FiltersPackage.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/FiltersPackage.java
@@ -9,7 +9,6 @@ package org.eclipse.emf.eef.eefnr.filters;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/AbstractReferenceOwnerSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/AbstractReferenceOwnerSampleImpl.java
index bb20500a5..f95d17f2f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/AbstractReferenceOwnerSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/AbstractReferenceOwnerSampleImpl.java
@@ -9,15 +9,11 @@ package org.eclipse.emf.eef.eefnr.filters.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
 import org.eclipse.emf.eef.eefnr.filters.AbstractReferenceOwnerSample;
 import org.eclipse.emf.eef.eefnr.filters.AbstractReferenceTargetSample;
 import org.eclipse.emf.eef.eefnr.filters.FiltersPackage;
-
 import org.eclipse.emf.eef.eefnr.impl.AbstractSampleImpl;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/AbstractReferenceTargetSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/AbstractReferenceTargetSampleImpl.java
index 75f49c46f..da2e58bf0 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/AbstractReferenceTargetSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/AbstractReferenceTargetSampleImpl.java
@@ -7,10 +7,8 @@
 package org.eclipse.emf.eef.eefnr.filters.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.eef.eefnr.filters.AbstractReferenceTargetSample;
 import org.eclipse.emf.eef.eefnr.filters.FiltersPackage;
-
 import org.eclipse.emf.eef.eefnr.impl.AbstractSampleImpl;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/ConcreteReferenceOwnerSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/ConcreteReferenceOwnerSampleImpl.java
index 65534c16d..9e38d56b3 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/ConcreteReferenceOwnerSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/ConcreteReferenceOwnerSampleImpl.java
@@ -7,11 +7,10 @@
 package org.eclipse.emf.eef.eefnr.filters.impl;
 
 import java.util.Collection;
+
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/ConcreteReferenceTargetSample1Impl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/ConcreteReferenceTargetSample1Impl.java
index 4e7e663d1..feed6f0ec 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/ConcreteReferenceTargetSample1Impl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/ConcreteReferenceTargetSample1Impl.java
@@ -7,7 +7,6 @@
 package org.eclipse.emf.eef.eefnr.filters.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.eef.eefnr.filters.ConcreteReferenceTargetSample1;
 import org.eclipse.emf.eef.eefnr.filters.FiltersPackage;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/ConcreteReferenceTargetSample2Impl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/ConcreteReferenceTargetSample2Impl.java
index 5b3900b05..8e0254b68 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/ConcreteReferenceTargetSample2Impl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/ConcreteReferenceTargetSample2Impl.java
@@ -7,7 +7,6 @@
 package org.eclipse.emf.eef.eefnr.filters.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.eef.eefnr.filters.ConcreteReferenceTargetSample2;
 import org.eclipse.emf.eef.eefnr.filters.FiltersPackage;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/FiltersPackageImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/FiltersPackageImpl.java
index e342b7e49..ee1618b87 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/FiltersPackageImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/filters/impl/FiltersPackageImpl.java
@@ -9,11 +9,8 @@ package org.eclipse.emf.eef.eefnr.filters.impl;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
-
 import org.eclipse.emf.eef.eefnr.filters.AbstractReferenceOwnerSample;
 import org.eclipse.emf.eef.eefnr.filters.AbstractReferenceTargetSample;
 import org.eclipse.emf.eef.eefnr.filters.ConcreteReferenceOwnerSample;
@@ -21,23 +18,16 @@ import org.eclipse.emf.eef.eefnr.filters.ConcreteReferenceTargetSample1;
 import org.eclipse.emf.eef.eefnr.filters.ConcreteReferenceTargetSample2;
 import org.eclipse.emf.eef.eefnr.filters.FiltersFactory;
 import org.eclipse.emf.eef.eefnr.filters.FiltersPackage;
-
 import org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.interface_.InterfacePackage;
 import org.eclipse.emf.eef.eefnr.interface_.impl.InterfacePackageImpl;
 import org.eclipse.emf.eef.eefnr.naming.CustomNamingPackage;
 import org.eclipse.emf.eef.eefnr.naming.impl.CustomNamingPackageImpl;
 import org.eclipse.emf.eef.eefnr.navigation.NavigationPackage;
-
 import org.eclipse.emf.eef.eefnr.navigation.impl.NavigationPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.references.ReferencesPackage;
-
 import org.eclipse.emf.eef.eefnr.references.impl.ReferencesPackageImpl;
-
 import org.eclipse.emf.eef.eefnrext.EefnrextPackage;
-
 import org.eclipse.emf.eef.eefnrext.impl.EefnrextPackageImpl;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AbstractSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AbstractSampleImpl.java
index 3b623c7bd..5bd41f71c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AbstractSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AbstractSampleImpl.java
@@ -8,10 +8,8 @@ package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.eef.eefnr.AbstractSample;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AbstractTableCompositionTargetExtensionEditorSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AbstractTableCompositionTargetExtensionEditorSampleImpl.java
index 0eba8cb22..4e12fb5d6 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AbstractTableCompositionTargetExtensionEditorSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AbstractTableCompositionTargetExtensionEditorSampleImpl.java
@@ -7,7 +7,6 @@
 package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.eef.eefnr.AbstractTableCompositionTargetExtensionEditorSample;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AdvancedEObjectFlatComboViewerSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AdvancedEObjectFlatComboViewerSampleImpl.java
index 9a21eb595..55d22fd6a 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AdvancedEObjectFlatComboViewerSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AdvancedEObjectFlatComboViewerSampleImpl.java
@@ -7,12 +7,9 @@
 package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.eef.eefnr.AdvancedEObjectFlatComboViewerSample;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.TotalSample;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AdvancedReferencesTableSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AdvancedReferencesTableSampleImpl.java
index b9d257ba9..866c82529 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AdvancedReferencesTableSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AdvancedReferencesTableSampleImpl.java
@@ -9,11 +9,8 @@ package org.eclipse.emf.eef.eefnr.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
 import org.eclipse.emf.eef.eefnr.AdvancedReferencesTableSample;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.TotalSample;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AdvancedTableCompositionEditorSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AdvancedTableCompositionEditorSampleImpl.java
index a9e100bc1..461f90d4d 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AdvancedTableCompositionEditorSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/AdvancedTableCompositionEditorSampleImpl.java
@@ -9,15 +9,11 @@ package org.eclipse.emf.eef.eefnr.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.eef.eefnr.AdvancedTableCompositionEditorSample;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.Sample;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/CheckboxSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/CheckboxSampleImpl.java
index 926cb4df7..7d051cfd9 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/CheckboxSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/CheckboxSampleImpl.java
@@ -7,11 +7,8 @@
 package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.eef.eefnr.CheckboxSample;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/ComboSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/ComboSampleImpl.java
new file mode 100644
index 000000000..afa290761
--- /dev/null
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/ComboSampleImpl.java
@@ -0,0 +1,218 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.emf.eef.eefnr.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.eef.eefnr.ComboSample;

+import org.eclipse.emf.eef.eefnr.ENUM_SAMPLE;

+import org.eclipse.emf.eef.eefnr.EefnrPackage;

+import org.eclipse.emf.eef.eefnr.TotalSample;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Combo Sample</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.emf.eef.eefnr.impl.ComboSampleImpl#getComboRequiredReferenceProperty <em>Combo Required Reference Property</em>}</li>

+ *   <li>{@link org.eclipse.emf.eef.eefnr.impl.ComboSampleImpl#getComboOptionalReferenceProperty <em>Combo Optional Reference Property</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class ComboSampleImpl extends AbstractSampleImpl implements ComboSample {

+	/**

+	 * The cached value of the '{@link #getComboRequiredReferenceProperty() <em>Combo Required Reference Property</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getComboRequiredReferenceProperty()

+	 * @generated

+	 * @ordered

+	 */

+	protected TotalSample comboRequiredReferenceProperty;

+

+	/**

+	 * The cached value of the '{@link #getComboOptionalReferenceProperty() <em>Combo Optional Reference Property</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getComboOptionalReferenceProperty()

+	 * @generated

+	 * @ordered

+	 */

+	protected TotalSample comboOptionalReferenceProperty;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ComboSampleImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return EefnrPackage.Literals.COMBO_SAMPLE;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public TotalSample getComboRequiredReferenceProperty() {

+		if (comboRequiredReferenceProperty != null && comboRequiredReferenceProperty.eIsProxy()) {

+			InternalEObject oldComboRequiredReferenceProperty = (InternalEObject)comboRequiredReferenceProperty;

+			comboRequiredReferenceProperty = (TotalSample)eResolveProxy(oldComboRequiredReferenceProperty);

+			if (comboRequiredReferenceProperty != oldComboRequiredReferenceProperty) {

+				if (eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EefnrPackage.COMBO_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY, oldComboRequiredReferenceProperty, comboRequiredReferenceProperty));

+			}

+		}

+		return comboRequiredReferenceProperty;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public TotalSample basicGetComboRequiredReferenceProperty() {

+		return comboRequiredReferenceProperty;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setComboRequiredReferenceProperty(TotalSample newComboRequiredReferenceProperty) {

+		TotalSample oldComboRequiredReferenceProperty = comboRequiredReferenceProperty;

+		comboRequiredReferenceProperty = newComboRequiredReferenceProperty;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, EefnrPackage.COMBO_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY, oldComboRequiredReferenceProperty, comboRequiredReferenceProperty));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public TotalSample getComboOptionalReferenceProperty() {

+		if (comboOptionalReferenceProperty != null && comboOptionalReferenceProperty.eIsProxy()) {

+			InternalEObject oldComboOptionalReferenceProperty = (InternalEObject)comboOptionalReferenceProperty;

+			comboOptionalReferenceProperty = (TotalSample)eResolveProxy(oldComboOptionalReferenceProperty);

+			if (comboOptionalReferenceProperty != oldComboOptionalReferenceProperty) {

+				if (eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EefnrPackage.COMBO_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY, oldComboOptionalReferenceProperty, comboOptionalReferenceProperty));

+			}

+		}

+		return comboOptionalReferenceProperty;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public TotalSample basicGetComboOptionalReferenceProperty() {

+		return comboOptionalReferenceProperty;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setComboOptionalReferenceProperty(TotalSample newComboOptionalReferenceProperty) {

+		TotalSample oldComboOptionalReferenceProperty = comboOptionalReferenceProperty;

+		comboOptionalReferenceProperty = newComboOptionalReferenceProperty;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, EefnrPackage.COMBO_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY, oldComboOptionalReferenceProperty, comboOptionalReferenceProperty));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case EefnrPackage.COMBO_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY:

+				if (resolve) return getComboRequiredReferenceProperty();

+				return basicGetComboRequiredReferenceProperty();

+			case EefnrPackage.COMBO_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY:

+				if (resolve) return getComboOptionalReferenceProperty();

+				return basicGetComboOptionalReferenceProperty();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case EefnrPackage.COMBO_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY:

+				setComboRequiredReferenceProperty((TotalSample)newValue);

+				return;

+			case EefnrPackage.COMBO_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY:

+				setComboOptionalReferenceProperty((TotalSample)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case EefnrPackage.COMBO_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY:

+				setComboRequiredReferenceProperty((TotalSample)null);

+				return;

+			case EefnrPackage.COMBO_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY:

+				setComboOptionalReferenceProperty((TotalSample)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case EefnrPackage.COMBO_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY:

+				return comboRequiredReferenceProperty != null;

+			case EefnrPackage.COMBO_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY:

+				return comboOptionalReferenceProperty != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} //ComboSampleImpl

diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EMFComboViewerSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EMFComboViewerSampleImpl.java
index 2ffe918db..967da635c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EMFComboViewerSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EMFComboViewerSampleImpl.java
@@ -7,11 +7,8 @@
 package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.eef.eefnr.EMFComboViewerSample;
 import org.eclipse.emf.eef.eefnr.ENUM_SAMPLE;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EObjectFlatComboViewerSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EObjectFlatComboViewerSampleImpl.java
index 3e2ee0597..3ff291de8 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EObjectFlatComboViewerSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EObjectFlatComboViewerSampleImpl.java
@@ -7,12 +7,9 @@
 package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.eef.eefnr.EObjectFlatComboViewerSample;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.TotalSample;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EefnrFactoryImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EefnrFactoryImpl.java
index fbe656c79..a66e495c2 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EefnrFactoryImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EefnrFactoryImpl.java
@@ -92,6 +92,7 @@ public class EefnrFactoryImpl extends EFactoryImpl implements EefnrFactory {
 			case EefnrPackage.EOBJECT_FLAT_COMBO_VIEWER_SAMPLE: return createEObjectFlatComboViewerSample();
 			case EefnrPackage.REFERENCES_TABLE_SAMPLE: return createReferencesTableSample();
 			case EefnrPackage.EMF_COMBO_VIEWER_SAMPLE: return createEMFComboViewerSample();
+			case EefnrPackage.COMBO_SAMPLE: return createComboSample();
 			case EefnrPackage.MULTI_VALUED_EDITOR_SAMPLE: return createMultiValuedEditorSample();
 			case EefnrPackage.TABLE_COMPOSITION_EDITOR_SAMPLE: return createTableCompositionEditorSample();
 			case EefnrPackage.ADVANCED_REFERENCES_TABLE_SAMPLE: return createAdvancedReferencesTableSample();
@@ -234,6 +235,16 @@ public class EefnrFactoryImpl extends EFactoryImpl implements EefnrFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public ComboSample createComboSample() {
+		ComboSampleImpl comboSample = new ComboSampleImpl();
+		return comboSample;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public MultiValuedEditorSample createMultiValuedEditorSample() {
 		MultiValuedEditorSampleImpl multiValuedEditorSample = new MultiValuedEditorSampleImpl();
 		return multiValuedEditorSample;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EefnrPackageImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EefnrPackageImpl.java
index 3bfb78282..55315da17 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EefnrPackageImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/EefnrPackageImpl.java
@@ -11,15 +11,14 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.AbstractSample;
 import org.eclipse.emf.eef.eefnr.AbstractTableCompositionTargetExtensionEditorSample;
 import org.eclipse.emf.eef.eefnr.AdvancedEObjectFlatComboViewerSample;
 import org.eclipse.emf.eef.eefnr.AdvancedReferencesTableSample;
 import org.eclipse.emf.eef.eefnr.AdvancedTableCompositionEditorSample;
 import org.eclipse.emf.eef.eefnr.CheckboxSample;
+import org.eclipse.emf.eef.eefnr.ComboSample;
 import org.eclipse.emf.eef.eefnr.EMFComboViewerSample;
 import org.eclipse.emf.eef.eefnr.EObjectFlatComboViewerSample;
 import org.eclipse.emf.eef.eefnr.EefnrFactory;
@@ -135,6 +134,13 @@ public class EefnrPackageImpl extends EPackageImpl implements EefnrPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass comboSampleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass multiValuedEditorSampleEClass = null;
 
 	/**
@@ -537,6 +543,24 @@ public class EefnrPackageImpl extends EPackageImpl implements EefnrPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getTotalSample_ComboRequiredReferencePropertyTS() {
+		return (EReference)totalSampleEClass.getEStructuralFeatures().get(26);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getTotalSample_ComboOptionalReferencePropertyTS() {
+		return (EReference)totalSampleEClass.getEStructuralFeatures().get(27);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EReference getTotalSample_AdvancedreferencestableRequiredProperty() {
 		return (EReference)totalSampleEClass.getEStructuralFeatures().get(17);
 	}
@@ -789,6 +813,33 @@ public class EefnrPackageImpl extends EPackageImpl implements EefnrPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getComboSample() {
+		return comboSampleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getComboSample_ComboRequiredReferenceProperty() {
+		return (EReference)comboSampleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getComboSample_ComboOptionalReferenceProperty() {
+		return (EReference)comboSampleEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getMultiValuedEditorSample() {
 		return multiValuedEditorSampleEClass;
 	}
@@ -1232,6 +1283,8 @@ public class EefnrPackageImpl extends EPackageImpl implements EefnrPackage {
 		createEReference(totalSampleEClass, TOTAL_SAMPLE__ADVANCEDTABLECOMPOSITION_OPTIONAL_PROPERTY);
 		createEReference(totalSampleEClass, TOTAL_SAMPLE__TABLECOMPOSITION_REQUIRED_PROPERTY);
 		createEReference(totalSampleEClass, TOTAL_SAMPLE__TABLECOMPOSITION_OPTIONAL_PROPERTY);
+		createEReference(totalSampleEClass, TOTAL_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY_TS);
+		createEReference(totalSampleEClass, TOTAL_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY_TS);
 
 		textSampleEClass = createEClass(TEXT_SAMPLE);
 		createEAttribute(textSampleEClass, TEXT_SAMPLE__TEXT_REQUIRED_PROPERTY);
@@ -1261,6 +1314,10 @@ public class EefnrPackageImpl extends EPackageImpl implements EefnrPackage {
 		createEAttribute(emfComboViewerSampleEClass, EMF_COMBO_VIEWER_SAMPLE__EMFCOMBOVIEWER_REQUIRED_PROPERTY);
 		createEAttribute(emfComboViewerSampleEClass, EMF_COMBO_VIEWER_SAMPLE__EMFCOMBOVIEWER_OPTIONAL_PROPERTY);
 
+		comboSampleEClass = createEClass(COMBO_SAMPLE);
+		createEReference(comboSampleEClass, COMBO_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY);
+		createEReference(comboSampleEClass, COMBO_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY);
+
 		multiValuedEditorSampleEClass = createEClass(MULTI_VALUED_EDITOR_SAMPLE);
 		createEAttribute(multiValuedEditorSampleEClass, MULTI_VALUED_EDITOR_SAMPLE__MULTIVALUEDEDITOR_REQUIRED_PROPERTY);
 		createEAttribute(multiValuedEditorSampleEClass, MULTI_VALUED_EDITOR_SAMPLE__MULTIVALUEDEDITOR_OPTIONAL_PROPERTY);
@@ -1371,6 +1428,7 @@ public class EefnrPackageImpl extends EPackageImpl implements EefnrPackage {
 		eObjectFlatComboViewerSampleEClass.getESuperTypes().add(this.getAbstractSample());
 		referencesTableSampleEClass.getESuperTypes().add(this.getAbstractSample());
 		emfComboViewerSampleEClass.getESuperTypes().add(this.getAbstractSample());
+		comboSampleEClass.getESuperTypes().add(this.getAbstractSample());
 		multiValuedEditorSampleEClass.getESuperTypes().add(this.getAbstractSample());
 		tableCompositionEditorSampleEClass.getESuperTypes().add(this.getAbstractSample());
 		advancedReferencesTableSampleEClass.getESuperTypes().add(this.getAbstractSample());
@@ -1420,6 +1478,8 @@ public class EefnrPackageImpl extends EPackageImpl implements EefnrPackage {
 		initEReference(getTotalSample_AdvancedtablecompositionOptionalProperty(), this.getSample(), null, "advancedtablecompositionOptionalProperty", null, 0, -1, TotalSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getTotalSample_TablecompositionRequiredProperty(), this.getSample(), null, "tablecompositionRequiredProperty", null, 1, -1, TotalSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getTotalSample_TablecompositionOptionalProperty(), this.getSample(), null, "tablecompositionOptionalProperty", null, 0, -1, TotalSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTotalSample_ComboRequiredReferencePropertyTS(), this.getTotalSample(), null, "comboRequiredReferencePropertyTS", null, 1, 1, TotalSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTotalSample_ComboOptionalReferencePropertyTS(), this.getTotalSample(), null, "comboOptionalReferencePropertyTS", null, 0, 1, TotalSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(textSampleEClass, TextSample.class, "TextSample", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getTextSample_TextRequiredProperty(), ecorePackage.getEString(), "textRequiredProperty", null, 1, 1, TextSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1449,6 +1509,10 @@ public class EefnrPackageImpl extends EPackageImpl implements EefnrPackage {
 		initEAttribute(getEMFComboViewerSample_EmfcomboviewerRequiredProperty(), this.getENUM_SAMPLE(), "emfcomboviewerRequiredProperty", null, 1, 1, EMFComboViewerSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getEMFComboViewerSample_EmfcomboviewerOptionalProperty(), this.getENUM_SAMPLE(), "emfcomboviewerOptionalProperty", null, 0, 1, EMFComboViewerSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(comboSampleEClass, ComboSample.class, "ComboSample", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getComboSample_ComboRequiredReferenceProperty(), this.getTotalSample(), null, "comboRequiredReferenceProperty", null, 1, 1, ComboSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getComboSample_ComboOptionalReferenceProperty(), this.getTotalSample(), null, "comboOptionalReferenceProperty", null, 0, 1, ComboSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		initEClass(multiValuedEditorSampleEClass, MultiValuedEditorSample.class, "MultiValuedEditorSample", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getMultiValuedEditorSample_MultivaluededitorRequiredProperty(), ecorePackage.getEString(), "multivaluededitorRequiredProperty", null, 1, -1, MultiValuedEditorSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMultiValuedEditorSample_MultivaluededitorOptionalProperty(), ecorePackage.getEString(), "multivaluededitorOptionalProperty", null, 0, -1, MultiValuedEditorSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/FlatReferencesTableSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/FlatReferencesTableSampleImpl.java
index fe115a493..d82c781b2 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/FlatReferencesTableSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/FlatReferencesTableSampleImpl.java
@@ -9,11 +9,8 @@ package org.eclipse.emf.eef.eefnr.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.FlatReferencesTableSample;
 import org.eclipse.emf.eef.eefnr.TotalSample;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/ImageViewerSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/ImageViewerSampleImpl.java
index ce9dc5c69..90bd57011 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/ImageViewerSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/ImageViewerSampleImpl.java
@@ -7,11 +7,8 @@
 package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.ImageViewerSample;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/MultiValuedEditorSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/MultiValuedEditorSampleImpl.java
index a19644719..df17820c3 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/MultiValuedEditorSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/MultiValuedEditorSampleImpl.java
@@ -9,11 +9,8 @@ package org.eclipse.emf.eef.eefnr.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.MultiValuedEditorSample;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/NamedElementImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/NamedElementImpl.java
index 2739aa141..8b65ce62e 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/NamedElementImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/NamedElementImpl.java
@@ -7,7 +7,6 @@
 package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.NamedElement;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/RadioSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/RadioSampleImpl.java
index 1c6ae7f00..c4e98a7eb 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/RadioSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/RadioSampleImpl.java
@@ -7,11 +7,8 @@
 package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.eef.eefnr.ENUM_SAMPLE;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.RadioSample;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/ReferencesTableSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/ReferencesTableSampleImpl.java
index 06ba1be81..260811e08 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/ReferencesTableSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/ReferencesTableSampleImpl.java
@@ -9,11 +9,8 @@ package org.eclipse.emf.eef.eefnr.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.ReferencesTableSample;
 import org.eclipse.emf.eef.eefnr.TotalSample;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/RootImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/RootImpl.java
index f8c4650eb..890f1f3d7 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/RootImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/RootImpl.java
@@ -9,17 +9,12 @@ package org.eclipse.emf.eef.eefnr.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.eef.eefnr.AbstractSample;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.Root;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/SampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/SampleImpl.java
index c734f1530..33ef5a232 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/SampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/SampleImpl.java
@@ -7,11 +7,8 @@
 package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.Sample;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/SelectionDialogSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/SelectionDialogSampleImpl.java
index 7760b801c..e840e5bc5 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/SelectionDialogSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/SelectionDialogSampleImpl.java
@@ -7,11 +7,8 @@
 package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.SelectionDialogSample;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/SingleCompositionViewerSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/SingleCompositionViewerSampleImpl.java
index 2f5d49adc..5178a594c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/SingleCompositionViewerSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/SingleCompositionViewerSampleImpl.java
@@ -8,12 +8,9 @@ package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.eef.eefnr.AbstractSample;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.Sample;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TableCompositionEditorSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TableCompositionEditorSampleImpl.java
index 3cc27351c..971c4bb8e 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TableCompositionEditorSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TableCompositionEditorSampleImpl.java
@@ -9,15 +9,11 @@ package org.eclipse.emf.eef.eefnr.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.Sample;
 import org.eclipse.emf.eef.eefnr.TableCompositionEditorSample;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TableCompositionExtensionEditorSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TableCompositionExtensionEditorSampleImpl.java
index e5cc0917e..bfaffd044 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TableCompositionExtensionEditorSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TableCompositionExtensionEditorSampleImpl.java
@@ -9,15 +9,11 @@ package org.eclipse.emf.eef.eefnr.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.eef.eefnr.AbstractTableCompositionTargetExtensionEditorSample;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.TableCompositionExtensionEditorSample;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TextSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TextSampleImpl.java
index 964dbaa04..a28b757c8 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TextSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TextSampleImpl.java
@@ -7,11 +7,8 @@
 package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.TextSample;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TextSampleWithTwoTabsImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TextSampleWithTwoTabsImpl.java
index 84d96f10c..e110bb1b1 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TextSampleWithTwoTabsImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TextSampleWithTwoTabsImpl.java
@@ -7,11 +7,8 @@
 package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.TextSampleWithTwoTabs;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TextareaSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TextareaSampleImpl.java
index 840539d8e..6902b07d7 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TextareaSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TextareaSampleImpl.java
@@ -7,11 +7,8 @@
 package org.eclipse.emf.eef.eefnr.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.TextareaSample;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TotalSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TotalSampleImpl.java
index b77ea2afc..c3dbcced8 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TotalSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/TotalSampleImpl.java
@@ -10,19 +10,14 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.eef.eefnr.ENUM_SAMPLE;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 import org.eclipse.emf.eef.eefnr.Sample;
@@ -61,6 +56,8 @@ import org.eclipse.emf.eef.eefnr.TotalSample;
  *   <li>{@link org.eclipse.emf.eef.eefnr.impl.TotalSampleImpl#getAdvancedtablecompositionOptionalProperty <em>Advancedtablecomposition Optional Property</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.eefnr.impl.TotalSampleImpl#getTablecompositionRequiredProperty <em>Tablecomposition Required Property</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.eefnr.impl.TotalSampleImpl#getTablecompositionOptionalProperty <em>Tablecomposition Optional Property</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.eefnr.impl.TotalSampleImpl#getComboRequiredReferencePropertyTS <em>Combo Required Reference Property TS</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.eefnr.impl.TotalSampleImpl#getComboOptionalReferencePropertyTS <em>Combo Optional Reference Property TS</em>}</li>
  * </ul>
  * </p>
  *
@@ -428,6 +425,26 @@ public class TotalSampleImpl extends AbstractSampleImpl implements TotalSample {
 	protected EList<Sample> tablecompositionOptionalProperty;
 
 	/**
+	 * The cached value of the '{@link #getComboRequiredReferencePropertyTS() <em>Combo Required Reference Property TS</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getComboRequiredReferencePropertyTS()
+	 * @generated
+	 * @ordered
+	 */
+	protected TotalSample comboRequiredReferencePropertyTS;
+
+	/**
+	 * The cached value of the '{@link #getComboOptionalReferencePropertyTS() <em>Combo Optional Reference Property TS</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getComboOptionalReferencePropertyTS()
+	 * @generated
+	 * @ordered
+	 */
+	protected TotalSample comboOptionalReferencePropertyTS;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -821,6 +838,82 @@ public class TotalSampleImpl extends AbstractSampleImpl implements TotalSample {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public TotalSample getComboRequiredReferencePropertyTS() {
+		if (comboRequiredReferencePropertyTS != null && comboRequiredReferencePropertyTS.eIsProxy()) {
+			InternalEObject oldComboRequiredReferencePropertyTS = (InternalEObject)comboRequiredReferencePropertyTS;
+			comboRequiredReferencePropertyTS = (TotalSample)eResolveProxy(oldComboRequiredReferencePropertyTS);
+			if (comboRequiredReferencePropertyTS != oldComboRequiredReferencePropertyTS) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EefnrPackage.TOTAL_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY_TS, oldComboRequiredReferencePropertyTS, comboRequiredReferencePropertyTS));
+			}
+		}
+		return comboRequiredReferencePropertyTS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TotalSample basicGetComboRequiredReferencePropertyTS() {
+		return comboRequiredReferencePropertyTS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setComboRequiredReferencePropertyTS(TotalSample newComboRequiredReferencePropertyTS) {
+		TotalSample oldComboRequiredReferencePropertyTS = comboRequiredReferencePropertyTS;
+		comboRequiredReferencePropertyTS = newComboRequiredReferencePropertyTS;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EefnrPackage.TOTAL_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY_TS, oldComboRequiredReferencePropertyTS, comboRequiredReferencePropertyTS));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TotalSample getComboOptionalReferencePropertyTS() {
+		if (comboOptionalReferencePropertyTS != null && comboOptionalReferencePropertyTS.eIsProxy()) {
+			InternalEObject oldComboOptionalReferencePropertyTS = (InternalEObject)comboOptionalReferencePropertyTS;
+			comboOptionalReferencePropertyTS = (TotalSample)eResolveProxy(oldComboOptionalReferencePropertyTS);
+			if (comboOptionalReferencePropertyTS != oldComboOptionalReferencePropertyTS) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EefnrPackage.TOTAL_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY_TS, oldComboOptionalReferencePropertyTS, comboOptionalReferencePropertyTS));
+			}
+		}
+		return comboOptionalReferencePropertyTS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TotalSample basicGetComboOptionalReferencePropertyTS() {
+		return comboOptionalReferencePropertyTS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setComboOptionalReferencePropertyTS(TotalSample newComboOptionalReferencePropertyTS) {
+		TotalSample oldComboOptionalReferencePropertyTS = comboOptionalReferencePropertyTS;
+		comboOptionalReferencePropertyTS = newComboOptionalReferencePropertyTS;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EefnrPackage.TOTAL_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY_TS, oldComboOptionalReferencePropertyTS, comboOptionalReferencePropertyTS));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EList<TotalSample> getAdvancedreferencestableRequiredProperty() {
 		if (advancedreferencestableRequiredProperty == null) {
 			advancedreferencestableRequiredProperty = new EObjectResolvingEList<TotalSample>(TotalSample.class, this, EefnrPackage.TOTAL_SAMPLE__ADVANCEDREFERENCESTABLE_REQUIRED_PROPERTY);
@@ -1040,6 +1133,12 @@ public class TotalSampleImpl extends AbstractSampleImpl implements TotalSample {
 				return getTablecompositionRequiredProperty();
 			case EefnrPackage.TOTAL_SAMPLE__TABLECOMPOSITION_OPTIONAL_PROPERTY:
 				return getTablecompositionOptionalProperty();
+			case EefnrPackage.TOTAL_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY_TS:
+				if (resolve) return getComboRequiredReferencePropertyTS();
+				return basicGetComboRequiredReferencePropertyTS();
+			case EefnrPackage.TOTAL_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY_TS:
+				if (resolve) return getComboOptionalReferencePropertyTS();
+				return basicGetComboOptionalReferencePropertyTS();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -1143,6 +1242,12 @@ public class TotalSampleImpl extends AbstractSampleImpl implements TotalSample {
 				getTablecompositionOptionalProperty().clear();
 				getTablecompositionOptionalProperty().addAll((Collection<? extends Sample>)newValue);
 				return;
+			case EefnrPackage.TOTAL_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY_TS:
+				setComboRequiredReferencePropertyTS((TotalSample)newValue);
+				return;
+			case EefnrPackage.TOTAL_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY_TS:
+				setComboOptionalReferencePropertyTS((TotalSample)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -1233,6 +1338,12 @@ public class TotalSampleImpl extends AbstractSampleImpl implements TotalSample {
 			case EefnrPackage.TOTAL_SAMPLE__TABLECOMPOSITION_OPTIONAL_PROPERTY:
 				getTablecompositionOptionalProperty().clear();
 				return;
+			case EefnrPackage.TOTAL_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY_TS:
+				setComboRequiredReferencePropertyTS((TotalSample)null);
+				return;
+			case EefnrPackage.TOTAL_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY_TS:
+				setComboOptionalReferencePropertyTS((TotalSample)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -1297,6 +1408,10 @@ public class TotalSampleImpl extends AbstractSampleImpl implements TotalSample {
 				return tablecompositionRequiredProperty != null && !tablecompositionRequiredProperty.isEmpty();
 			case EefnrPackage.TOTAL_SAMPLE__TABLECOMPOSITION_OPTIONAL_PROPERTY:
 				return tablecompositionOptionalProperty != null && !tablecompositionOptionalProperty.isEmpty();
+			case EefnrPackage.TOTAL_SAMPLE__COMBO_REQUIRED_REFERENCE_PROPERTY_TS:
+				return comboRequiredReferencePropertyTS != null;
+			case EefnrPackage.TOTAL_SAMPLE__COMBO_OPTIONAL_REFERENCE_PROPERTY_TS:
+				return comboOptionalReferencePropertyTS != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/interface_/impl/InterfacePackageImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/interface_/impl/InterfacePackageImpl.java
index 4408482b9..2031c3685 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/interface_/impl/InterfacePackageImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/interface_/impl/InterfacePackageImpl.java
@@ -8,35 +8,21 @@ package org.eclipse.emf.eef.eefnr.interface_.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
-
 import org.eclipse.emf.eef.eefnr.filters.FiltersPackage;
-
 import org.eclipse.emf.eef.eefnr.filters.impl.FiltersPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.interface_.InterfaceFactory;
 import org.eclipse.emf.eef.eefnr.interface_.InterfacePackage;
 import org.eclipse.emf.eef.eefnr.interface_.SimpleSample;
-
 import org.eclipse.emf.eef.eefnr.naming.CustomNamingPackage;
-
 import org.eclipse.emf.eef.eefnr.naming.impl.CustomNamingPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.navigation.NavigationPackage;
-
 import org.eclipse.emf.eef.eefnr.navigation.impl.NavigationPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.references.ReferencesPackage;
-
 import org.eclipse.emf.eef.eefnr.references.impl.ReferencesPackageImpl;
-
 import org.eclipse.emf.eef.eefnrext.EefnrextPackage;
-
 import org.eclipse.emf.eef.eefnrext.impl.EefnrextPackageImpl;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/interface_/impl/SimpleSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/interface_/impl/SimpleSampleImpl.java
index d65fdcbc5..48ddb8a35 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/interface_/impl/SimpleSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/interface_/impl/SimpleSampleImpl.java
@@ -7,9 +7,7 @@
 package org.eclipse.emf.eef.eefnr.interface_.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.eef.eefnr.interface_.InterfacePackage;
 import org.eclipse.emf.eef.eefnr.interface_.SimpleSample;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/naming/CustomNamingPackage.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/naming/CustomNamingPackage.java
index f1f376d62..39e5b765c 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/naming/CustomNamingPackage.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/naming/CustomNamingPackage.java
@@ -8,7 +8,6 @@ package org.eclipse.emf.eef.eefnr.naming;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/naming/impl/CustomNamingPackageImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/naming/impl/CustomNamingPackageImpl.java
index bf90873bb..d587e29a0 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/naming/impl/CustomNamingPackageImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/naming/impl/CustomNamingPackageImpl.java
@@ -8,33 +8,21 @@ package org.eclipse.emf.eef.eefnr.naming.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
-
 import org.eclipse.emf.eef.eefnr.filters.FiltersPackage;
-
 import org.eclipse.emf.eef.eefnr.filters.impl.FiltersPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.interface_.InterfacePackage;
 import org.eclipse.emf.eef.eefnr.interface_.impl.InterfacePackageImpl;
 import org.eclipse.emf.eef.eefnr.naming.CustomNamingFactory;
 import org.eclipse.emf.eef.eefnr.naming.CustomNamingPackage;
 import org.eclipse.emf.eef.eefnr.naming.Event;
-
 import org.eclipse.emf.eef.eefnr.navigation.NavigationPackage;
-
 import org.eclipse.emf.eef.eefnr.navigation.impl.NavigationPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.references.ReferencesPackage;
-
 import org.eclipse.emf.eef.eefnr.references.impl.ReferencesPackageImpl;
-
 import org.eclipse.emf.eef.eefnrext.EefnrextPackage;
-
 import org.eclipse.emf.eef.eefnrext.impl.EefnrextPackageImpl;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/naming/impl/EventImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/naming/impl/EventImpl.java
index 04dd590de..1a65c8568 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/naming/impl/EventImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/naming/impl/EventImpl.java
@@ -7,9 +7,7 @@
 package org.eclipse.emf.eef.eefnr.naming.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.eef.eefnr.impl.AbstractSampleImpl;
-
 import org.eclipse.emf.eef.eefnr.naming.CustomNamingPackage;
 import org.eclipse.emf.eef.eefnr.naming.Event;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/AttributeNavigationSample.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/AttributeNavigationSample.java
index 2fc64660d..c1d5a767b 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/AttributeNavigationSample.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/AttributeNavigationSample.java
@@ -7,7 +7,6 @@
 package org.eclipse.emf.eef.eefnr.navigation;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.eef.eefnr.AbstractSample;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/DeferedFlatReferenceTableEditorSample.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/DeferedFlatReferenceTableEditorSample.java
index b81a44869..f602405c1 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/DeferedFlatReferenceTableEditorSample.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/DeferedFlatReferenceTableEditorSample.java
@@ -7,7 +7,6 @@
 package org.eclipse.emf.eef.eefnr.navigation;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.eef.eefnr.AbstractSample;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/DeferedReference.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/DeferedReference.java
index 2ac4db2ca..6d4d00eb4 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/DeferedReference.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/DeferedReference.java
@@ -7,7 +7,6 @@
 package org.eclipse.emf.eef.eefnr.navigation;
 
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.eef.eefnr.TotalSample;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/DeferedReferenceTableEditorSample.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/DeferedReferenceTableEditorSample.java
index ad167db5c..731e353d8 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/DeferedReferenceTableEditorSample.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/DeferedReferenceTableEditorSample.java
@@ -7,7 +7,6 @@
 package org.eclipse.emf.eef.eefnr.navigation;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.eef.eefnr.AbstractSample;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/NavigationPackage.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/NavigationPackage.java
index 6d539ad24..aa52193f3 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/NavigationPackage.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/NavigationPackage.java
@@ -10,7 +10,6 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/Owner.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/Owner.java
index 273ebda5b..dbf6dfceb 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/Owner.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/Owner.java
@@ -7,7 +7,6 @@
 package org.eclipse.emf.eef.eefnr.navigation;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.eef.eefnr.AbstractSample;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/Referencer.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/Referencer.java
index 745ab97e9..64df5b023 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/Referencer.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/Referencer.java
@@ -7,7 +7,6 @@
 package org.eclipse.emf.eef.eefnr.navigation;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/SingleReferencer.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/SingleReferencer.java
index 6f2c7dafe..8ecaab6e6 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/SingleReferencer.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/SingleReferencer.java
@@ -7,7 +7,6 @@
 package org.eclipse.emf.eef.eefnr.navigation;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.common.util.Enumerator;
 import org.eclipse.emf.ecore.EObject;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/impl/AttributeDelegateImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/impl/AttributeDelegateImpl.java
index ea2a2d5e4..54831bdb0 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/impl/AttributeDelegateImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/impl/AttributeDelegateImpl.java
@@ -7,12 +7,9 @@
 package org.eclipse.emf.eef.eefnr.navigation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.eef.eefnr.navigation.AttributeDelegate;
 import org.eclipse.emf.eef.eefnr.navigation.NavigationPackage;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/impl/AttributeNavigationSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/impl/AttributeNavigationSampleImpl.java
index 7f8cad7c5..c2a0e9d94 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/impl/AttributeNavigationSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/navigation/impl/AttributeNavigationSampleImpl.java
@@ -10,19 +10,13 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.eef.eefnr.impl.AbstractSampleImpl;
-
 import org.eclipse.emf.eef.eefnr.navigation.AttributeDelegate;
 import org.eclipse.emf.eef.eefnr.navigation.AttributeNavigationSample;
 import org.eclipse.emf.eef.eefnr.navigation.NavigationPackage;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/ReferenceEnabledSample.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/ReferenceEnabledSample.java
index c66cb8d0c..de9ee8252 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/ReferenceEnabledSample.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/ReferenceEnabledSample.java
@@ -7,7 +7,6 @@
 package org.eclipse.emf.eef.eefnr.references;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.eef.eefnr.TotalSample;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/ReferencesPackage.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/ReferencesPackage.java
index 61cb73875..0ae0651a6 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/ReferencesPackage.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/ReferencesPackage.java
@@ -10,7 +10,6 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/AbstractEnabledSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/AbstractEnabledSampleImpl.java
index fc64fb221..3c369decc 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/AbstractEnabledSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/AbstractEnabledSampleImpl.java
@@ -7,13 +7,9 @@
 package org.eclipse.emf.eef.eefnr.references.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.eef.eefnr.impl.AbstractSampleImpl;
-
 import org.eclipse.emf.eef.eefnr.references.AbstractEnabledSample;
 import org.eclipse.emf.eef.eefnr.references.ReferencesPackage;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/ReferenceEnabledSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/ReferenceEnabledSampleImpl.java
index 414fa4546..1b2829524 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/ReferenceEnabledSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/ReferenceEnabledSampleImpl.java
@@ -9,13 +9,9 @@ package org.eclipse.emf.eef.eefnr.references.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
 import org.eclipse.emf.eef.eefnr.TotalSample;
-
 import org.eclipse.emf.eef.eefnr.references.ReferenceEnabledSample;
 import org.eclipse.emf.eef.eefnr.references.ReferencesPackage;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/ReferencesPackageImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/ReferencesPackageImpl.java
index 8856c01cd..e1fedd580 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/ReferencesPackageImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/ReferencesPackageImpl.java
@@ -10,15 +10,11 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
-
 import org.eclipse.emf.eef.eefnr.filters.FiltersPackage;
 import org.eclipse.emf.eef.eefnr.filters.impl.FiltersPackageImpl;
 import org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.interface_.InterfacePackage;
 import org.eclipse.emf.eef.eefnr.interface_.impl.InterfacePackageImpl;
 import org.eclipse.emf.eef.eefnr.naming.CustomNamingPackage;
@@ -29,10 +25,8 @@ import org.eclipse.emf.eef.eefnr.references.AbstractEnabledSample;
 import org.eclipse.emf.eef.eefnr.references.ReferenceEnabledSample;
 import org.eclipse.emf.eef.eefnr.references.ReferencesFactory;
 import org.eclipse.emf.eef.eefnr.references.ReferencesPackage;
-
 import org.eclipse.emf.eef.eefnr.references.Tests;
 import org.eclipse.emf.eef.eefnrext.EefnrextPackage;
-
 import org.eclipse.emf.eef.eefnrext.impl.EefnrextPackageImpl;
 
 /**
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/TestsImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/TestsImpl.java
index 95233407d..d0827b618 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/TestsImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/references/impl/TestsImpl.java
@@ -7,9 +7,7 @@
 package org.eclipse.emf.eef.eefnr.references.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.eef.eefnr.impl.NamedElementImpl;
-
 import org.eclipse.emf.eef.eefnr.references.ReferencesPackage;
 import org.eclipse.emf.eef.eefnr.references.Tests;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/util/EefnrAdapterFactory.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/util/EefnrAdapterFactory.java
index f2e808ad8..568ba41bf 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/util/EefnrAdapterFactory.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/util/EefnrAdapterFactory.java
@@ -135,6 +135,10 @@ public class EefnrAdapterFactory extends AdapterFactoryImpl {
 				return createEMFComboViewerSampleAdapter();
 			}
 			@Override
+			public Adapter caseComboSample(ComboSample object) {
+				return createComboSampleAdapter();
+			}
+			@Override
 			public Adapter caseMultiValuedEditorSample(MultiValuedEditorSample object) {
 				return createMultiValuedEditorSampleAdapter();
 			}
@@ -351,6 +355,20 @@ public class EefnrAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.eef.eefnr.ComboSample <em>Combo Sample</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.eef.eefnr.ComboSample
+	 * @generated
+	 */
+	public Adapter createComboSampleAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.eef.eefnr.MultiValuedEditorSample <em>Multi Valued Editor Sample</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/util/EefnrSwitch.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/util/EefnrSwitch.java
index 1086045a9..5a3b56b22 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/util/EefnrSwitch.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/util/EefnrSwitch.java
@@ -161,6 +161,13 @@ public class EefnrSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case EefnrPackage.COMBO_SAMPLE: {
+				ComboSample comboSample = (ComboSample)theEObject;
+				T result = caseComboSample(comboSample);
+				if (result == null) result = caseAbstractSample(comboSample);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case EefnrPackage.MULTI_VALUED_EDITOR_SAMPLE: {
 				MultiValuedEditorSample multiValuedEditorSample = (MultiValuedEditorSample)theEObject;
 				T result = caseMultiValuedEditorSample(multiValuedEditorSample);
@@ -414,6 +421,21 @@ public class EefnrSwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Combo Sample</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Combo Sample</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseComboSample(ComboSample object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Multi Valued Editor Sample</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/EefnrextPackage.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/EefnrextPackage.java
index 282ac30b4..ee81a7c73 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/EefnrextPackage.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/EefnrextPackage.java
@@ -9,7 +9,6 @@ package org.eclipse.emf.eef.eefnrext;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/CheckBoxExtendedEditorSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/CheckBoxExtendedEditorSampleImpl.java
index 813f96b36..e716e93aa 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/CheckBoxExtendedEditorSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/CheckBoxExtendedEditorSampleImpl.java
@@ -8,10 +8,8 @@ package org.eclipse.emf.eef.eefnrext.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.eef.eefnr.impl.AbstractSampleImpl;
-
 import org.eclipse.emf.eef.eefnrext.CheckBoxExtendedEditorSample;
 import org.eclipse.emf.eef.eefnrext.EefnrextPackage;
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/EefnrextPackageImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/EefnrextPackageImpl.java
index 37005cb0f..ce3c6b1e2 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/EefnrextPackageImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/EefnrextPackageImpl.java
@@ -9,16 +9,12 @@ package org.eclipse.emf.eef.eefnrext.impl;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
-
 import org.eclipse.emf.eef.eefnr.filters.FiltersPackage;
 import org.eclipse.emf.eef.eefnr.filters.impl.FiltersPackageImpl;
 import org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl;
-
 import org.eclipse.emf.eef.eefnr.interface_.InterfacePackage;
 import org.eclipse.emf.eef.eefnr.interface_.impl.InterfacePackageImpl;
 import org.eclipse.emf.eef.eefnr.naming.CustomNamingPackage;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/FlatReferenceExtendedEditorSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/FlatReferenceExtendedEditorSampleImpl.java
index 03e5688b2..2875bfd7b 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/FlatReferenceExtendedEditorSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/FlatReferenceExtendedEditorSampleImpl.java
@@ -7,12 +7,12 @@
 package org.eclipse.emf.eef.eefnrext.impl;
 
 import java.util.Collection;
-import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.eef.eefnr.AbstractSample;
 import org.eclipse.emf.eef.eefnrext.EefnrextPackage;
 import org.eclipse.emf.eef.eefnrext.FlatReferenceExtendedEditorSample;
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/TableCompositionTargetExtensionEditorSampleImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/TableCompositionTargetExtensionEditorSampleImpl.java
index 16ace21f6..9148661fa 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/TableCompositionTargetExtensionEditorSampleImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnrext/impl/TableCompositionTargetExtensionEditorSampleImpl.java
@@ -7,9 +7,7 @@
 package org.eclipse.emf.eef.eefnrext.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.eef.eefnr.impl.AbstractTableCompositionTargetExtensionEditorSampleImpl;
-
 import org.eclipse.emf.eef.eefnrext.EefnrextPackage;
 import org.eclipse.emf.eef.eefnrext.TableCompositionTargetExtensionEditorSample;