[Releng] Regenerate test models (and remove TestFeatureMap)

28 files changed, 92 insertions, 1141 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
index a5398d201a..55ba93d55e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model1; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -9,10 +9,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.tests.model1;version="3.1.0",
- org.eclipse.emf.cdo.tests.model1.impl;version="3.1.0",
- org.eclipse.emf.cdo.tests.model1.legacy;version="3.1.0",
- org.eclipse.emf.cdo.tests.model1.legacy.impl;version="3.1.0",
- org.eclipse.emf.cdo.tests.model1.legacy.util;version="3.1.0",
- org.eclipse.emf.cdo.tests.model1.util;version="3.1.0"
+Export-Package: org.eclipse.emf.cdo.tests.model1;version="3.1.1",
+ org.eclipse.emf.cdo.tests.model1.impl;version="3.1.1",
+ org.eclipse.emf.cdo.tests.model1.legacy;version="3.1.1",
+ org.eclipse.emf.cdo.tests.model1.legacy.impl;version="3.1.1",
+ org.eclipse.emf.cdo.tests.model1.legacy.util;version="3.1.1",
+ org.eclipse.emf.cdo.tests.model1.util;version="3.1.1"
 Automatic-Module-Name: org.eclipse.emf.cdo.tests.model1
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/pom.xml b/plugins/org.eclipse.emf.cdo.tests.model1/pom.xml
index 699ca00e3f..83afd5a2ca 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.tests.model1</artifactId>
-  <version>3.1.0-SNAPSHOT</version>
+  <version>3.1.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/AddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/AddressImpl.java
index 826ef27dc2..036ca2ea25 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/AddressImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/AddressImpl.java
@@ -130,9 +130,7 @@ public class AddressImpl extends EObjectImpl implements Address
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ADDRESS__NAME, oldName, name));
-    }
   }
 
   /**
@@ -155,9 +153,7 @@ public class AddressImpl extends EObjectImpl implements Address
     String oldStreet = street;
     street = newStreet;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ADDRESS__STREET, oldStreet, street));
-    }
   }
 
   /**
@@ -180,9 +176,7 @@ public class AddressImpl extends EObjectImpl implements Address
     String oldCity = city;
     city = newCity;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ADDRESS__CITY, oldCity, city));
-    }
   }
 
   /**
@@ -275,9 +269,7 @@ public class AddressImpl extends EObjectImpl implements Address
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuilder result = new StringBuilder(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java
index a0c733490f..6f4646abdb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java
@@ -269,9 +269,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
   {
     VAT result = VAT.get(initialValue);
     if (result == null)
-    {
       throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-    }
     return result;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java
index fd18186e3f..186fe8ef21 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java
@@ -671,9 +671,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
@@ -753,9 +751,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
@@ -768,14 +764,14 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    companyEClass.getESuperTypes().add(getAddress());
-    supplierEClass.getESuperTypes().add(getAddress());
-    customerEClass.getESuperTypes().add(getAddress());
-    purchaseOrderEClass.getESuperTypes().add(getOrder());
-    salesOrderEClass.getESuperTypes().add(getOrder());
-    orderAddressEClass.getESuperTypes().add(getAddress());
-    orderAddressEClass.getESuperTypes().add(getOrder());
-    orderAddressEClass.getESuperTypes().add(getOrderDetail());
+    companyEClass.getESuperTypes().add(this.getAddress());
+    supplierEClass.getESuperTypes().add(this.getAddress());
+    customerEClass.getESuperTypes().add(this.getAddress());
+    purchaseOrderEClass.getESuperTypes().add(this.getOrder());
+    salesOrderEClass.getESuperTypes().add(this.getOrder());
+    orderAddressEClass.getESuperTypes().add(this.getAddress());
+    orderAddressEClass.getESuperTypes().add(this.getOrder());
+    orderAddressEClass.getESuperTypes().add(this.getOrderDetail());
 
     // Initialize classes and features; add operations and parameters
     initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -787,74 +783,74 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
         !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(companyEClass, Company.class, "Company", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+    initEReference(getCompany_Categories(), this.getCategory(), null, "categories", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+    initEReference(getCompany_Suppliers(), this.getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+    initEReference(getCompany_Customers(), this.getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE,
+    initEReference(getCompany_PurchaseOrders(), this.getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE,
         IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+    initEReference(getCompany_SalesOrders(), this.getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(supplierEClass, Supplier.class, "Supplier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders", null, 0, -1, Supplier.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSupplier_PurchaseOrders(), this.getPurchaseOrder(), this.getPurchaseOrder_Supplier(), "purchaseOrders", null, 0, -1, Supplier.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1, Customer.class, !IS_TRANSIENT,
+    initEReference(getCustomer_SalesOrders(), this.getSalesOrder(), this.getSalesOrder_Customer(), "salesOrders", null, 0, -1, Customer.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCustomer_OrderByProduct(), getProductToOrder(), null, "orderByProduct", null, 0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE,
+    initEReference(getCustomer_OrderByProduct(), this.getProductToOrder(), null, "orderByProduct", null, 0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE,
         IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderEClass, Order.class, "Order", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null, 0, -1, Order.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrderDetail_Product(), getProduct1(), getProduct1_OrderDetails(), "product", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+    initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
         IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrderDetail_Product(), this.getProduct1(), this.getProduct1_OrderDetails(), "product", null, 0, 1, OrderDetail.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPurchaseOrder_SalesOrders(), getSalesOrder(), getSalesOrder_PurchaseOrders(), "salesOrders", null, 0, -1, PurchaseOrder.class,
+    initEReference(getPurchaseOrder_Supplier(), this.getSupplier(), this.getSupplier_PurchaseOrders(), "supplier", null, 1, 1, PurchaseOrder.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPurchaseOrder_SalesOrders(), this.getSalesOrder(), this.getSalesOrder_PurchaseOrders(), "salesOrders", null, 0, -1, PurchaseOrder.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
         !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSalesOrder_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_SalesOrders(), "purchaseOrders", null, 0, -1, SalesOrder.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSalesOrder_Customer(), this.getCustomer(), this.getCustomer_SalesOrders(), "customer", null, 1, 1, SalesOrder.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSalesOrder_PurchaseOrders(), this.getPurchaseOrder(), this.getPurchaseOrder_SalesOrders(), "purchaseOrders", null, 0, -1,
+        SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+    initEReference(getCategory_Categories(), this.getCategory(), null, "categories", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Products(), getProduct1(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+    initEReference(getCategory_Products(), this.getProduct1(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(product1EClass, Product1.class, "Product1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getProduct1_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getProduct1_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1, Product1.class, !IS_TRANSIENT,
+    initEReference(getProduct1_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Product(), "orderDetails", null, 0, -1, Product1.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct1_Vat(), getVAT(), "vat", "vat15", 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+    initEAttribute(getProduct1_Vat(), this.getVAT(), "vat", "vat15", 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct1_OtherVATs(), getVAT(), "otherVATs", "vat15", 0, -1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct1_OtherVATs(), this.getVAT(), "otherVATs", "vat15", 0, -1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getProduct1_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product1.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -863,9 +859,9 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
         IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(productToOrderEClass, Map.Entry.class, "ProductToOrder", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getProductToOrder_Key(), getProduct1(), null, "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getProductToOrder_Value(), getSalesOrder(), null, "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+    initEReference(getProductToOrder_Key(), this.getProduct1(), null, "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getProductToOrder_Value(), this.getSalesOrder(), null, "value", null, 0, 1, Map.Entry.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
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderDetailImpl.java
index ae63455020..a0a2e6fd2c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderDetailImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderDetailImpl.java
@@ -95,9 +95,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
   public Order getOrder()
   {
     if (eContainerFeatureID() != Model1Package.ORDER_DETAIL__ORDER)
-    {
       return null;
-    }
     return (Order)eContainer();
   }
 
@@ -109,9 +107,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
   public Order basicGetOrder()
   {
     if (eContainerFeatureID() != Model1Package.ORDER_DETAIL__ORDER)
-    {
       return null;
-    }
     return (Order)eInternalContainer();
   }
 
@@ -132,31 +128,21 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
   @Override
   public void setOrder(Order newOrder)
   {
-    if (newOrder != eInternalContainer() || eContainerFeatureID() != Model1Package.ORDER_DETAIL__ORDER && newOrder != null)
+    if (newOrder != eInternalContainer() || (eContainerFeatureID() != Model1Package.ORDER_DETAIL__ORDER && newOrder != null))
     {
       if (EcoreUtil.isAncestor(this, newOrder))
-      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
-      {
         msgs = eBasicRemoveFromContainer(msgs);
-      }
       if (newOrder != null)
-      {
         msgs = ((InternalEObject)newOrder).eInverseAdd(this, Model1Package.ORDER__ORDER_DETAILS, Order.class, msgs);
-      }
       msgs = basicSetOrder(newOrder, msgs);
       if (msgs != null)
-      {
         msgs.dispatch();
-      }
     }
     else if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__ORDER, newOrder, newOrder));
-    }
   }
 
   /**
@@ -173,9 +159,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
       if (product != oldProduct)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.ORDER_DETAIL__PRODUCT, oldProduct, product));
-        }
       }
     }
     return product;
@@ -202,13 +186,9 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
     {
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__PRODUCT, oldProduct, newProduct);
       if (msgs == null)
-      {
         msgs = notification;
-      }
       else
-      {
         msgs.add(notification);
-      }
     }
     return msgs;
   }
@@ -224,23 +204,15 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
     {
       NotificationChain msgs = null;
       if (product != null)
-      {
         msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs);
-      }
       if (newProduct != null)
-      {
         msgs = ((InternalEObject)newProduct).eInverseAdd(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs);
-      }
       msgs = basicSetProduct(newProduct, msgs);
       if (msgs != null)
-      {
         msgs.dispatch();
-      }
     }
     else if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__PRODUCT, newProduct, newProduct));
-    }
   }
 
   /**
@@ -263,9 +235,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
     float oldPrice = price;
     price = newPrice;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__PRICE, oldPrice, price));
-    }
   }
 
   /**
@@ -279,15 +249,11 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
     {
     case Model1Package.ORDER_DETAIL__ORDER:
       if (eInternalContainer() != null)
-      {
         msgs = eBasicRemoveFromContainer(msgs);
-      }
       return basicSetOrder((Order)otherEnd, msgs);
     case Model1Package.ORDER_DETAIL__PRODUCT:
       if (product != null)
-      {
         msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs);
-      }
       return basicSetProduct((Product1)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -336,15 +302,11 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
     {
     case Model1Package.ORDER_DETAIL__ORDER:
       if (resolve)
-      {
         return getOrder();
-      }
       return basicGetOrder();
     case Model1Package.ORDER_DETAIL__PRODUCT:
       if (resolve)
-      {
         return getProduct();
-      }
       return basicGetProduct();
     case Model1Package.ORDER_DETAIL__PRICE:
       return getPrice();
@@ -423,9 +385,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuilder result = new StringBuilder(super.toString());
     result.append(" (price: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/ProductToOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/ProductToOrderImpl.java
index 3a97106b5c..d73e024b08 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/ProductToOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/ProductToOrderImpl.java
@@ -90,9 +90,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P
       if (key != oldKey)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PRODUCT_TO_ORDER__KEY, oldKey, key));
-        }
       }
     }
     return key;
@@ -116,9 +114,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P
     Product1 oldKey = key;
     key = newKey;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PRODUCT_TO_ORDER__KEY, oldKey, key));
-    }
   }
 
   /**
@@ -134,9 +130,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P
       if (value != oldValue)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PRODUCT_TO_ORDER__VALUE, oldValue, value));
-        }
       }
     }
     return value;
@@ -160,9 +154,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P
     SalesOrder oldValue = value;
     value = newValue;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PRODUCT_TO_ORDER__VALUE, oldValue, value));
-    }
   }
 
   /**
@@ -176,15 +168,11 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P
     {
     case Model1Package.PRODUCT_TO_ORDER__KEY:
       if (resolve)
-      {
         return getTypedKey();
-      }
       return basicGetTypedKey();
     case Model1Package.PRODUCT_TO_ORDER__VALUE:
       if (resolve)
-      {
         return getTypedValue();
-      }
       return basicGetTypedValue();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -261,7 +249,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = theKey == null ? 0 : theKey.hashCode();
+      hash = (theKey == null ? 0 : theKey.hashCode());
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1Switch.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1Switch.java
index 5f96a0b2e2..7c17b0f9c1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1Switch.java
@@ -116,9 +116,7 @@ public class Model1Switch<T>
       Address address = (Address)theEObject;
       T result = caseAddress(address);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model1Package.COMPANY:
@@ -126,13 +124,9 @@ public class Model1Switch<T>
       Company company = (Company)theEObject;
       T result = caseCompany(company);
       if (result == null)
-      {
         result = caseAddress(company);
-      }
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model1Package.SUPPLIER:
@@ -140,13 +134,9 @@ public class Model1Switch<T>
       Supplier supplier = (Supplier)theEObject;
       T result = caseSupplier(supplier);
       if (result == null)
-      {
         result = caseAddress(supplier);
-      }
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model1Package.CUSTOMER:
@@ -154,13 +144,9 @@ public class Model1Switch<T>
       Customer customer = (Customer)theEObject;
       T result = caseCustomer(customer);
       if (result == null)
-      {
         result = caseAddress(customer);
-      }
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model1Package.ORDER:
@@ -168,9 +154,7 @@ public class Model1Switch<T>
       Order order = (Order)theEObject;
       T result = caseOrder(order);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model1Package.ORDER_DETAIL:
@@ -178,9 +162,7 @@ public class Model1Switch<T>
       OrderDetail orderDetail = (OrderDetail)theEObject;
       T result = caseOrderDetail(orderDetail);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model1Package.PURCHASE_ORDER:
@@ -188,13 +170,9 @@ public class Model1Switch<T>
       PurchaseOrder purchaseOrder = (PurchaseOrder)theEObject;
       T result = casePurchaseOrder(purchaseOrder);
       if (result == null)
-      {
         result = caseOrder(purchaseOrder);
-      }
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model1Package.SALES_ORDER:
@@ -202,13 +180,9 @@ public class Model1Switch<T>
       SalesOrder salesOrder = (SalesOrder)theEObject;
       T result = caseSalesOrder(salesOrder);
       if (result == null)
-      {
         result = caseOrder(salesOrder);
-      }
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model1Package.CATEGORY:
@@ -216,9 +190,7 @@ public class Model1Switch<T>
       Category category = (Category)theEObject;
       T result = caseCategory(category);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model1Package.PRODUCT1:
@@ -226,9 +198,7 @@ public class Model1Switch<T>
       Product1 product1 = (Product1)theEObject;
       T result = caseProduct1(product1);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model1Package.ORDER_ADDRESS:
@@ -236,21 +206,13 @@ public class Model1Switch<T>
       OrderAddress orderAddress = (OrderAddress)theEObject;
       T result = caseOrderAddress(orderAddress);
       if (result == null)
-      {
         result = caseAddress(orderAddress);
-      }
       if (result == null)
-      {
         result = caseOrder(orderAddress);
-      }
       if (result == null)
-      {
         result = caseOrderDetail(orderAddress);
-      }
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model1Package.PRODUCT_TO_ORDER:
@@ -259,9 +221,7 @@ public class Model1Switch<T>
       Map.Entry<Product1, SalesOrder> productToOrder = (Map.Entry<Product1, SalesOrder>)theEObject;
       T result = caseProductToOrder(productToOrder);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF
index a850bf5bf9..30e2f268ea 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model5;singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,10 +10,10 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.tests.model5;version="3.1.0",
- org.eclipse.emf.cdo.tests.model5.impl;version="3.1.0",
- org.eclipse.emf.cdo.tests.model5.legacy;version="3.1.0",
- org.eclipse.emf.cdo.tests.model5.legacy.impl;version="3.1.0",
- org.eclipse.emf.cdo.tests.model5.legacy.util;version="3.1.0",
- org.eclipse.emf.cdo.tests.model5.util;version="3.1.0"
+Export-Package: org.eclipse.emf.cdo.tests.model5;version="3.1.1",
+ org.eclipse.emf.cdo.tests.model5.impl;version="3.1.1",
+ org.eclipse.emf.cdo.tests.model5.legacy;version="3.1.1",
+ org.eclipse.emf.cdo.tests.model5.legacy.impl;version="3.1.1",
+ org.eclipse.emf.cdo.tests.model5.legacy.util;version="3.1.1",
+ org.eclipse.emf.cdo.tests.model5.util;version="3.1.1"
 Automatic-Module-Name: org.eclipse.emf.cdo.tests.model5
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.ecore b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.ecore
index 94c16bc3a0..217f924ec1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.ecore
@@ -2,26 +2,6 @@
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model5" nsURI="http://www.eclipse.org/emf/CDO/tests/model5/1.0.0"
     nsPrefix="model5">
-  <eClassifiers xsi:type="ecore:EClass" name="TestFeatureMap">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="managers" upperBound="-1"
-        eType="#//Manager" transient="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="group" value="#people"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="doctors" upperBound="-1"
-        eType="#//Doctor" transient="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="group" value="#people"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="people" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Manager"/>
   <eClassifiers xsi:type="ecore:EClass" name="Doctor"/>
   <eClassifiers xsi:type="ecore:EClass" name="GenListOfString">
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel
index 52681acc76..cb80ac17b8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel
@@ -14,11 +14,6 @@
       ecorePackage="model5.ecore#/">
     <genDataTypes ecoreDataType="model5.ecore#//IntArray"/>
     <genDataTypes ecoreDataType="model5.ecore#//CustomType"/>
-    <genClasses ecoreClass="model5.ecore#//TestFeatureMap">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model5.ecore#//TestFeatureMap/managers"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model5.ecore#//TestFeatureMap/doctors"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute model5.ecore#//TestFeatureMap/people"/>
-    </genClasses>
     <genClasses ecoreClass="model5.ecore#//Manager"/>
     <genClasses ecoreClass="model5.ecore#//Doctor"/>
     <genClasses ecoreClass="model5.ecore#//GenListOfString">
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.legacy.genmodel
index c13b047406..da892d7fc4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.legacy.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.legacy.genmodel
@@ -13,11 +13,6 @@
       ecorePackage="model5.ecore#/">
     <genDataTypes ecoreDataType="model5.ecore#//IntArray"/>
     <genDataTypes ecoreDataType="model5.ecore#//CustomType"/>
-    <genClasses ecoreClass="model5.ecore#//TestFeatureMap">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model5.ecore#//TestFeatureMap/managers"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model5.ecore#//TestFeatureMap/doctors"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute model5.ecore#//TestFeatureMap/people"/>
-    </genClasses>
     <genClasses ecoreClass="model5.ecore#//Manager"/>
     <genClasses ecoreClass="model5.ecore#//Doctor"/>
     <genClasses ecoreClass="model5.ecore#//GenListOfString">
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/pom.xml b/plugins/org.eclipse.emf.cdo.tests.model5/pom.xml
index 3324865482..1f7f9c36c5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.tests.model5</artifactId>
-  <version>3.1.0-SNAPSHOT</version>
+  <version>3.1.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Factory.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Factory.java
index 4a17d048c4..e2525a3697 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Factory.java
@@ -28,14 +28,6 @@ public interface Model5Factory extends EFactory
   Model5Factory eINSTANCE = org.eclipse.emf.cdo.tests.model5.impl.Model5FactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>Test Feature Map</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return a new object of class '<em>Test Feature Map</em>'.
-   * @generated
-   */
-  TestFeatureMap createTestFeatureMap();
-
-  /**
    * Returns a new object of class '<em>Manager</em>'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Manager</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java
index ea13d207f4..0261aab725 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java
@@ -60,48 +60,6 @@ public interface Model5Package extends EPackage
   Model5Package eINSTANCE = org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl.init();
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.TestFeatureMapImpl <em>Test Feature Map</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model5.impl.TestFeatureMapImpl
-   * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getTestFeatureMap()
-   * @generated
-   */
-  int TEST_FEATURE_MAP = 0;
-
-  /**
-   * The feature id for the '<em><b>Managers</b></em>' reference list.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TEST_FEATURE_MAP__MANAGERS = 0;
-
-  /**
-   * The feature id for the '<em><b>Doctors</b></em>' reference list.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TEST_FEATURE_MAP__DOCTORS = 1;
-
-  /**
-   * The feature id for the '<em><b>People</b></em>' attribute list.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TEST_FEATURE_MAP__PEOPLE = 2;
-
-  /**
-   * The number of structural features of the '<em>Test Feature Map</em>' class.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TEST_FEATURE_MAP_FEATURE_COUNT = 3;
-
-  /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.ManagerImpl <em>Manager</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
    *
@@ -109,7 +67,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getManager()
    * @generated
    */
