add flat reference table

10 files changed, 447 insertions, 7 deletions

diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore b/tests/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore
index 9816d8a95..1a18d9938 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore
@@ -135,4 +135,10 @@
     <eLiterals name="literal2" value="1"/>
     <eLiterals name="literal3" value="2"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FlatReferencesTableSample" eSuperTypes="#//AbstractSample">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="flatreferencestableRequiredProperty"
+        lowerBound="1" upperBound="-1" eType="#//TotalSample"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="flatreferencestableOptionalProperty"
+        upperBound="-1" eType="#//TotalSample"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/model/eefnr.genmodel b/tests/org.eclipse.emf.eef.tests.nonreg/model/eefnr.genmodel
index 1eba732a0..262240838 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg/model/eefnr.genmodel
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/model/eefnr.genmodel
@@ -90,5 +90,9 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eefnr.ecore#//AdvancedTableCompositionEditorSample/advancedtablecompositionRequiredProperty"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eefnr.ecore#//AdvancedTableCompositionEditorSample/advancedtablecompositionOptionalProperty"/>
     </genClasses>
+    <genClasses ecoreClass="eefnr.ecore#//FlatReferencesTableSample">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference eefnr.ecore#//FlatReferencesTableSample/flatreferencestableRequiredProperty"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference eefnr.ecore#//FlatReferencesTableSample/flatreferencestableOptionalProperty"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
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 463afd290..3819617a6 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
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: EefnrFactory.java,v 1.1 2010/02/01 13:00:44 nlepine Exp $
+ * $Id: EefnrFactory.java,v 1.2 2010/02/02 09:29:38 nlepine Exp $
  */
 package org.eclipse.emf.eef.eefnr;
 