-  int MANAGER = 1;
+  int MANAGER = 0;
 
   /**
    * The number of structural features of the '<em>Manager</em>' class.
@@ -127,7 +85,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getDoctor()
    * @generated
    */
-  int DOCTOR = 2;
+  int DOCTOR = 1;
 
   /**
    * The number of structural features of the '<em>Doctor</em>' class.
@@ -144,7 +102,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfInt()
    * @generated
    */
-  int GEN_LIST_OF_INT = 4;
+  int GEN_LIST_OF_INT = 3;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntegerImpl <em>Gen List Of Integer</em>}' class.
@@ -153,7 +111,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfInteger()
    * @generated
    */
-  int GEN_LIST_OF_INTEGER = 5;
+  int GEN_LIST_OF_INTEGER = 4;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfLongImpl <em>Gen List Of Long</em>}' class.
@@ -162,7 +120,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfLong()
    * @generated
    */
-  int GEN_LIST_OF_LONG = 6;
+  int GEN_LIST_OF_LONG = 5;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfBooleanImpl <em>Gen List Of Boolean</em>}' class.
@@ -171,7 +129,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfBoolean()
    * @generated
    */
-  int GEN_LIST_OF_BOOLEAN = 7;
+  int GEN_LIST_OF_BOOLEAN = 6;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfStringImpl <em>Gen List Of String</em>}' class.
@@ -180,7 +138,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfString()
    * @generated
    */