@@ -152,6 +152,15 @@ public interface EefnrFactory extends EFactory {
 	AdvancedTableCompositionEditorSample createAdvancedTableCompositionEditorSample();
 
 	/**
+	 * Returns a new object of class '<em>Flat References Table Sample</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Flat References Table Sample</em>'.
+	 * @generated
+	 */
+	FlatReferencesTableSample createFlatReferencesTableSample();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- 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 12a8792fc..499e739b3 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
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: EefnrPackage.java,v 1.1 2010/02/01 13:00:44 nlepine Exp $
+ * $Id: EefnrPackage.java,v 1.2 2010/02/02 09:29:38 nlepine Exp $
  */
 package org.eclipse.emf.eef.eefnr;
 
@@ -787,6 +787,43 @@ public interface EefnrPackage extends EPackage {
 	int ADVANCED_TABLE_COMPOSITION_EDITOR_SAMPLE_FEATURE_COUNT = ABSTRACT_SAMPLE_FEATURE_COUNT + 2;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.emf.eef.eefnr.impl.FlatReferencesTableSampleImpl <em>Flat References Table Sample</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.eef.eefnr.impl.FlatReferencesTableSampleImpl
+	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getFlatReferencesTableSample()
+	 * @generated
+	 */
+	int FLAT_REFERENCES_TABLE_SAMPLE = 15;
+
+	/**
+	 * The feature id for the '<em><b>Flatreferencestable Required Property</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_REQUIRED_PROPERTY = ABSTRACT_SAMPLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Flatreferencestable Optional Property</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_OPTIONAL_PROPERTY = ABSTRACT_SAMPLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Flat References Table Sample</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLAT_REFERENCES_TABLE_SAMPLE_FEATURE_COUNT = ABSTRACT_SAMPLE_FEATURE_COUNT + 2;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.emf.eef.eefnr.ENUM_SAMPLE <em>ENUM SAMPLE</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -794,7 +831,7 @@ public interface EefnrPackage extends EPackage {
 	 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getENUM_SAMPLE()
 	 * @generated
 	 */
-	int ENUM_SAMPLE = 15;
+	int ENUM_SAMPLE = 16;
 
 
 	/**
@@ -1487,6 +1524,38 @@ public interface EefnrPackage extends EPackage {
 	EReference getAdvancedTableCompositionEditorSample_AdvancedtablecompositionOptionalProperty();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.eef.eefnr.FlatReferencesTableSample <em>Flat References Table Sample</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Flat References Table Sample</em>'.
+	 * @see org.eclipse.emf.eef.eefnr.FlatReferencesTableSample
+	 * @generated
+	 */
+	EClass getFlatReferencesTableSample();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.emf.eef.eefnr.FlatReferencesTableSample#getFlatreferencestableRequiredProperty <em>Flatreferencestable Required Property</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Flatreferencestable Required Property</em>'.
+	 * @see org.eclipse.emf.eef.eefnr.FlatReferencesTableSample#getFlatreferencestableRequiredProperty()
+	 * @see #getFlatReferencesTableSample()
+	 * @generated
+	 */
+	EReference getFlatReferencesTableSample_FlatreferencestableRequiredProperty();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.emf.eef.eefnr.FlatReferencesTableSample#getFlatreferencestableOptionalProperty <em>Flatreferencestable Optional Property</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Flatreferencestable Optional Property</em>'.
+	 * @see org.eclipse.emf.eef.eefnr.FlatReferencesTableSample#getFlatreferencestableOptionalProperty()
+	 * @see #getFlatReferencesTableSample()
+	 * @generated
+	 */
+	EReference getFlatReferencesTableSample_FlatreferencestableOptionalProperty();
+
+	/**
 	 * Returns the meta object for enum '{@link org.eclipse.emf.eef.eefnr.ENUM_SAMPLE <em>ENUM SAMPLE</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2061,6 +2130,32 @@ public interface EefnrPackage extends EPackage {
 		EReference ADVANCED_TABLE_COMPOSITION_EDITOR_SAMPLE__ADVANCEDTABLECOMPOSITION_OPTIONAL_PROPERTY = eINSTANCE.getAdvancedTableCompositionEditorSample_AdvancedtablecompositionOptionalProperty();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.eef.eefnr.impl.FlatReferencesTableSampleImpl <em>Flat References Table Sample</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.eef.eefnr.impl.FlatReferencesTableSampleImpl
+		 * @see org.eclipse.emf.eef.eefnr.impl.EefnrPackageImpl#getFlatReferencesTableSample()
+		 * @generated
+		 */
+		EClass FLAT_REFERENCES_TABLE_SAMPLE = eINSTANCE.getFlatReferencesTableSample();
+
+		/**
+		 * The meta object literal for the '<em><b>Flatreferencestable Required Property</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_REQUIRED_PROPERTY = eINSTANCE.getFlatReferencesTableSample_FlatreferencestableRequiredProperty();
+
+		/**
+		 * The meta object literal for the '<em><b>Flatreferencestable Optional Property</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_OPTIONAL_PROPERTY = eINSTANCE.getFlatReferencesTableSample_FlatreferencestableOptionalProperty();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.eef.eefnr.ENUM_SAMPLE <em>ENUM SAMPLE</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/FlatReferencesTableSample.java b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/FlatReferencesTableSample.java
new file mode 100644
index 000000000..4402060d8
--- /dev/null
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/FlatReferencesTableSample.java
@@ -0,0 +1,61 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: FlatReferencesTableSample.java,v 1.1 2010/02/02 09:29:38 nlepine Exp $
+ */
+package org.eclipse.emf.eef.eefnr;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Flat References Table Sample</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.eef.eefnr.FlatReferencesTableSample#getFlatreferencestableRequiredProperty <em>Flatreferencestable Required Property</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.eefnr.FlatReferencesTableSample#getFlatreferencestableOptionalProperty <em>Flatreferencestable Optional Property</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.eef.eefnr.EefnrPackage#getFlatReferencesTableSample()
+ * @model
+ * @generated
+ */
+public interface FlatReferencesTableSample extends AbstractSample {
+	/**
+	 * Returns the value of the '<em><b>Flatreferencestable Required Property</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.emf.eef.eefnr.TotalSample}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Flatreferencestable Required Property</em>' reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Flatreferencestable Required Property</em>' reference list.
+	 * @see org.eclipse.emf.eef.eefnr.EefnrPackage#getFlatReferencesTableSample_FlatreferencestableRequiredProperty()
+	 * @model required="true"
+	 * @generated
+	 */
+	EList<TotalSample> getFlatreferencestableRequiredProperty();
+
+	/**
+	 * Returns the value of the '<em><b>Flatreferencestable Optional Property</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.emf.eef.eefnr.TotalSample}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Flatreferencestable Optional Property</em>' reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Flatreferencestable Optional Property</em>' reference list.
+	 * @see org.eclipse.emf.eef.eefnr.EefnrPackage#getFlatReferencesTableSample_FlatreferencestableOptionalProperty()
+	 * @model
+	 * @generated
+	 */
+	EList<TotalSample> getFlatreferencestableOptionalProperty();
+
+} // FlatReferencesTableSample
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 2e7ae52f0..6e740ed03 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
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: EefnrFactoryImpl.java,v 1.1 2010/02/01 13:00:44 nlepine Exp $
+ * $Id: EefnrFactoryImpl.java,v 1.2 2010/02/02 09:29:38 nlepine Exp $
  */
 package org.eclipse.emf.eef.eefnr.impl;
 
@@ -75,6 +75,7 @@ public class EefnrFactoryImpl extends EFactoryImpl implements EefnrFactory {
 			case EefnrPackage.ADVANCED_REFERENCES_TABLE_SAMPLE: return createAdvancedReferencesTableSample();
 			case EefnrPackage.ADVANCED_EOBJECT_FLAT_COMBO_VIEWER_SAMPLE: return createAdvancedEObjectFlatComboViewerSample();
 			case EefnrPackage.ADVANCED_TABLE_COMPOSITION_EDITOR_SAMPLE: return createAdvancedTableCompositionEditorSample();
+			case EefnrPackage.FLAT_REFERENCES_TABLE_SAMPLE: return createFlatReferencesTableSample();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -255,6 +256,16 @@ public class EefnrFactoryImpl extends EFactoryImpl implements EefnrFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public FlatReferencesTableSample createFlatReferencesTableSample() {
+		FlatReferencesTableSampleImpl flatReferencesTableSample = new FlatReferencesTableSampleImpl();
+		return flatReferencesTableSample;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public ENUM_SAMPLE createENUM_SAMPLEFromString(EDataType eDataType, String initialValue) {
 		ENUM_SAMPLE result = ENUM_SAMPLE.get(initialValue);
 		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
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 ae246e95e..4468fe540 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
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: EefnrPackageImpl.java,v 1.1 2010/02/01 13:00:43 nlepine Exp $
+ * $Id: EefnrPackageImpl.java,v 1.2 2010/02/02 09:29:38 nlepine Exp $
  */
 package org.eclipse.emf.eef.eefnr.impl;
 
@@ -23,6 +23,7 @@ import org.eclipse.emf.eef.eefnr.EMFComboViewerSample;
 import org.eclipse.emf.eef.eefnr.EObjectFlatComboViewerSample;
 import org.eclipse.emf.eef.eefnr.EefnrFactory;
 import org.eclipse.emf.eef.eefnr.EefnrPackage;
+import org.eclipse.emf.eef.eefnr.FlatReferencesTableSample;
 import org.eclipse.emf.eef.eefnr.MultiValuedEditorSample;
 import org.eclipse.emf.eef.eefnr.RadioSample;
 import org.eclipse.emf.eef.eefnr.ReferencesTableSample;
@@ -149,6 +150,13 @@ public class EefnrPackageImpl extends EPackageImpl implements EefnrPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass flatReferencesTableSampleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EEnum enuM_SAMPLEEEnum = null;
 
 	/**
@@ -793,6 +801,33 @@ public class EefnrPackageImpl extends EPackageImpl implements EefnrPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getFlatReferencesTableSample() {
+		return flatReferencesTableSampleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getFlatReferencesTableSample_FlatreferencestableRequiredProperty() {
+		return (EReference)flatReferencesTableSampleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getFlatReferencesTableSample_FlatreferencestableOptionalProperty() {
+		return (EReference)flatReferencesTableSampleEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EEnum getENUM_SAMPLE() {
 		return enuM_SAMPLEEEnum;
 	}
@@ -904,6 +939,10 @@ public class EefnrPackageImpl extends EPackageImpl implements EefnrPackage {
 		createEReference(advancedTableCompositionEditorSampleEClass, ADVANCED_TABLE_COMPOSITION_EDITOR_SAMPLE__ADVANCEDTABLECOMPOSITION_REQUIRED_PROPERTY);
 		createEReference(advancedTableCompositionEditorSampleEClass, ADVANCED_TABLE_COMPOSITION_EDITOR_SAMPLE__ADVANCEDTABLECOMPOSITION_OPTIONAL_PROPERTY);
 
+		flatReferencesTableSampleEClass = createEClass(FLAT_REFERENCES_TABLE_SAMPLE);
+		createEReference(flatReferencesTableSampleEClass, FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_REQUIRED_PROPERTY);
+		createEReference(flatReferencesTableSampleEClass, FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_OPTIONAL_PROPERTY);
+
 		// Create enums
 		enuM_SAMPLEEEnum = createEEnum(ENUM_SAMPLE);
 	}
@@ -949,6 +988,7 @@ public class EefnrPackageImpl extends EPackageImpl implements EefnrPackage {
 		advancedReferencesTableSampleEClass.getESuperTypes().add(this.getAbstractSample());
 		advancedEObjectFlatComboViewerSampleEClass.getESuperTypes().add(this.getAbstractSample());
 		advancedTableCompositionEditorSampleEClass.getESuperTypes().add(this.getAbstractSample());
+		flatReferencesTableSampleEClass.getESuperTypes().add(this.getAbstractSample());
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(rootEClass, Root.class, "Root", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1030,6 +1070,10 @@ public class EefnrPackageImpl extends EPackageImpl implements EefnrPackage {
 		initEReference(getAdvancedTableCompositionEditorSample_AdvancedtablecompositionRequiredProperty(), this.getTotalSample(), null, "advancedtablecompositionRequiredProperty", null, 1, -1, AdvancedTableCompositionEditorSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getAdvancedTableCompositionEditorSample_AdvancedtablecompositionOptionalProperty(), this.getTotalSample(), null, "advancedtablecompositionOptionalProperty", null, 0, -1, AdvancedTableCompositionEditorSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(flatReferencesTableSampleEClass, FlatReferencesTableSample.class, "FlatReferencesTableSample", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getFlatReferencesTableSample_FlatreferencestableRequiredProperty(), this.getTotalSample(), null, "flatreferencestableRequiredProperty", null, 1, -1, FlatReferencesTableSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getFlatReferencesTableSample_FlatreferencestableOptionalProperty(), this.getTotalSample(), null, "flatreferencestableOptionalProperty", null, 0, -1, FlatReferencesTableSample.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		// Initialize enums and add enum literals
 		initEEnum(enuM_SAMPLEEEnum, org.eclipse.emf.eef.eefnr.ENUM_SAMPLE.class, "ENUM_SAMPLE");
 		addEEnumLiteral(enuM_SAMPLEEEnum, org.eclipse.emf.eef.eefnr.ENUM_SAMPLE.LITERAL1);
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
new file mode 100644
index 000000000..fe115a493
--- /dev/null
+++ b/tests/org.eclipse.emf.eef.tests.nonreg/src/org/eclipse/emf/eef/eefnr/impl/FlatReferencesTableSampleImpl.java
@@ -0,0 +1,170 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: FlatReferencesTableSampleImpl.java,v 1.1 2010/02/02 09:29:38 nlepine Exp $
+ */
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Flat References Table Sample</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.eef.eefnr.impl.FlatReferencesTableSampleImpl#getFlatreferencestableRequiredProperty <em>Flatreferencestable Required Property</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.eefnr.impl.FlatReferencesTableSampleImpl#getFlatreferencestableOptionalProperty <em>Flatreferencestable Optional Property</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class FlatReferencesTableSampleImpl extends AbstractSampleImpl implements FlatReferencesTableSample {
+	/**
+	 * The cached value of the '{@link #getFlatreferencestableRequiredProperty() <em>Flatreferencestable Required Property</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFlatreferencestableRequiredProperty()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<TotalSample> flatreferencestableRequiredProperty;
+
+	/**
+	 * The cached value of the '{@link #getFlatreferencestableOptionalProperty() <em>Flatreferencestable Optional Property</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFlatreferencestableOptionalProperty()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<TotalSample> flatreferencestableOptionalProperty;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FlatReferencesTableSampleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return EefnrPackage.Literals.FLAT_REFERENCES_TABLE_SAMPLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<TotalSample> getFlatreferencestableRequiredProperty() {
+		if (flatreferencestableRequiredProperty == null) {
+			flatreferencestableRequiredProperty = new EObjectResolvingEList<TotalSample>(TotalSample.class, this, EefnrPackage.FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_REQUIRED_PROPERTY);
+		}
+		return flatreferencestableRequiredProperty;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<TotalSample> getFlatreferencestableOptionalProperty() {
+		if (flatreferencestableOptionalProperty == null) {
+			flatreferencestableOptionalProperty = new EObjectResolvingEList<TotalSample>(TotalSample.class, this, EefnrPackage.FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_OPTIONAL_PROPERTY);
+		}
+		return flatreferencestableOptionalProperty;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case EefnrPackage.FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_REQUIRED_PROPERTY:
+				return getFlatreferencestableRequiredProperty();
+			case EefnrPackage.FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_OPTIONAL_PROPERTY:
+				return getFlatreferencestableOptionalProperty();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case EefnrPackage.FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_REQUIRED_PROPERTY:
+				getFlatreferencestableRequiredProperty().clear();
+				getFlatreferencestableRequiredProperty().addAll((Collection<? extends TotalSample>)newValue);
+				return;
+			case EefnrPackage.FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_OPTIONAL_PROPERTY:
+				getFlatreferencestableOptionalProperty().clear();
+				getFlatreferencestableOptionalProperty().addAll((Collection<? extends TotalSample>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case EefnrPackage.FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_REQUIRED_PROPERTY:
+				getFlatreferencestableRequiredProperty().clear();
+				return;
+			case EefnrPackage.FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_OPTIONAL_PROPERTY:
+				getFlatreferencestableOptionalProperty().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case EefnrPackage.FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_REQUIRED_PROPERTY:
+				return flatreferencestableRequiredProperty != null && !flatreferencestableRequiredProperty.isEmpty();
+			case EefnrPackage.FLAT_REFERENCES_TABLE_SAMPLE__FLATREFERENCESTABLE_OPTIONAL_PROPERTY:
+				return flatreferencestableOptionalProperty != null && !flatreferencestableOptionalProperty.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //FlatReferencesTableSampleImpl
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 2c08ef712..076fd2628 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
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: EefnrAdapterFactory.java,v 1.1 2010/02/01 13:00:45 nlepine Exp $
+ * $Id: EefnrAdapterFactory.java,v 1.2 2010/02/02 09:29:38 nlepine Exp $
  */
 package org.eclipse.emf.eef.eefnr.util;
 
@@ -132,6 +132,10 @@ public class EefnrAdapterFactory extends AdapterFactoryImpl {
 				return createAdvancedTableCompositionEditorSampleAdapter();
 			}
 			@Override
+			public Adapter caseFlatReferencesTableSample(FlatReferencesTableSample object) {
+				return createFlatReferencesTableSampleAdapter();
+			}
+			@Override
 			public Adapter defaultCase(EObject object) {
 				return createEObjectAdapter();
 			}
@@ -362,6 +366,20 @@ public class EefnrAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.eef.eefnr.FlatReferencesTableSample <em>Flat References Table 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.FlatReferencesTableSample
+	 * @generated
+	 */
+	public Adapter createFlatReferencesTableSampleAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
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 9b4d4954b..3cc8d4824 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
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: EefnrSwitch.java,v 1.1 2010/02/01 13:00:45 nlepine Exp $
+ * $Id: EefnrSwitch.java,v 1.2 2010/02/02 09:29:38 nlepine Exp $
  */
 package org.eclipse.emf.eef.eefnr.util;
 
@@ -190,6 +190,13 @@ public class EefnrSwitch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case EefnrPackage.FLAT_REFERENCES_TABLE_SAMPLE: {
+				FlatReferencesTableSample flatReferencesTableSample = (FlatReferencesTableSample)theEObject;
+				T result = caseFlatReferencesTableSample(flatReferencesTableSample);
+				if (result == null) result = caseAbstractSample(flatReferencesTableSample);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -420,6 +427,21 @@ public class EefnrSwitch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Flat References Table 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>Flat References Table Sample</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFlatReferencesTableSample(FlatReferencesTableSample object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;