-  int GEN_LIST_OF_STRING = 3;
+  int GEN_LIST_OF_STRING = 2;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -274,7 +232,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfShort()
    * @generated
    */
-  int GEN_LIST_OF_SHORT = 8;
+  int GEN_LIST_OF_SHORT = 7;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -300,7 +258,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfFloat()
    * @generated
    */
-  int GEN_LIST_OF_FLOAT = 9;
+  int GEN_LIST_OF_FLOAT = 8;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -326,7 +284,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfDouble()
    * @generated
    */
-  int GEN_LIST_OF_DOUBLE = 10;
+  int GEN_LIST_OF_DOUBLE = 9;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -352,7 +310,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfDate()
    * @generated
    */
-  int GEN_LIST_OF_DATE = 11;
+  int GEN_LIST_OF_DATE = 10;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -378,7 +336,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfChar()
    * @generated
    */
-  int GEN_LIST_OF_CHAR = 12;
+  int GEN_LIST_OF_CHAR = 11;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -404,7 +362,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfIntArray()
    * @generated
    */
-  int GEN_LIST_OF_INT_ARRAY = 13;
+  int GEN_LIST_OF_INT_ARRAY = 12;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -431,7 +389,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getParent()
    * @generated
    */
-  int PARENT = 14;
+  int PARENT = 13;
 
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list.
@@ -477,7 +435,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getChild()
    * @generated
    */
-  int CHILD = 15;
+  int CHILD = 14;
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference.
@@ -523,7 +481,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getWithCustomType()
    * @generated
    */
-  int WITH_CUSTOM_TYPE = 16;
+  int WITH_CUSTOM_TYPE = 15;
 
   /**
    * The feature id for the '<em><b>Value</b></em>' attribute.
@@ -549,7 +507,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getIntArray()
    * @generated
    */
-  int INT_ARRAY = 17;
+  int INT_ARRAY = 16;
 
   /**
    * The meta object id for the '<em>Custom Type</em>' data type.
@@ -559,46 +517,7 @@ public interface Model5Package extends EPackage
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getCustomType()
    * @generated
    */
-  int CUSTOM_TYPE = 18;
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap <em>Test Feature Map</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for class '<em>Test Feature Map</em>'.
-   * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap
-   * @generated
-   */
-  EClass getTestFeatureMap();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getManagers <em>Managers</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>Managers</em>'.
-   * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getManagers()
-   * @see #getTestFeatureMap()
-   * @generated
-   */
-  EReference getTestFeatureMap_Managers();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getDoctors <em>Doctors</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>Doctors</em>'.
-   * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getDoctors()
-   * @see #getTestFeatureMap()
-   * @generated
-   */
-  EReference getTestFeatureMap_Doctors();
-
-  /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getPeople <em>People</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>People</em>'.
-   * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getPeople()
-   * @see #getTestFeatureMap()
-   * @generated
-   */
-  EAttribute getTestFeatureMap_People();
+  int CUSTOM_TYPE = 17;
 
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.Manager <em>Manager</em>}'. <!--
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java
deleted file mode 100644
index 7237c283f5..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2008-2012, 2015 Eike Stepper (Loehne, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.tests.model5;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Test Feature Map</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getManagers <em>Managers</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getDoctors <em>Doctors</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getPeople <em>People</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getTestFeatureMap()
- * @model
- * @generated
- */
-public interface TestFeatureMap extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Managers</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model5.Manager}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Managers</em>' containment reference list isn't clear, there really should be more of a
-   * description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Managers</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getTestFeatureMap_Managers()
-   * @model transient="true"
-   *        extendedMetaData="group='#people'"
-   * @generated
-   */
-  EList<Manager> getManagers();
-
-  /**
-   * Returns the value of the '<em><b>Doctors</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model5.Doctor}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Doctors</em>' containment reference list isn't clear, there really should be more of a
-   * description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Doctors</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getTestFeatureMap_Doctors()
-   * @model transient="true"
-   *        extendedMetaData="group='#people'"
-   * @generated
-   */
-  EList<Doctor> getDoctors();
-
-  /**
-   * Returns the value of the '<em><b>People</b></em>' attribute list.
-   * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>People</em>' attribute list isn't clear, there really should be more of a description
-   * here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>People</em>' attribute list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getTestFeatureMap_People()
-   * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-   *        extendedMetaData="kind='group'"
-   * @generated
-   */
-  FeatureMap getPeople();
-
-} // TestFeatureMap
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5FactoryImpl.java
index 14223c7581..5c2b4cd982 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5FactoryImpl.java
@@ -29,7 +29,6 @@ import org.eclipse.emf.cdo.tests.model5.Manager;
 import org.eclipse.emf.cdo.tests.model5.Model5Factory;
 import org.eclipse.emf.cdo.tests.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.Parent;
-import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 import org.eclipse.emf.cdo.tests.model5.WithCustomType;
 
 import org.eclipse.emf.ecore.EClass;
@@ -86,8 +85,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
   {
     switch (eClass.getClassifierID())
     {
-    case Model5Package.TEST_FEATURE_MAP:
-      return createTestFeatureMap();
     case Model5Package.MANAGER:
       return createManager();
     case Model5Package.DOCTOR:
@@ -166,17 +163,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
    * @generated
    */
   @Override
-  public TestFeatureMap createTestFeatureMap()
-  {
-    TestFeatureMapImpl testFeatureMap = new TestFeatureMapImpl();
-    return testFeatureMap;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
   public Manager createManager()
   {
     ManagerImpl manager = new ManagerImpl();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
index 8806420b56..baee1924ef 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
@@ -28,7 +28,6 @@ import org.eclipse.emf.cdo.tests.model5.Manager;
 import org.eclipse.emf.cdo.tests.model5.Model5Factory;
 import org.eclipse.emf.cdo.tests.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.Parent;
-import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 import org.eclipse.emf.cdo.tests.model5.WithCustomType;
 
 import org.eclipse.emf.ecore.EAttribute;
@@ -48,12 +47,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  private EClass testFeatureMapEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
   private EClass managerEClass = null;
 
   /**
@@ -231,46 +224,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
    * @generated
    */
   @Override
-  public EClass getTestFeatureMap()
-  {
-    return testFeatureMapEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EReference getTestFeatureMap_Managers()
-  {
-    return (EReference)testFeatureMapEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EReference getTestFeatureMap_Doctors()
-  {
-    return (EReference)testFeatureMapEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EAttribute getTestFeatureMap_People()
-  {
-    return (EAttribute)testFeatureMapEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
   public EClass getManager()
   {
     return managerEClass;
@@ -668,11 +621,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
     isCreated = true;
 
     // Create classes and their features
-    testFeatureMapEClass = createEClass(TEST_FEATURE_MAP);
-    createEReference(testFeatureMapEClass, TEST_FEATURE_MAP__MANAGERS);
-    createEReference(testFeatureMapEClass, TEST_FEATURE_MAP__DOCTORS);
-    createEAttribute(testFeatureMapEClass, TEST_FEATURE_MAP__PEOPLE);
-
     managerEClass = createEClass(MANAGER);
 
     doctorEClass = createEClass(DOCTOR);
@@ -760,14 +708,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
     // Add supertypes to classes
 
     // Initialize classes and features; add operations and parameters
-    initEClass(testFeatureMapEClass, TestFeatureMap.class, "TestFeatureMap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTestFeatureMap_Managers(), getManager(), null, "managers", null, 0, -1, TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTestFeatureMap_Doctors(), getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTestFeatureMap_People(), ecorePackage.getEFeatureMapEntry(), "people", null, 0, -1, TestFeatureMap.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
     initEClass(managerEClass, Manager.class, "Manager", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(doctorEClass, Doctor.class, "Doctor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -842,24 +782,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
     // Create resource
     createResource(eNS_URI);
-
-    // Create annotations
-    // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-    createExtendedMetaDataAnnotations();
-  }
-
-  /**
-   * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected void createExtendedMetaDataAnnotations()
-  {
-    String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
-    addAnnotation(getTestFeatureMap_Managers(), source, new String[] { "group", "#people" });
-    addAnnotation(getTestFeatureMap_Doctors(), source, new String[] { "group", "#people" });
-    addAnnotation(getTestFeatureMap_People(), source, new String[] { "kind", "group" });
   }
 
 } // Model5PackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java
deleted file mode 100644
index 1ec6c6bd5b..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.tests.model5.impl;
-
-import org.eclipse.emf.cdo.tests.model5.Doctor;
-import org.eclipse.emf.cdo.tests.model5.Manager;
-import org.eclipse.emf.cdo.tests.model5.Model5Package;
-import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
-
-import org.eclipse.emf.internal.cdo.CDOObjectImpl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Test Feature Map</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.TestFeatureMapImpl#getManagers <em>Managers</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.TestFeatureMapImpl#getDoctors <em>Doctors</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.TestFeatureMapImpl#getPeople <em>People</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected TestFeatureMapImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model5Package.eINSTANCE.getTestFeatureMap();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected int eStaticFeatureCount()
-  {
-    return 0;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  @SuppressWarnings("unchecked")
-  public EList<Manager> getManagers()
-  {
-    return (EList<Manager>)eGet(Model5Package.eINSTANCE.getTestFeatureMap_Managers(), true);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  @SuppressWarnings("unchecked")
-  public EList<Doctor> getDoctors()
-  {
-    return (EList<Doctor>)eGet(Model5Package.eINSTANCE.getTestFeatureMap_Doctors(), true);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @generated NOT
-   */
-  @Override
-  public FeatureMap getPeople()
-  {
-    return (FeatureMap)eGet(Model5Package.eINSTANCE.getTestFeatureMap_People(), true);
-  }
-
-} // TestFeatureMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Factory.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Factory.java
index 09b62d1b5e..ceb6587c70 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Factory.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
 import org.eclipse.emf.cdo.tests.model5.GenListOfString;
 import org.eclipse.emf.cdo.tests.model5.Manager;
 import org.eclipse.emf.cdo.tests.model5.Parent;
-import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 import org.eclipse.emf.cdo.tests.model5.WithCustomType;
 
 import org.eclipse.emf.ecore.EFactory;
@@ -49,15 +48,6 @@ public interface Model5Factory extends EFactory, org.eclipse.emf.cdo.tests.model
 
   @Override
   /**
-   * Returns a new object of class '<em>Test Feature Map</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return a new object of class '<em>Test Feature Map</em>'.
-   * @generated
-   */
-  TestFeatureMap createTestFeatureMap();
-
-  @Override
-  /**
    * Returns a new object of class '<em>Manager</em>'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Manager</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Package.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Package.java
index 20befaea33..b7d183b224 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Package.java
@@ -61,55 +61,13 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
   Model5Package eINSTANCE = org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl.init();
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.impl.TestFeatureMapImpl <em>Test Feature Map</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.TestFeatureMapImpl
-   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getTestFeatureMap()
-   * @generated
-   */
-  int TEST_FEATURE_MAP = 0;
-
-  /**
-   * The feature id for the '<em><b>Managers</b></em>' reference list.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TEST_FEATURE_MAP__MANAGERS = 0;
-
-  /**
-   * The feature id for the '<em><b>Doctors</b></em>' reference list.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TEST_FEATURE_MAP__DOCTORS = 1;
-
-  /**
-   * The feature id for the '<em><b>People</b></em>' attribute list.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TEST_FEATURE_MAP__PEOPLE = 2;
-
-  /**
-   * The number of structural features of the '<em>Test Feature Map</em>' class.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TEST_FEATURE_MAP_FEATURE_COUNT = 3;
-
-  /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.impl.ManagerImpl <em>Manager</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.ManagerImpl
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getManager()
    * @generated
    */
-  int MANAGER = 1;
+  int MANAGER = 0;
 
   /**
    * The number of structural features of the '<em>Manager</em>' class.
@@ -126,7 +84,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getDoctor()
    * @generated
    */
-  int DOCTOR = 2;
+  int DOCTOR = 1;
 
   /**
    * The number of structural features of the '<em>Doctor</em>' class.
@@ -143,7 +101,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfString()
    * @generated
    */
-  int GEN_LIST_OF_STRING = 3;
+  int GEN_LIST_OF_STRING = 2;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -169,7 +127,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfInt()
    * @generated
    */
-  int GEN_LIST_OF_INT = 4;
+  int GEN_LIST_OF_INT = 3;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -195,7 +153,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfInteger()
    * @generated
    */
-  int GEN_LIST_OF_INTEGER = 5;
+  int GEN_LIST_OF_INTEGER = 4;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -221,7 +179,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfLong()
    * @generated
    */
-  int GEN_LIST_OF_LONG = 6;
+  int GEN_LIST_OF_LONG = 5;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -247,7 +205,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfBoolean()
    * @generated
    */
-  int GEN_LIST_OF_BOOLEAN = 7;
+  int GEN_LIST_OF_BOOLEAN = 6;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -273,7 +231,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfShort()
    * @generated
    */
-  int GEN_LIST_OF_SHORT = 8;
+  int GEN_LIST_OF_SHORT = 7;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -299,7 +257,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfFloat()
    * @generated
    */
-  int GEN_LIST_OF_FLOAT = 9;
+  int GEN_LIST_OF_FLOAT = 8;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -325,7 +283,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfDouble()
    * @generated
    */
-  int GEN_LIST_OF_DOUBLE = 10;
+  int GEN_LIST_OF_DOUBLE = 9;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -351,7 +309,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfDate()
    * @generated
    */
-  int GEN_LIST_OF_DATE = 11;
+  int GEN_LIST_OF_DATE = 10;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -377,7 +335,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfChar()
    * @generated
    */
-  int GEN_LIST_OF_CHAR = 12;
+  int GEN_LIST_OF_CHAR = 11;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -403,7 +361,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfIntArray()
    * @generated
    */
-  int GEN_LIST_OF_INT_ARRAY = 13;
+  int GEN_LIST_OF_INT_ARRAY = 12;
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' attribute list.
@@ -430,7 +388,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getParent()
    * @generated
    */
-  int PARENT = 14;
+  int PARENT = 13;
 
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list.
@@ -476,7 +434,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getChild()
    * @generated
    */
-  int CHILD = 15;
+  int CHILD = 14;
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference.
@@ -522,7 +480,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getWithCustomType()
    * @generated
    */
-  int WITH_CUSTOM_TYPE = 16;
+  int WITH_CUSTOM_TYPE = 15;
 
   /**
    * The feature id for the '<em><b>Value</b></em>' attribute.
@@ -548,7 +506,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getIntArray()
    * @generated
    */
-  int INT_ARRAY = 17;
+  int INT_ARRAY = 16;
 
   /**
    * The meta object id for the '<em>Custom Type</em>' data type.
@@ -558,53 +516,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getCustomType()
    * @generated
    */
-  int CUSTOM_TYPE = 18;
-
-  @Override
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap <em>Test Feature Map</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for class '<em>Test Feature Map</em>'.
-   * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap
-   * @generated
-   */
-  EClass getTestFeatureMap();
-
-  @Override
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getManagers <em>Managers</em>}'.
-   * <!-- begin-user-doc
-   * --> <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>Managers</em>'.
-   * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getManagers()
-   * @see #getTestFeatureMap()
-   * @generated
-   */
-  EReference getTestFeatureMap_Managers();
-
-  @Override
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getDoctors <em>Doctors</em>}'.
-   * <!-- begin-user-doc
-   * --> <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>Doctors</em>'.
-   * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getDoctors()
-   * @see #getTestFeatureMap()
-   * @generated
-   */
-  EReference getTestFeatureMap_Doctors();
-
-  @Override
-  /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getPeople <em>People</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>People</em>'.
-   * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getPeople()
-   * @see #getTestFeatureMap()
-   * @generated
-   */
-  EAttribute getTestFeatureMap_People();
+  int CUSTOM_TYPE = 17;
 
   @Override
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5FactoryImpl.java
index bb6e352707..035e769bdd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5FactoryImpl.java
@@ -27,7 +27,6 @@ import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
 import org.eclipse.emf.cdo.tests.model5.GenListOfString;
 import org.eclipse.emf.cdo.tests.model5.Manager;
 import org.eclipse.emf.cdo.tests.model5.Parent;
-import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 import org.eclipse.emf.cdo.tests.model5.WithCustomType;
 import org.eclipse.emf.cdo.tests.model5.legacy.Model5Factory;
 import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
@@ -86,8 +85,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
   {
     switch (eClass.getClassifierID())
     {
-    case Model5Package.TEST_FEATURE_MAP:
-      return createTestFeatureMap();
     case Model5Package.MANAGER:
       return createManager();
     case Model5Package.DOCTOR:
@@ -166,17 +163,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
    * @generated
    */
   @Override
-  public TestFeatureMap createTestFeatureMap()
-  {
-    TestFeatureMapImpl testFeatureMap = new TestFeatureMapImpl();
-    return testFeatureMap;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
   public Manager createManager()
   {
     ManagerImpl manager = new ManagerImpl();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5PackageImpl.java
index f643a8cb77..8abfbb4610 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5PackageImpl.java
@@ -26,7 +26,6 @@ import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
 import org.eclipse.emf.cdo.tests.model5.GenListOfString;
 import org.eclipse.emf.cdo.tests.model5.Manager;
 import org.eclipse.emf.cdo.tests.model5.Parent;
-import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 import org.eclipse.emf.cdo.tests.model5.WithCustomType;
 import org.eclipse.emf.cdo.tests.model5.legacy.Model5Factory;
 import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
@@ -48,12 +47,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  private EClass testFeatureMapEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
   private EClass managerEClass = null;
 
   /**
@@ -231,46 +224,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
    * @generated
    */
   @Override
-  public EClass getTestFeatureMap()
-  {
-    return testFeatureMapEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EReference getTestFeatureMap_Managers()
-  {
-    return (EReference)testFeatureMapEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EReference getTestFeatureMap_Doctors()
-  {
-    return (EReference)testFeatureMapEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EAttribute getTestFeatureMap_People()
-  {
-    return (EAttribute)testFeatureMapEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
   public EClass getManager()
   {
     return managerEClass;
@@ -668,11 +621,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
     isCreated = true;
 
     // Create classes and their features
-    testFeatureMapEClass = createEClass(TEST_FEATURE_MAP);
-    createEReference(testFeatureMapEClass, TEST_FEATURE_MAP__MANAGERS);
-    createEReference(testFeatureMapEClass, TEST_FEATURE_MAP__DOCTORS);
-    createEAttribute(testFeatureMapEClass, TEST_FEATURE_MAP__PEOPLE);
-
     managerEClass = createEClass(MANAGER);
 
     doctorEClass = createEClass(DOCTOR);
@@ -760,14 +708,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
     // Add supertypes to classes
 
     // Initialize classes and features; add operations and parameters
-    initEClass(testFeatureMapEClass, TestFeatureMap.class, "TestFeatureMap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTestFeatureMap_Managers(), getManager(), null, "managers", null, 0, -1, TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTestFeatureMap_Doctors(), getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTestFeatureMap_People(), ecorePackage.getEFeatureMapEntry(), "people", null, 0, -1, TestFeatureMap.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
     initEClass(managerEClass, Manager.class, "Manager", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(doctorEClass, Doctor.class, "Doctor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -842,24 +782,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
     // Create resource
     createResource(eNS_URI);
-
-    // Create annotations
-    // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-    createExtendedMetaDataAnnotations();
-  }
-
-  /**
-   * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected void createExtendedMetaDataAnnotations()
-  {
-    String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
-    addAnnotation(getTestFeatureMap_Managers(), source, new String[] { "group", "#people" });
-    addAnnotation(getTestFeatureMap_Doctors(), source, new String[] { "group", "#people" });
-    addAnnotation(getTestFeatureMap_People(), source, new String[] { "kind", "group" });
   }
 
 } // Model5PackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/TestFeatureMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/TestFeatureMapImpl.java
deleted file mode 100644
index 37f4e14ef1..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/TestFeatureMapImpl.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, 2019 Eike Stepper (Loehne, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.tests.model5.legacy.impl;
-
-import org.eclipse.emf.cdo.tests.model5.Doctor;
-import org.eclipse.emf.cdo.tests.model5.Manager;
-import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
-import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
-
-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.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import java.util.Collection;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Test Feature Map</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl#getManagers <em>Managers</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl#getDoctors <em>Doctors</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl#getPeople <em>People</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
-{
-  /**
-   * The cached value of the '{@link #getManagers() <em>Managers</em>}' reference list.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @see #getManagers()
-   * @generated
-   * @ordered
-   */
-  protected EList<Manager> managers;
-
-  /**
-   * The cached value of the '{@link #getDoctors() <em>Doctors</em>}' reference list.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @see #getDoctors()
-   * @generated
-   * @ordered
-   */
-  protected EList<Doctor> doctors;
-
-  /**
-   * The cached value of the '{@link #getPeople() <em>People</em>}' attribute list.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @see #getPeople()
-   * @generated
-   * @ordered
-   */
-  protected FeatureMap people;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected TestFeatureMapImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model5Package.eINSTANCE.getTestFeatureMap();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EList<Manager> getManagers()
-  {
-    if (managers == null)
-    {
-      managers = new EObjectResolvingEList<>(Manager.class, this, Model5Package.TEST_FEATURE_MAP__MANAGERS);
-    }
-    return managers;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EList<Doctor> getDoctors()
-  {
-    if (doctors == null)
-    {
-      doctors = new EObjectResolvingEList<>(Doctor.class, this, Model5Package.TEST_FEATURE_MAP__DOCTORS);
-    }
-    return doctors;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public FeatureMap getPeople()
-  {
-    if (people == null)
-    {
-      people = new BasicFeatureMap(this, Model5Package.TEST_FEATURE_MAP__PEOPLE);
-    }
-    return people;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model5Package.TEST_FEATURE_MAP__PEOPLE:
-      return ((InternalEList<?>)getPeople()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Model5Package.TEST_FEATURE_MAP__MANAGERS:
-      return getManagers();
-    case Model5Package.TEST_FEATURE_MAP__DOCTORS:
-      return getDoctors();
-    case Model5Package.TEST_FEATURE_MAP__PEOPLE:
-      if (coreType)
-      {
-        return getPeople();
-      }
-      return ((FeatureMap.Internal)getPeople()).getWrapper();
-    }
-    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 Model5Package.TEST_FEATURE_MAP__MANAGERS:
-      getManagers().clear();
-      getManagers().addAll((Collection<? extends Manager>)newValue);
-      return;
-    case Model5Package.TEST_FEATURE_MAP__DOCTORS:
-      getDoctors().clear();
-      getDoctors().addAll((Collection<? extends Doctor>)newValue);
-      return;
-    case Model5Package.TEST_FEATURE_MAP__PEOPLE:
-      ((FeatureMap.Internal)getPeople()).set(newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model5Package.TEST_FEATURE_MAP__MANAGERS:
-      getManagers().clear();
-      return;
-    case Model5Package.TEST_FEATURE_MAP__DOCTORS:
-      getDoctors().clear();
-      return;
-    case Model5Package.TEST_FEATURE_MAP__PEOPLE:
-      getPeople().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model5Package.TEST_FEATURE_MAP__MANAGERS:
-      return managers != null && !managers.isEmpty();
-    case Model5Package.TEST_FEATURE_MAP__DOCTORS:
-      return doctors != null && !doctors.isEmpty();
-    case Model5Package.TEST_FEATURE_MAP__PEOPLE:
-      return people != null && !people.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuilder result = new StringBuilder(super.toString());
-    result.append(" (people: ");
-    result.append(people);
-    result.append(')');
-    return result.toString();
-  }
-
-} // TestFeatureMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5AdapterFactory.java
index e9834d1bfe..8de9626d99 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5AdapterFactory.java
@@ -26,7 +26,6 @@ import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
 import org.eclipse.emf.cdo.tests.model5.GenListOfString;
 import org.eclipse.emf.cdo.tests.model5.Manager;
 import org.eclipse.emf.cdo.tests.model5.Parent;
-import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 import org.eclipse.emf.cdo.tests.model5.WithCustomType;
 import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
@@ -98,12 +97,6 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   protected Model5Switch<Adapter> modelSwitch = new Model5Switch<Adapter>()
   {
     @Override
-    public Adapter caseTestFeatureMap(TestFeatureMap object)
-    {
-      return createTestFeatureMapAdapter();
-    }
-
-    @Override
     public Adapter caseManager(Manager object)
     {
       return createManagerAdapter();
@@ -221,21 +214,6 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap <em>Test Feature Map</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.cdo.tests.model5.TestFeatureMap
-   * @generated
-   */
-  public Adapter createTestFeatureMapAdapter()
-  {
-    return null;
-  }
-
-  /**
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.Manager <em>Manager</em>}'.
    * <!-- begin-user-doc -->
    * This default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5Switch.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5Switch.java
index 1d1b5815ea..365ce21d2b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5Switch.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
 import org.eclipse.emf.cdo.tests.model5.GenListOfString;
 import org.eclipse.emf.cdo.tests.model5.Manager;
 import org.eclipse.emf.cdo.tests.model5.Parent;
-import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 import org.eclipse.emf.cdo.tests.model5.WithCustomType;
 import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
@@ -116,16 +115,6 @@ public class Model5Switch<T>
   {
     switch (classifierID)
     {
-    case Model5Package.TEST_FEATURE_MAP:
-    {
-      TestFeatureMap testFeatureMap = (TestFeatureMap)theEObject;
-      T result = caseTestFeatureMap(testFeatureMap);
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
     case Model5Package.MANAGER:
     {
       Manager manager = (Manager)theEObject;
@@ -292,22 +281,6 @@ public class Model5Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Test Feature Map</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>Test Feature Map</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseTestFeatureMap(TestFeatureMap object)
-  {
-    return null;
-  }
-
-  /**
    * Returns the result of interpreting the object as an instance of '<em>Manager</em>'.
    * <!-- begin-user-doc -->
    * This implementation returns null;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5AdapterFactory.java
index 402c96daa3..31370232cd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5AdapterFactory.java
@@ -27,7 +27,6 @@ import org.eclipse.emf.cdo.tests.model5.GenListOfString;
 import org.eclipse.emf.cdo.tests.model5.Manager;
 import org.eclipse.emf.cdo.tests.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.Parent;
-import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 import org.eclipse.emf.cdo.tests.model5.WithCustomType;
 
 import org.eclipse.emf.common.notify.Adapter;
@@ -93,12 +92,6 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   protected Model5Switch<Adapter> modelSwitch = new Model5Switch<Adapter>()
   {
     @Override
-    public Adapter caseTestFeatureMap(TestFeatureMap object)
-    {
-      return createTestFeatureMapAdapter();
-    }
-
-    @Override
     public Adapter caseManager(Manager object)
     {
       return createManagerAdapter();
@@ -215,19 +208,6 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap <em>Test Feature Map</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.cdo.tests.model5.TestFeatureMap
-   * @generated
-   */
-  public Adapter createTestFeatureMapAdapter()
-  {
-    return null;
-  }
-
-  /**
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.Manager <em>Manager</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 -->
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
index 6fdb3caa0d..55cc33c54a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
@@ -26,7 +26,6 @@ import org.eclipse.emf.cdo.tests.model5.GenListOfString;
 import org.eclipse.emf.cdo.tests.model5.Manager;
 import org.eclipse.emf.cdo.tests.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.Parent;
-import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 import org.eclipse.emf.cdo.tests.model5.WithCustomType;
 
 import org.eclipse.emf.ecore.EClass;
@@ -106,16 +105,6 @@ public class Model5Switch<T>
   {
     switch (classifierID)
     {
-    case Model5Package.TEST_FEATURE_MAP:
-    {
-      TestFeatureMap testFeatureMap = (TestFeatureMap)theEObject;
-      T result = caseTestFeatureMap(testFeatureMap);
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
     case Model5Package.MANAGER:
     {
       Manager manager = (Manager)theEObject;
@@ -282,20 +271,6 @@ public class Model5Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Test Feature Map</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>Test Feature Map</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseTestFeatureMap(TestFeatureMap object)
-  {
-    return null;
-  }
-
-  /**
    * Returns the result of interpreting the object as an instance of '<em>Manager</em>'.
    * <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->