reformat

author: Eike Stepper 2010-02-03 10:38:13 +0000
committer: Eike Stepper 2010-02-03 10:38:13 +0000
commit: e05a518bfbe46e89accea237f1704892e7e5d66c (patch)
tree: 2e68d3279c911227dca6394a974cff6dec77c805
parent: da0577de6aa1c8829e8da7d59a5875cfb076b30c (diff)
download: cdo-e05a518bfbe46e89accea237f1704892e7e5d66c.tar.gz
cdo-e05a518bfbe46e89accea237f1704892e7e5d66c.tar.xz
cdo-e05a518bfbe46e89accea237f1704892e7e5d66c.zip
116 files changed, 2264 insertions, 2242 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDAndVersionAndBranch.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDAndVersionAndBranch.java
index 6b501d512d..c96ada2ec1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDAndVersionAndBranch.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDAndVersionAndBranch.java
@@ -10,7 +10,6 @@
  */
 package org.eclipse.emf.cdo.common.id;
 
-
 /**
  * @author Eike Stepper
  * @since 3.0
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java
index b531acb2a7..ae6d353ec9 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java
@@ -185,7 +185,7 @@ public class CDODBSchema extends DBSchema
   public static final String LIST_REVISION_VERSION_ADDED = "cdo_version_added"; //$NON-NLS-1$
 
   public static final String LIST_REVISION_VERSION_REMOVED = "cdo_version_removed"; //$NON-NLS-1$
-  
+
   public static final String LIST_REVISION_BRANCH = "cdo_branch"; //$NON-NLS-1$ 
 
   public static final String LIST_IDX = "cdo_idx"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java
index 9cdd95be3d..be8d8316c4 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java
@@ -300,12 +300,13 @@ public abstract class AbstractMappingStrategy extends Lifecycle implements IMapp
   public String getUnsettableFieldName(EStructuralFeature feature)
   {
     String name = DBAnnotation.COLUMN_NAME.getValue(feature);
-    if(name != null) {
-    	return CDO_SET_PREFIX + name;
+    if (name != null)
+    {
+      return CDO_SET_PREFIX + name;
     }
-    else 
+    else
     {
-    	return getName(CDO_SET_PREFIX + feature.getName(), TYPE_PREFIX_FEATURE + getMetaDataManager().getMetaID(feature),
+      return getName(CDO_SET_PREFIX + feature.getName(), TYPE_PREFIX_FEATURE + getMetaDataManager().getMetaID(feature),
           getMaxFieldNameLength());
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java
index 72a6cf6676..878047864a 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java
@@ -57,7 +57,7 @@ import java.util.Map;
 
 /**
  * This abstract base class provides basic behavior needed for mapping many-valued attributes to tables.
- *
+ * 
  * @author Eike Stepper
  * @since 3.0
  */
@@ -379,7 +379,7 @@ public abstract class AbstractFeatureMapTableMapping extends BasicAbstractListTa
 
   /**
    * Return the last (maximum) list index. (euals to size-1)
-   *
+   * 
    * @param accessor
    *          the accessor to use
    * @param revision
@@ -578,7 +578,7 @@ public abstract class AbstractFeatureMapTableMapping extends BasicAbstractListTa
 
   /**
    * Get column name (lazy)
-   *
+   * 
    * @param tag
    *          The feature's MetaID in CDO
    * @return the column name where the values are stored
@@ -597,7 +597,7 @@ public abstract class AbstractFeatureMapTableMapping extends BasicAbstractListTa
 
   /**
    * Get type mapping (lazy)
-   *
+   * 
    * @param tag
    *          The feature's MetaID in CDO
    * @return the corresponding type mapping
@@ -633,10 +633,9 @@ public abstract class AbstractFeatureMapTableMapping extends BasicAbstractListTa
     return getMappingStrategy().getStore().getMetaDataManager().getMetaID(feature);
   }
 
-
   /**
    * Used by subclasses to indicate which fields should be in the table. I.e. just a pair of name and DBType ...
-   *
+   * 
    * @author Stefan Winkler
    */
   protected static class FieldInfo
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java
index 88fd5fb0aa..f366faf64c 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java
@@ -107,7 +107,7 @@ public abstract class AbstractHorizontalClassMapping implements IClassMapping
     }
     else
     {
-    table.addIndex(IDBIndex.Type.UNIQUE, idField, versionField);
+      table.addIndex(IDBIndex.Type.UNIQUE, idField, versionField);
     }
 
     table.addIndex(IDBIndex.Type.NON_UNIQUE, idField, revisedField);
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java
index 803451e1bf..13b72dadca 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java
@@ -273,7 +273,7 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi
             stmt.setBoolean(isSetCol++, true);
           }
         }
-        
+
         mapping.setValueFromRevision(stmt, col++, revision);
       }
 
@@ -615,7 +615,7 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi
         typeMapping.setValue(stmt, col++, change.getElement2());
       }
     }
-    
+
     return col;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java
index 4c43f1581b..d817179119 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
@@ -38,7 +38,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated NOT
    */
   public static org.eclipse.emf.cdo.tests.mango.MangoFactory init()
@@ -65,7 +65,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public MangoFactoryImpl()
@@ -75,7 +75,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -96,7 +96,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -113,7 +113,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -130,7 +130,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public MangoValueList createMangoValueList()
@@ -141,7 +141,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public MangoValue createMangoValue()
@@ -152,7 +152,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public MangoParameter createMangoParameter()
@@ -163,7 +163,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ParameterPassing createParameterPassingFromString(EDataType eDataType, String initialValue)
@@ -177,7 +177,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String convertParameterPassingToString(EDataType eDataType, Object instanceValue)
@@ -187,7 +187,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public MangoPackage getMangoPackage()
@@ -197,7 +197,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java
index fe82f38dc2..4433a187af 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class MangoPackageImpl extends EPackageImpl implements MangoPackage
@@ -38,28 +38,28 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass mangoValueListEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass mangoValueEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass mangoParameterEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EEnum parameterPassingEEnum = null;
@@ -71,7 +71,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage#eNS_URI
    * @see #init()
@@ -84,7 +84,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private static boolean isInited = false;
@@ -95,7 +95,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
    * This method is used to initialize {@link MangoPackage#eINSTANCE} when that field is accessed. Clients should not
    * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -129,7 +129,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getMangoValueList()
@@ -139,7 +139,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getMangoValueList_Name()
@@ -149,7 +149,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getMangoValueList_Values()
@@ -159,7 +159,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getMangoValue()
@@ -169,7 +169,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getMangoValue_Name()
@@ -179,7 +179,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getMangoParameter()
@@ -189,7 +189,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getMangoParameter_Name()
@@ -199,7 +199,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getMangoParameter_Passing()
@@ -209,7 +209,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EEnum getParameterPassing()
@@ -219,7 +219,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public MangoFactory getMangoFactory()
@@ -229,7 +229,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private boolean isCreated = false;
@@ -237,7 +237,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
   /**
    * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
    * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void createPackageContents()
@@ -264,7 +264,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private boolean isInitialized = false;
@@ -272,7 +272,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
   /**
    * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
    * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void initializePackageContents()
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java
index fa4f624d1d..ddc8332083 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java
@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoParameterImpl#getPassing <em>Passing</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class MangoParameterImpl extends EObjectImpl implements MangoParameter
@@ -36,7 +36,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -45,7 +45,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -55,7 +55,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
   /**
    * The default value of the '{@link #getPassing() <em>Passing</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getPassing()
    * @generated
    * @ordered
@@ -65,7 +65,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
   /**
    * The cached value of the '{@link #getPassing() <em>Passing</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getPassing()
    * @generated
    * @ordered
@@ -74,7 +74,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected MangoParameterImpl()
@@ -84,7 +84,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -95,7 +95,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getName()
@@ -105,7 +105,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -118,7 +118,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ParameterPassing getPassing()
@@ -128,7 +128,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setPassing(ParameterPassing newPassing)
@@ -141,7 +141,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -159,7 +159,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -179,7 +179,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -199,7 +199,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -217,7 +217,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java
index 45419085fb..0f9a21662a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class MangoValueImpl extends EObjectImpl implements MangoValue
@@ -34,7 +34,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -43,7 +43,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -52,7 +52,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected MangoValueImpl()
@@ -62,7 +62,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -73,7 +73,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getName()
@@ -83,7 +83,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -96,7 +96,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -112,7 +112,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -129,7 +129,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -146,7 +146,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -162,7 +162,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java
index 9d52696265..7c01df0c02 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java
@@ -32,7 +32,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueListImpl#getValues <em>Values</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class MangoValueListImpl extends EObjectImpl implements MangoValueList
@@ -40,7 +40,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -49,7 +49,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -59,7 +59,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
   /**
    * The cached value of the '{@link #getValues() <em>Values</em>}' reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getValues()
    * @generated
    * @ordered
@@ -68,7 +68,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected MangoValueListImpl()
@@ -78,7 +78,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -89,7 +89,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getName()
@@ -99,7 +99,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -112,7 +112,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<MangoValue> getValues()
@@ -126,7 +126,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -144,7 +144,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -166,7 +166,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -186,7 +186,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -204,7 +204,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Factory.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Factory.java
index 92b821633f..ea20fd7533 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Factory.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model2.Model2Package
  * @generated
  */
@@ -29,14 +29,14 @@ public interface Model2Factory extends org.eclipse.emf.cdo.tests.model2.Model2Fa
 {
   /**
    * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   Model2Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2FactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>Special Purchase Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Special Purchase Order</em>'.
    * @generated
    */
@@ -44,7 +44,7 @@ public interface Model2Factory extends org.eclipse.emf.cdo.tests.model2.Model2Fa
 
   /**
    * Returns a new object of class '<em>Task Container</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Task Container</em>'.
    * @generated
    */
@@ -52,7 +52,7 @@ public interface Model2Factory extends org.eclipse.emf.cdo.tests.model2.Model2Fa
 
   /**
    * Returns a new object of class '<em>Task</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Task</em>'.
    * @generated
    */
@@ -60,7 +60,7 @@ public interface Model2Factory extends org.eclipse.emf.cdo.tests.model2.Model2Fa
 
   /**
    * Returns a new object of class '<em>Unsettable1</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Unsettable1</em>'.
    * @generated
    */
@@ -68,7 +68,7 @@ public interface Model2Factory extends org.eclipse.emf.cdo.tests.model2.Model2Fa
 
   /**
    * Returns a new object of class '<em>Unsettable2 With Default</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Unsettable2 With Default</em>'.
    * @generated
    */
@@ -76,7 +76,7 @@ public interface Model2Factory extends org.eclipse.emf.cdo.tests.model2.Model2Fa
 
   /**
    * Returns a new object of class '<em>Persistent Containment</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Persistent Containment</em>'.
    * @generated
    */
@@ -84,7 +84,7 @@ public interface Model2Factory extends org.eclipse.emf.cdo.tests.model2.Model2Fa
 
   /**
    * Returns a new object of class '<em>Transient Container</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Transient Container</em>'.
    * @generated
    */
@@ -92,7 +92,7 @@ public interface Model2Factory extends org.eclipse.emf.cdo.tests.model2.Model2Fa
 
   /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java
index 67a4d5c10d..e43f5bcc2e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model2.Model2Factory
  * @model kind="package"
  * @generated
@@ -34,28 +34,28 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 {
   /**
    * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   String eNAME = "model2";
 
   /**
    * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated NOT
    */
   String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model2/1.0.0";
 
   /**
    * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   String eNS_PREFIX = "model2";
 
   /**
    * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   Model2Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl.init();
@@ -63,7 +63,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.SpecialPurchaseOrderImpl
    * <em>Special Purchase Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.SpecialPurchaseOrderImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getSpecialPurchaseOrder()
    * @generated
@@ -73,7 +73,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -81,7 +81,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -89,7 +89,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Supplier</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -97,7 +97,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Discount Code</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -106,7 +106,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The feature id for the '<em><b>Shipping Address</b></em>' containment reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -115,7 +115,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The number of structural features of the '<em>Special Purchase Order</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -124,7 +124,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskContainerImpl
    * <em>Task Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskContainerImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTaskContainer()
    * @generated
@@ -134,7 +134,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The feature id for the '<em><b>Tasks</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -143,7 +143,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The number of structural features of the '<em>Task Container</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -152,7 +152,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl <em>Task</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTask()
    * @generated
@@ -162,7 +162,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The feature id for the '<em><b>Task Container</b></em>' container reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -170,7 +170,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Description</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -178,7 +178,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Done</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -186,7 +186,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The number of structural features of the '<em>Task</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -195,7 +195,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl
    * <em>Unsettable1</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl
    * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getUnsettable1()
    * @generated
@@ -205,7 +205,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The feature id for the '<em><b>Unsettable Boolean</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -213,7 +213,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Byte</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -221,7 +221,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Char</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -229,7 +229,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -237,7 +237,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Double</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -245,7 +245,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Float</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -253,7 +253,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Int</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -261,7 +261,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Long</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -269,7 +269,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Short</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -277,7 +277,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable String</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -285,7 +285,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable VAT</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -294,7 +294,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The number of structural features of the '<em>Unsettable1</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -303,7 +303,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl
    * <em>Unsettable2 With Default</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getUnsettable2WithDefault()
    * @generated
@@ -313,7 +313,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The feature id for the '<em><b>Unsettable Boolean</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -321,7 +321,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Byte</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -329,7 +329,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Char</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -337,7 +337,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -345,7 +345,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Double</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -353,7 +353,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Float</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -361,7 +361,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Int</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -369,7 +369,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Long</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -377,7 +377,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable Short</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -385,7 +385,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable String</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -393,7 +393,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Unsettable VAT</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -402,7 +402,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The number of structural features of the '<em>Unsettable2 With Default</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -411,7 +411,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl
    * <em>Persistent Containment</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getPersistentContainment()
    * @generated
@@ -420,7 +420,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Attr Before</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -429,7 +429,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -437,7 +437,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Attr After</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -446,7 +446,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The number of structural features of the '<em>Persistent Containment</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -455,7 +455,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl
    * <em>Transient Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTransientContainer()
    * @generated
@@ -464,7 +464,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Attr Before</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -472,7 +472,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -480,7 +480,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * The feature id for the '<em><b>Attr After</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -489,7 +489,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * The number of structural features of the '<em>Transient Container</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -498,7 +498,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.SpecialPurchaseOrder
    * <em>Special Purchase Order</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Special Purchase Order</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.SpecialPurchaseOrder
    * @generated
@@ -509,7 +509,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.SpecialPurchaseOrder#getDiscountCode <em>Discount Code</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Discount Code</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.SpecialPurchaseOrder#getDiscountCode()
    * @see #getSpecialPurchaseOrder()
@@ -521,7 +521,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the containment reference '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.SpecialPurchaseOrder#getShippingAddress <em>Shipping Address</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the containment reference '<em>Shipping Address</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.SpecialPurchaseOrder#getShippingAddress()
    * @see #getSpecialPurchaseOrder()
@@ -532,7 +532,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.TaskContainer
    * <em>Task Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Task Container</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.TaskContainer
    * @generated
@@ -543,7 +543,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.TaskContainer#getTasks <em>Tasks</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the containment reference list '<em>Tasks</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.TaskContainer#getTasks()
    * @see #getTaskContainer()
@@ -554,7 +554,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.Task <em>Task</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Task</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Task
    * @generated
@@ -565,7 +565,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the container reference '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Task#getTaskContainer <em>Task Container</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the container reference '<em>Task Container</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Task#getTaskContainer()
    * @see #getTask()
@@ -576,7 +576,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Task#getDescription
    * <em>Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Description</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Task#getDescription()
    * @see #getTask()
@@ -587,7 +587,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Task#isDone
    * <em>Done</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Done</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Task#isDone()
    * @see #getTask()
@@ -598,7 +598,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1 <em>Unsettable1</em>}
    * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Unsettable1</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1
    * @generated
@@ -609,7 +609,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#isUnsettableBoolean <em>Unsettable Boolean</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Boolean</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#isUnsettableBoolean()
    * @see #getUnsettable1()
@@ -621,7 +621,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableByte <em>Unsettable Byte</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Byte</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableByte()
    * @see #getUnsettable1()
@@ -633,7 +633,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableChar <em>Unsettable Char</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Char</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableChar()
    * @see #getUnsettable1()
@@ -645,7 +645,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableDate <em>Unsettable Date</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Date</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableDate()
    * @see #getUnsettable1()
@@ -657,7 +657,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableDouble <em>Unsettable Double</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Double</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableDouble()
    * @see #getUnsettable1()
@@ -669,7 +669,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableFloat <em>Unsettable Float</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Float</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableFloat()
    * @see #getUnsettable1()
@@ -681,7 +681,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableInt <em>Unsettable Int</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Int</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableInt()
    * @see #getUnsettable1()
@@ -693,7 +693,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableLong <em>Unsettable Long</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Long</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableLong()
    * @see #getUnsettable1()
@@ -705,7 +705,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableShort <em>Unsettable Short</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Short</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableShort()
    * @see #getUnsettable1()
@@ -717,7 +717,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableString <em>Unsettable String</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable String</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableString()
    * @see #getUnsettable1()
@@ -729,7 +729,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableVAT <em>Unsettable VAT</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable VAT</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableVAT()
    * @see #getUnsettable1()
@@ -740,7 +740,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault
    * <em>Unsettable2 With Default</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Unsettable2 With Default</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault
    * @generated
@@ -751,7 +751,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#isUnsettableBoolean
    * <em>Unsettable Boolean</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Boolean</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#isUnsettableBoolean()
    * @see #getUnsettable2WithDefault()
@@ -763,7 +763,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableByte <em>Unsettable Byte</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Byte</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableByte()
    * @see #getUnsettable2WithDefault()
@@ -775,7 +775,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableChar <em>Unsettable Char</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Char</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableChar()
    * @see #getUnsettable2WithDefault()
@@ -787,7 +787,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableDate <em>Unsettable Date</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Date</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableDate()
    * @see #getUnsettable2WithDefault()
@@ -799,7 +799,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableDouble
    * <em>Unsettable Double</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Double</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableDouble()
    * @see #getUnsettable2WithDefault()
@@ -811,7 +811,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableFloat <em>Unsettable Float</em>}
    * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Float</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableFloat()
    * @see #getUnsettable2WithDefault()
@@ -823,7 +823,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableInt <em>Unsettable Int</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Int</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableInt()
    * @see #getUnsettable2WithDefault()
@@ -835,7 +835,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableLong <em>Unsettable Long</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Long</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableLong()
    * @see #getUnsettable2WithDefault()
@@ -847,7 +847,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableShort <em>Unsettable Short</em>}
    * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable Short</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableShort()
    * @see #getUnsettable2WithDefault()
@@ -859,7 +859,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableString
    * <em>Unsettable String</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable String</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableString()
    * @see #getUnsettable2WithDefault()
@@ -871,7 +871,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableVAT <em>Unsettable VAT</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Unsettable VAT</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableVAT()
    * @see #getUnsettable2WithDefault()
@@ -882,7 +882,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment
    * <em>Persistent Containment</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Persistent Containment</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment
    * @generated
@@ -893,7 +893,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment#getAttrBefore <em>Attr Before</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Attr Before</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment#getAttrBefore()
    * @see #getPersistentContainment()
@@ -905,7 +905,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment#getChildren <em>Children</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the containment reference list '<em>Children</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment#getChildren()
    * @see #getPersistentContainment()
@@ -917,7 +917,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment#getAttrAfter <em>Attr After</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Attr After</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment#getAttrAfter()
    * @see #getPersistentContainment()
@@ -928,7 +928,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer
    * <em>Transient Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Transient Container</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer
    * @generated
@@ -939,7 +939,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer#getAttrBefore <em>Attr Before</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Attr Before</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer#getAttrBefore()
    * @see #getTransientContainer()
@@ -951,7 +951,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the container reference '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer#getParent <em>Parent</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the container reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer#getParent()
    * @see #getTransientContainer()
@@ -963,7 +963,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer#getAttrAfter <em>Attr After</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Attr After</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer#getAttrAfter()
    * @see #getTransientContainer()
@@ -973,7 +973,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
 
   /**
    * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -988,7 +988,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   interface Literals
@@ -996,7 +996,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.SpecialPurchaseOrderImpl
      * <em>Special Purchase Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.SpecialPurchaseOrderImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getSpecialPurchaseOrder()
      * @generated
@@ -1006,7 +1006,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Discount Code</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE = eINSTANCE.getSpecialPurchaseOrder_DiscountCode();
@@ -1014,7 +1014,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Shipping Address</b></em>' containment reference feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS = eINSTANCE.getSpecialPurchaseOrder_ShippingAddress();
@@ -1022,7 +1022,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskContainerImpl
      * <em>Task Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskContainerImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTaskContainer()
      * @generated
@@ -1032,7 +1032,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Tasks</b></em>' containment reference list feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference TASK_CONTAINER__TASKS = eINSTANCE.getTaskContainer_Tasks();
@@ -1040,7 +1040,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl <em>Task</em>}'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTask()
      * @generated
@@ -1050,7 +1050,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Task Container</b></em>' container reference feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference TASK__TASK_CONTAINER = eINSTANCE.getTask_TaskContainer();
@@ -1058,7 +1058,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Description</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute TASK__DESCRIPTION = eINSTANCE.getTask_Description();
@@ -1066,7 +1066,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Done</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute TASK__DONE = eINSTANCE.getTask_Done();
@@ -1074,7 +1074,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl
      * <em>Unsettable1</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl
      * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getUnsettable1()
      * @generated
@@ -1084,7 +1084,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Boolean</b></em>' attribute feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE1__UNSETTABLE_BOOLEAN = eINSTANCE.getUnsettable1_UnsettableBoolean();
@@ -1092,7 +1092,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Byte</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE1__UNSETTABLE_BYTE = eINSTANCE.getUnsettable1_UnsettableByte();
@@ -1100,7 +1100,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Char</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE1__UNSETTABLE_CHAR = eINSTANCE.getUnsettable1_UnsettableChar();
@@ -1108,7 +1108,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Date</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE1__UNSETTABLE_DATE = eINSTANCE.getUnsettable1_UnsettableDate();
@@ -1116,7 +1116,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Double</b></em>' attribute feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE1__UNSETTABLE_DOUBLE = eINSTANCE.getUnsettable1_UnsettableDouble();
@@ -1124,7 +1124,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Float</b></em>' attribute feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE1__UNSETTABLE_FLOAT = eINSTANCE.getUnsettable1_UnsettableFloat();
@@ -1132,7 +1132,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Int</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE1__UNSETTABLE_INT = eINSTANCE.getUnsettable1_UnsettableInt();
@@ -1140,7 +1140,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Long</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE1__UNSETTABLE_LONG = eINSTANCE.getUnsettable1_UnsettableLong();
@@ -1148,7 +1148,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Short</b></em>' attribute feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE1__UNSETTABLE_SHORT = eINSTANCE.getUnsettable1_UnsettableShort();
@@ -1156,7 +1156,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable String</b></em>' attribute feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE1__UNSETTABLE_STRING = eINSTANCE.getUnsettable1_UnsettableString();
@@ -1164,7 +1164,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable VAT</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE1__UNSETTABLE_VAT = eINSTANCE.getUnsettable1_UnsettableVAT();
@@ -1172,7 +1172,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl
      * <em>Unsettable2 With Default</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getUnsettable2WithDefault()
      * @generated
@@ -1182,7 +1182,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Boolean</b></em>' attribute feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN = eINSTANCE.getUnsettable2WithDefault_UnsettableBoolean();
@@ -1190,7 +1190,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Byte</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE = eINSTANCE.getUnsettable2WithDefault_UnsettableByte();
@@ -1198,7 +1198,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Char</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR = eINSTANCE.getUnsettable2WithDefault_UnsettableChar();
@@ -1206,7 +1206,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Date</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE = eINSTANCE.getUnsettable2WithDefault_UnsettableDate();
@@ -1214,7 +1214,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Double</b></em>' attribute feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE = eINSTANCE.getUnsettable2WithDefault_UnsettableDouble();
@@ -1222,7 +1222,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Float</b></em>' attribute feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT = eINSTANCE.getUnsettable2WithDefault_UnsettableFloat();
@@ -1230,7 +1230,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Int</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT = eINSTANCE.getUnsettable2WithDefault_UnsettableInt();
@@ -1238,7 +1238,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Long</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG = eINSTANCE.getUnsettable2WithDefault_UnsettableLong();
@@ -1246,7 +1246,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable Short</b></em>' attribute feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT = eINSTANCE.getUnsettable2WithDefault_UnsettableShort();
@@ -1254,7 +1254,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable String</b></em>' attribute feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING = eINSTANCE.getUnsettable2WithDefault_UnsettableString();
@@ -1262,7 +1262,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Unsettable VAT</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT = eINSTANCE.getUnsettable2WithDefault_UnsettableVAT();
@@ -1270,7 +1270,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl
      * <em>Persistent Containment</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getPersistentContainment()
      * @generated
@@ -1280,7 +1280,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Attr Before</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute PERSISTENT_CONTAINMENT__ATTR_BEFORE = eINSTANCE.getPersistentContainment_AttrBefore();
@@ -1288,7 +1288,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference PERSISTENT_CONTAINMENT__CHILDREN = eINSTANCE.getPersistentContainment_Children();
@@ -1296,7 +1296,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Attr After</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute PERSISTENT_CONTAINMENT__ATTR_AFTER = eINSTANCE.getPersistentContainment_AttrAfter();
@@ -1304,7 +1304,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl
      * <em>Transient Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTransientContainer()
      * @generated
@@ -1314,7 +1314,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Attr Before</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute TRANSIENT_CONTAINER__ATTR_BEFORE = eINSTANCE.getTransientContainer_AttrBefore();
@@ -1322,7 +1322,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference TRANSIENT_CONTAINER__PARENT = eINSTANCE.getTransientContainer_Parent();
@@ -1330,7 +1330,7 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     /**
      * The meta object literal for the '<em><b>Attr After</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute TRANSIENT_CONTAINER__ATTR_AFTER = eINSTANCE.getTransientContainer_AttrAfter();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2FactoryImpl.java
index 9d49d9344f..82fb42ba2e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2FactoryImpl.java
@@ -28,14 +28,14 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
 {
   /**
    * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated NOT
    */
   public static Model2Factory init()
@@ -58,7 +58,7 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
 
   /**
    * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Model2FactoryImpl()
@@ -68,7 +68,7 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -97,7 +97,7 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public SpecialPurchaseOrder createSpecialPurchaseOrder()
@@ -108,7 +108,7 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public TaskContainer createTaskContainer()
@@ -119,7 +119,7 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Task createTask()
@@ -130,7 +130,7 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Unsettable1 createUnsettable1()
@@ -141,7 +141,7 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Unsettable2WithDefault createUnsettable2WithDefault()
@@ -152,7 +152,7 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public PersistentContainment createPersistentContainment()
@@ -163,7 +163,7 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public TransientContainer createTransientContainer()
@@ -174,7 +174,7 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Model2Package getModel2Package()
@@ -184,7 +184,7 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java
index aa7f1624bf..d9504db2ae 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java
@@ -29,56 +29,56 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class Model2PackageImpl extends EPackageImpl implements Model2Package
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass specialPurchaseOrderEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass taskContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass taskEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass unsettable1EClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass unsettable2WithDefaultEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass persistentContainmentEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass transientContainerEClass = null;
@@ -90,7 +90,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Model2Package#eNS_URI
    * @see #init()
@@ -103,7 +103,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private static boolean isInited = false;
@@ -114,7 +114,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
    * This method is used to initialize {@link Model2Package#eINSTANCE} when that field is accessed. Clients should not
    * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -151,7 +151,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getSpecialPurchaseOrder()
@@ -161,7 +161,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getSpecialPurchaseOrder_DiscountCode()
@@ -171,7 +171,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getSpecialPurchaseOrder_ShippingAddress()
@@ -181,7 +181,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getTaskContainer()
@@ -191,7 +191,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getTaskContainer_Tasks()
@@ -201,7 +201,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getTask()
@@ -211,7 +211,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getTask_TaskContainer()
@@ -221,7 +221,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getTask_Description()
@@ -231,7 +231,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getTask_Done()
@@ -241,7 +241,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getUnsettable1()
@@ -251,7 +251,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable1_UnsettableBoolean()
@@ -261,7 +261,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable1_UnsettableByte()
@@ -271,7 +271,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable1_UnsettableChar()
@@ -281,7 +281,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable1_UnsettableDate()
@@ -291,7 +291,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable1_UnsettableDouble()
@@ -301,7 +301,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable1_UnsettableFloat()
@@ -311,7 +311,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable1_UnsettableInt()
@@ -321,7 +321,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable1_UnsettableLong()
@@ -331,7 +331,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable1_UnsettableShort()
@@ -341,7 +341,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable1_UnsettableString()
@@ -351,7 +351,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable1_UnsettableVAT()
@@ -361,7 +361,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getUnsettable2WithDefault()
@@ -371,7 +371,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable2WithDefault_UnsettableBoolean()
@@ -381,7 +381,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable2WithDefault_UnsettableByte()
@@ -391,7 +391,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable2WithDefault_UnsettableChar()
@@ -401,7 +401,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable2WithDefault_UnsettableDate()
@@ -411,7 +411,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable2WithDefault_UnsettableDouble()
@@ -421,7 +421,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable2WithDefault_UnsettableFloat()
@@ -431,7 +431,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable2WithDefault_UnsettableInt()
@@ -441,7 +441,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable2WithDefault_UnsettableLong()
@@ -451,7 +451,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable2WithDefault_UnsettableShort()
@@ -461,7 +461,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable2WithDefault_UnsettableString()
@@ -471,7 +471,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getUnsettable2WithDefault_UnsettableVAT()
@@ -481,7 +481,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getPersistentContainment()
@@ -491,7 +491,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getPersistentContainment_AttrBefore()
@@ -501,7 +501,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getPersistentContainment_Children()
@@ -511,7 +511,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getPersistentContainment_AttrAfter()
@@ -521,7 +521,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getTransientContainer()
@@ -531,7 +531,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getTransientContainer_AttrBefore()
@@ -541,7 +541,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getTransientContainer_Parent()
@@ -551,7 +551,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getTransientContainer_AttrAfter()
@@ -561,7 +561,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Model2Factory getModel2Factory()
@@ -571,7 +571,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private boolean isCreated = false;
@@ -579,7 +579,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   /**
    * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
    * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void createPackageContents()
@@ -640,7 +640,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private boolean isInitialized = false;
@@ -648,7 +648,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   /**
    * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
    * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void initializePackageContents()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java
index f7acdc0343..9af57bfba1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java
@@ -38,7 +38,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl#getAttrAfter <em>Attr After</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class PersistentContainmentImpl extends EObjectImpl implements PersistentContainment
@@ -46,7 +46,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
   /**
    * The default value of the '{@link #getAttrBefore() <em>Attr Before</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getAttrBefore()
    * @generated
    * @ordered
@@ -56,7 +56,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
   /**
    * The cached value of the '{@link #getAttrBefore() <em>Attr Before</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getAttrBefore()
    * @generated
    * @ordered
@@ -66,7 +66,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
   /**
    * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getChildren()
    * @generated
    * @ordered
@@ -76,7 +76,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
   /**
    * The default value of the '{@link #getAttrAfter() <em>Attr After</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getAttrAfter()
    * @generated
    * @ordered
@@ -86,7 +86,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
   /**
    * The cached value of the '{@link #getAttrAfter() <em>Attr After</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getAttrAfter()
    * @generated
    * @ordered
@@ -95,7 +95,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected PersistentContainmentImpl()
@@ -105,7 +105,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -116,7 +116,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getAttrBefore()
@@ -126,7 +126,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setAttrBefore(String newAttrBefore)
@@ -140,7 +140,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<TransientContainer> getChildren()
@@ -155,7 +155,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getAttrAfter()
@@ -165,7 +165,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setAttrAfter(String newAttrAfter)
@@ -179,7 +179,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -196,7 +196,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -212,7 +212,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -232,7 +232,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -257,7 +257,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -280,7 +280,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -300,7 +300,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java
index 8c7525135e..9d1b910200 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java
@@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * Address</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements SpecialPurchaseOrder
@@ -41,7 +41,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
   /**
    * The default value of the '{@link #getDiscountCode() <em>Discount Code</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getDiscountCode()
    * @generated
    * @ordered
@@ -51,7 +51,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
   /**
    * The cached value of the '{@link #getDiscountCode() <em>Discount Code</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getDiscountCode()
    * @generated
    * @ordered
@@ -61,7 +61,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
   /**
    * The cached value of the '{@link #getShippingAddress() <em>Shipping Address</em>}' containment reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getShippingAddress()
    * @generated
    * @ordered
@@ -70,7 +70,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected SpecialPurchaseOrderImpl()
@@ -80,7 +80,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -91,7 +91,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getDiscountCode()
@@ -101,7 +101,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setDiscountCode(String newDiscountCode)
@@ -115,7 +115,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Address getShippingAddress()
@@ -125,7 +125,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetShippingAddress(Address newShippingAddress, NotificationChain msgs)
@@ -146,7 +146,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setShippingAddress(Address newShippingAddress)
@@ -171,7 +171,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -187,7 +187,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -205,7 +205,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -225,7 +225,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -245,7 +245,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -263,7 +263,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskContainerImpl.java
index b878f76346..76f5ffdd14 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskContainerImpl.java
@@ -32,7 +32,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskContainerImpl#getTasks <em>Tasks</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class TaskContainerImpl extends EObjectImpl implements TaskContainer
@@ -40,7 +40,7 @@ public class TaskContainerImpl extends EObjectImpl implements TaskContainer
   /**
    * The cached value of the '{@link #getTasks() <em>Tasks</em>}' containment reference list. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getTasks()
    * @generated
    * @ordered
@@ -49,7 +49,7 @@ public class TaskContainerImpl extends EObjectImpl implements TaskContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected TaskContainerImpl()
@@ -59,7 +59,7 @@ public class TaskContainerImpl extends EObjectImpl implements TaskContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -70,7 +70,7 @@ public class TaskContainerImpl extends EObjectImpl implements TaskContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<Task> getTasks()
@@ -85,7 +85,7 @@ public class TaskContainerImpl extends EObjectImpl implements TaskContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -102,7 +102,7 @@ public class TaskContainerImpl extends EObjectImpl implements TaskContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -118,7 +118,7 @@ public class TaskContainerImpl extends EObjectImpl implements TaskContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -134,7 +134,7 @@ public class TaskContainerImpl extends EObjectImpl implements TaskContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -153,7 +153,7 @@ public class TaskContainerImpl extends EObjectImpl implements TaskContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -170,7 +170,7 @@ public class TaskContainerImpl extends EObjectImpl implements TaskContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java
index 9406949c9c..a1ce01f1c1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java
@@ -32,7 +32,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl#isDone <em>Done</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class TaskImpl extends EObjectImpl implements Task
@@ -40,7 +40,7 @@ public class TaskImpl extends EObjectImpl implements Task
   /**
    * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getDescription()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class TaskImpl extends EObjectImpl implements Task
   /**
    * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getDescription()
    * @generated
    * @ordered
@@ -59,7 +59,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * The default value of the '{@link #isDone() <em>Done</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #isDone()
    * @generated
    * @ordered
@@ -68,7 +68,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * The cached value of the '{@link #isDone() <em>Done</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #isDone()
    * @generated
    * @ordered
@@ -77,7 +77,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected TaskImpl()
@@ -87,7 +87,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -98,7 +98,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public TaskContainer getTaskContainer()
@@ -110,7 +110,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetTaskContainer(TaskContainer newTaskContainer, NotificationChain msgs)
@@ -121,7 +121,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setTaskContainer(TaskContainer newTaskContainer)
@@ -148,7 +148,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getDescription()
@@ -158,7 +158,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setDescription(String newDescription)
@@ -172,7 +172,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isDone()
@@ -182,7 +182,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setDone(boolean newDone)
@@ -195,7 +195,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -213,7 +213,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -229,7 +229,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -245,7 +245,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -265,7 +265,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -288,7 +288,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -311,7 +311,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -331,7 +331,7 @@ public class TaskImpl extends EObjectImpl implements Task
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java
index 35bfe33c22..2ad3c528fc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java
@@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl#getAttrAfter <em>Attr After</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class TransientContainerImpl extends EObjectImpl implements TransientContainer
@@ -41,7 +41,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
   /**
    * The default value of the '{@link #getAttrBefore() <em>Attr Before</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getAttrBefore()
    * @generated
    * @ordered
@@ -51,7 +51,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
   /**
    * The cached value of the '{@link #getAttrBefore() <em>Attr Before</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getAttrBefore()
    * @generated
    * @ordered
@@ -61,7 +61,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
   /**
    * The default value of the '{@link #getAttrAfter() <em>Attr After</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getAttrAfter()
    * @generated
    * @ordered
@@ -71,7 +71,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
   /**
    * The cached value of the '{@link #getAttrAfter() <em>Attr After</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getAttrAfter()
    * @generated
    * @ordered
@@ -80,7 +80,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected TransientContainerImpl()
@@ -90,7 +90,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -101,7 +101,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getAttrBefore()
@@ -111,7 +111,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setAttrBefore(String newAttrBefore)
@@ -125,7 +125,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public PersistentContainment getParent()
@@ -137,7 +137,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetParent(PersistentContainment newParent, NotificationChain msgs)
@@ -148,7 +148,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setParent(PersistentContainment newParent)
@@ -175,7 +175,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getAttrAfter()
@@ -185,7 +185,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setAttrAfter(String newAttrAfter)
@@ -199,7 +199,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -217,7 +217,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -233,7 +233,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -250,7 +250,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -270,7 +270,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -293,7 +293,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -316,7 +316,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -336,7 +336,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java
index 1f012ba71b..373595c203 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java
@@ -44,7 +44,7 @@ import java.util.Date;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl#getUnsettableVAT <em>Unsettable VAT</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class Unsettable1Impl extends EObjectImpl implements Unsettable1
@@ -52,7 +52,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The default value of the '{@link #isUnsettableBoolean() <em>Unsettable Boolean</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #isUnsettableBoolean()
    * @generated
    * @ordered
@@ -62,7 +62,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The cached value of the '{@link #isUnsettableBoolean() <em>Unsettable Boolean</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #isUnsettableBoolean()
    * @generated
    * @ordered
@@ -71,7 +71,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * This is true if the Unsettable Boolean attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -80,7 +80,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The default value of the '{@link #getUnsettableByte() <em>Unsettable Byte</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableByte()
    * @generated
    * @ordered
@@ -90,7 +90,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The cached value of the '{@link #getUnsettableByte() <em>Unsettable Byte</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableByte()
    * @generated
    * @ordered
@@ -99,7 +99,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * This is true if the Unsettable Byte attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -108,7 +108,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The default value of the '{@link #getUnsettableChar() <em>Unsettable Char</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableChar()
    * @generated
    * @ordered
@@ -118,7 +118,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The cached value of the '{@link #getUnsettableChar() <em>Unsettable Char</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableChar()
    * @generated
    * @ordered
@@ -127,7 +127,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * This is true if the Unsettable Char attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -136,7 +136,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The default value of the '{@link #getUnsettableDate() <em>Unsettable Date</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableDate()
    * @generated
    * @ordered
@@ -146,7 +146,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The cached value of the '{@link #getUnsettableDate() <em>Unsettable Date</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableDate()
    * @generated
    * @ordered
@@ -155,7 +155,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * This is true if the Unsettable Date attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -164,7 +164,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The default value of the '{@link #getUnsettableDouble() <em>Unsettable Double</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableDouble()
    * @generated
    * @ordered
@@ -174,7 +174,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The cached value of the '{@link #getUnsettableDouble() <em>Unsettable Double</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableDouble()
    * @generated
    * @ordered
@@ -183,7 +183,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * This is true if the Unsettable Double attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -192,7 +192,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The default value of the '{@link #getUnsettableFloat() <em>Unsettable Float</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableFloat()
    * @generated
    * @ordered
@@ -202,7 +202,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The cached value of the '{@link #getUnsettableFloat() <em>Unsettable Float</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableFloat()
    * @generated
    * @ordered
@@ -211,7 +211,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * This is true if the Unsettable Float attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -220,7 +220,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The default value of the '{@link #getUnsettableInt() <em>Unsettable Int</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableInt()
    * @generated
    * @ordered
@@ -230,7 +230,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The cached value of the '{@link #getUnsettableInt() <em>Unsettable Int</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableInt()
    * @generated
    * @ordered
@@ -239,7 +239,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * This is true if the Unsettable Int attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -248,7 +248,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The default value of the '{@link #getUnsettableLong() <em>Unsettable Long</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableLong()
    * @generated
    * @ordered
@@ -258,7 +258,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The cached value of the '{@link #getUnsettableLong() <em>Unsettable Long</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableLong()
    * @generated
    * @ordered
@@ -267,7 +267,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * This is true if the Unsettable Long attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -276,7 +276,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The default value of the '{@link #getUnsettableShort() <em>Unsettable Short</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableShort()
    * @generated
    * @ordered
@@ -286,7 +286,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The cached value of the '{@link #getUnsettableShort() <em>Unsettable Short</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableShort()
    * @generated
    * @ordered
@@ -295,7 +295,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * This is true if the Unsettable Short attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -304,7 +304,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The default value of the '{@link #getUnsettableString() <em>Unsettable String</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableString()
    * @generated
    * @ordered
@@ -314,7 +314,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The cached value of the '{@link #getUnsettableString() <em>Unsettable String</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableString()
    * @generated
    * @ordered
@@ -323,7 +323,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * This is true if the Unsettable String attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -332,7 +332,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The default value of the '{@link #getUnsettableVAT() <em>Unsettable VAT</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableVAT()
    * @generated
    * @ordered
@@ -342,7 +342,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The cached value of the '{@link #getUnsettableVAT() <em>Unsettable VAT</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableVAT()
    * @generated
    * @ordered
@@ -351,7 +351,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * This is true if the Unsettable VAT attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -359,7 +359,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected Unsettable1Impl()
@@ -369,7 +369,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -380,7 +380,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isUnsettableBoolean()
@@ -390,7 +390,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableBoolean(boolean newUnsettableBoolean)
@@ -406,7 +406,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableBoolean()
@@ -422,7 +422,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableBoolean()
@@ -432,7 +432,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public byte getUnsettableByte()
@@ -442,7 +442,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableByte(byte newUnsettableByte)
@@ -458,7 +458,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableByte()
@@ -474,7 +474,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableByte()
@@ -484,7 +484,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public char getUnsettableChar()
@@ -494,7 +494,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableChar(char newUnsettableChar)
@@ -510,7 +510,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableChar()
@@ -526,7 +526,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableChar()
@@ -536,7 +536,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Date getUnsettableDate()
@@ -546,7 +546,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableDate(Date newUnsettableDate)
@@ -562,7 +562,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableDate()
@@ -578,7 +578,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableDate()
@@ -588,7 +588,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public double getUnsettableDouble()
@@ -598,7 +598,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableDouble(double newUnsettableDouble)
@@ -614,7 +614,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableDouble()
@@ -630,7 +630,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableDouble()
@@ -640,7 +640,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public float getUnsettableFloat()
@@ -650,7 +650,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableFloat(float newUnsettableFloat)
@@ -666,7 +666,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableFloat()
@@ -682,7 +682,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableFloat()
@@ -692,7 +692,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public int getUnsettableInt()
@@ -702,7 +702,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableInt(int newUnsettableInt)
@@ -718,7 +718,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableInt()
@@ -734,7 +734,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableInt()
@@ -744,7 +744,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public long getUnsettableLong()
@@ -754,7 +754,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableLong(long newUnsettableLong)
@@ -770,7 +770,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableLong()
@@ -786,7 +786,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableLong()
@@ -796,7 +796,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public short getUnsettableShort()
@@ -806,7 +806,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableShort(short newUnsettableShort)
@@ -822,7 +822,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableShort()
@@ -838,7 +838,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableShort()
@@ -848,7 +848,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getUnsettableString()
@@ -858,7 +858,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableString(String newUnsettableString)
@@ -874,7 +874,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableString()
@@ -890,7 +890,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableString()
@@ -900,7 +900,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public VAT getUnsettableVAT()
@@ -910,7 +910,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableVAT(VAT newUnsettableVAT)
@@ -926,7 +926,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableVAT()
@@ -942,7 +942,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableVAT()
@@ -952,7 +952,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -988,7 +988,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -1035,7 +1035,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -1082,7 +1082,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -1118,7 +1118,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java
index a2e7ef05c4..4cd54c9bad 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java
@@ -53,7 +53,7 @@ import java.util.Date;
  * VAT</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettable2WithDefault
@@ -61,7 +61,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The default value of the '{@link #isUnsettableBoolean() <em>Unsettable Boolean</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #isUnsettableBoolean()
    * @generated
    * @ordered
@@ -71,7 +71,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The cached value of the '{@link #isUnsettableBoolean() <em>Unsettable Boolean</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #isUnsettableBoolean()
    * @generated
    * @ordered
@@ -80,7 +80,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * This is true if the Unsettable Boolean attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -89,7 +89,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The default value of the '{@link #getUnsettableByte() <em>Unsettable Byte</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableByte()
    * @generated
    * @ordered
@@ -99,7 +99,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The cached value of the '{@link #getUnsettableByte() <em>Unsettable Byte</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableByte()
    * @generated
    * @ordered
@@ -108,7 +108,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * This is true if the Unsettable Byte attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -117,7 +117,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The default value of the '{@link #getUnsettableChar() <em>Unsettable Char</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableChar()
    * @generated
    * @ordered
@@ -127,7 +127,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The cached value of the '{@link #getUnsettableChar() <em>Unsettable Char</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableChar()
    * @generated
    * @ordered
@@ -136,7 +136,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * This is true if the Unsettable Char attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -145,7 +145,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The default value of the '{@link #getUnsettableDate() <em>Unsettable Date</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableDate()
    * @generated
    * @ordered
@@ -156,7 +156,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The cached value of the '{@link #getUnsettableDate() <em>Unsettable Date</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableDate()
    * @generated
    * @ordered
@@ -165,7 +165,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * This is true if the Unsettable Date attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -174,7 +174,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The default value of the '{@link #getUnsettableDouble() <em>Unsettable Double</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableDouble()
    * @generated
    * @ordered
@@ -184,7 +184,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The cached value of the '{@link #getUnsettableDouble() <em>Unsettable Double</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableDouble()
    * @generated
    * @ordered
@@ -193,7 +193,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * This is true if the Unsettable Double attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -202,7 +202,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The default value of the '{@link #getUnsettableFloat() <em>Unsettable Float</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableFloat()
    * @generated
    * @ordered
@@ -212,7 +212,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The cached value of the '{@link #getUnsettableFloat() <em>Unsettable Float</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableFloat()
    * @generated
    * @ordered
@@ -221,7 +221,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * This is true if the Unsettable Float attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -230,7 +230,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The default value of the '{@link #getUnsettableInt() <em>Unsettable Int</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableInt()
    * @generated
    * @ordered
@@ -240,7 +240,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The cached value of the '{@link #getUnsettableInt() <em>Unsettable Int</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableInt()
    * @generated
    * @ordered
@@ -249,7 +249,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * This is true if the Unsettable Int attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -258,7 +258,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The default value of the '{@link #getUnsettableLong() <em>Unsettable Long</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableLong()
    * @generated
    * @ordered
@@ -268,7 +268,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The cached value of the '{@link #getUnsettableLong() <em>Unsettable Long</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableLong()
    * @generated
    * @ordered
@@ -277,7 +277,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * This is true if the Unsettable Long attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -286,7 +286,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The default value of the '{@link #getUnsettableShort() <em>Unsettable Short</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableShort()
    * @generated
    * @ordered
@@ -296,7 +296,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The cached value of the '{@link #getUnsettableShort() <em>Unsettable Short</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableShort()
    * @generated
    * @ordered
@@ -305,7 +305,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * This is true if the Unsettable Short attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -314,7 +314,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The default value of the '{@link #getUnsettableString() <em>Unsettable String</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableString()
    * @generated
    * @ordered
@@ -324,7 +324,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The cached value of the '{@link #getUnsettableString() <em>Unsettable String</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableString()
    * @generated
    * @ordered
@@ -333,7 +333,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * This is true if the Unsettable String attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -342,7 +342,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The default value of the '{@link #getUnsettableVAT() <em>Unsettable VAT</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableVAT()
    * @generated
    * @ordered
@@ -352,7 +352,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The cached value of the '{@link #getUnsettableVAT() <em>Unsettable VAT</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getUnsettableVAT()
    * @generated
    * @ordered
@@ -361,7 +361,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * This is true if the Unsettable VAT attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -369,7 +369,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected Unsettable2WithDefaultImpl()
@@ -379,7 +379,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -390,7 +390,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isUnsettableBoolean()
@@ -400,7 +400,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableBoolean(boolean newUnsettableBoolean)
@@ -416,7 +416,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableBoolean()
@@ -433,7 +433,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableBoolean()
@@ -443,7 +443,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public byte getUnsettableByte()
@@ -453,7 +453,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableByte(byte newUnsettableByte)
@@ -469,7 +469,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableByte()
@@ -485,7 +485,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableByte()
@@ -495,7 +495,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public char getUnsettableChar()
@@ -505,7 +505,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableChar(char newUnsettableChar)
@@ -521,7 +521,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableChar()
@@ -537,7 +537,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableChar()
@@ -547,7 +547,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Date getUnsettableDate()
@@ -557,7 +557,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableDate(Date newUnsettableDate)
@@ -573,7 +573,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableDate()
@@ -589,7 +589,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableDate()
@@ -599,7 +599,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public double getUnsettableDouble()
@@ -609,7 +609,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableDouble(double newUnsettableDouble)
@@ -625,7 +625,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableDouble()
@@ -642,7 +642,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableDouble()
@@ -652,7 +652,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public float getUnsettableFloat()
@@ -662,7 +662,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableFloat(float newUnsettableFloat)
@@ -678,7 +678,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableFloat()
@@ -694,7 +694,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableFloat()
@@ -704,7 +704,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public int getUnsettableInt()
@@ -714,7 +714,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableInt(int newUnsettableInt)
@@ -730,7 +730,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableInt()
@@ -746,7 +746,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableInt()
@@ -756,7 +756,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public long getUnsettableLong()
@@ -766,7 +766,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableLong(long newUnsettableLong)
@@ -782,7 +782,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableLong()
@@ -798,7 +798,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableLong()
@@ -808,7 +808,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public short getUnsettableShort()
@@ -818,7 +818,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableShort(short newUnsettableShort)
@@ -834,7 +834,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableShort()
@@ -850,7 +850,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableShort()
@@ -860,7 +860,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getUnsettableString()
@@ -870,7 +870,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableString(String newUnsettableString)
@@ -886,7 +886,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableString()
@@ -903,7 +903,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableString()
@@ -913,7 +913,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public VAT getUnsettableVAT()
@@ -923,7 +923,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setUnsettableVAT(VAT newUnsettableVAT)
@@ -939,7 +939,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetUnsettableVAT()
@@ -955,7 +955,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetUnsettableVAT()
@@ -965,7 +965,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -1001,7 +1001,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -1048,7 +1048,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -1095,7 +1095,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -1131,7 +1131,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java
index 5f1706d967..d949e54b1e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java
@@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model2.Model2Package
  * @generated
  */
@@ -37,14 +37,14 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
 {
   /**
    * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected static Model2Package modelPackage;
 
   /**
    * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Model2AdapterFactory()
@@ -59,7 +59,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
    * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   *
+   * 
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -79,7 +79,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
 
   /**
    * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected Model2Switch<Adapter> modelSwitch = new Model2Switch<Adapter>()
@@ -147,7 +147,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
 
   /**
    * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @param target
    *          the object to adapt.
    * @return the adapter for the <code>target</code>.
@@ -164,7 +164,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
    * <em>Special Purchase Order</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.legacy.model2.SpecialPurchaseOrder
    * @generated
@@ -178,7 +178,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.TaskContainer
    * <em>Task Container</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.legacy.model2.TaskContainer
    * @generated
@@ -192,7 +192,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.Task <em>Task</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.legacy.model2.Task
    * @generated
@@ -206,7 +206,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1
    * <em>Unsettable1</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.legacy.model2.Unsettable1
    * @generated
@@ -221,7 +221,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
    * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault <em>Unsettable2 With Default</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.legacy.model2.Unsettable2WithDefault
    * @generated
@@ -236,7 +236,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
    * <em>Persistent Containment</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.legacy.model2.PersistentContainment
    * @generated
@@ -251,7 +251,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
    * <em>Transient Container</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.legacy.model2.TransientContainer
    * @generated
@@ -265,7 +265,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Order <em>Order</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.legacy.model1.Order
    * @generated
@@ -279,7 +279,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder
    * <em>Purchase Order</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.legacy.model1.PurchaseOrder
    * @generated
@@ -292,7 +292,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
   /**
    * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   *
+   * 
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java
index d37deb2c79..1e7f9ef13b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java
@@ -31,7 +31,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model2.Model2Package
  * @generated
  */
@@ -39,14 +39,14 @@ public class Model2Switch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected static Model2Package modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Model2Switch()
@@ -60,7 +60,7 @@ public class Model2Switch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -72,7 +72,7 @@ public class Model2Switch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -92,7 +92,7 @@ public class Model2Switch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -169,7 +169,7 @@ public class Model2Switch<T>
    * Returns the result of interpreting the object as an instance of '<em>Special Purchase Order</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>Special Purchase Order</em>'.
@@ -184,7 +184,7 @@ public class Model2Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Task Container</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>Task Container</em>'.
@@ -199,7 +199,7 @@ public class Model2Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Task</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>Task</em>'.
@@ -214,7 +214,7 @@ public class Model2Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Unsettable1</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>Unsettable1</em>'.
@@ -230,7 +230,7 @@ public class Model2Switch<T>
    * Returns the result of interpreting the object as an instance of '<em>Unsettable2 With Default</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>Unsettable2 With Default</em>'.
@@ -246,7 +246,7 @@ public class Model2Switch<T>
    * Returns the result of interpreting the object as an instance of '<em>Persistent Containment</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>Persistent Containment</em>'.
@@ -261,7 +261,7 @@ public class Model2Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Transient Container</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>Transient Container</em>'.
@@ -276,7 +276,7 @@ public class Model2Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Order</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>Order</em>'.
@@ -291,7 +291,7 @@ public class Model2Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Purchase Order</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>Purchase Order</em>'.
@@ -307,7 +307,7 @@ public class Model2Switch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   *
+   * 
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Factory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Factory.java
index 26ae2c8412..684c809595 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Factory.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.tests.model3.MetaRef;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package
  * @generated
  */
@@ -24,14 +24,14 @@ public interface Model3Factory extends org.eclipse.emf.cdo.tests.model3.Model3Fa
 {
   /**
    * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   Model3Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3FactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>Class1</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Class1</em>'.
    * @generated
    */
@@ -39,7 +39,7 @@ public interface Model3Factory extends org.eclipse.emf.cdo.tests.model3.Model3Fa
 
   /**
    * Returns a new object of class '<em>Meta Ref</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Meta Ref</em>'.
    * @generated
    */
@@ -47,7 +47,7 @@ public interface Model3Factory extends org.eclipse.emf.cdo.tests.model3.Model3Fa
 
   /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java
index d0d54c0ed2..f50795de9c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory
  * @model kind="package"
  * @generated
@@ -31,28 +31,28 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
 {
   /**
    * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   String eNAME = "model3";
 
   /**
    * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated NOT
    */
   String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model3/1.0.0";
 
   /**
    * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   String eNS_PREFIX = "model3";
 
   /**
    * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   Model3Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl.init();
@@ -60,7 +60,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl <em>Class1</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl
    * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getClass1()
    * @generated
@@ -69,7 +69,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
 
   /**
    * The feature id for the '<em><b>Class2</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -77,7 +77,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
 
   /**
    * The number of structural features of the '<em>Class1</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -86,7 +86,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl <em>Meta Ref</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getMetaRef()
    * @generated
@@ -95,7 +95,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
 
   /**
    * The feature id for the '<em><b>EPackage Ref</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -103,7 +103,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
 
   /**
    * The number of structural features of the '<em>Meta Ref</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -112,7 +112,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1 <em>Class1</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Class1</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model3.Class1
    * @generated
@@ -122,7 +122,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
   /**
    * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1#getClass2
    * <em>Class2</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference list '<em>Class2</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model3.Class1#getClass2()
    * @see #getClass1()
@@ -133,7 +133,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef <em>Meta Ref</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Meta Ref</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model3.MetaRef
    * @generated
@@ -143,7 +143,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
   /**
    * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEPackageRef
    * <em>EPackage Ref</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference '<em>EPackage Ref</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEPackageRef()
    * @see #getMetaRef()
@@ -153,7 +153,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
 
   /**
    * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -168,7 +168,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   interface Literals
@@ -176,7 +176,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl <em>Class1</em>}'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl
      * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getClass1()
      * @generated
@@ -186,7 +186,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
     /**
      * The meta object literal for the '<em><b>Class2</b></em>' reference list feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference CLASS1__CLASS2 = eINSTANCE.getClass1_Class2();
@@ -194,7 +194,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl
      * <em>Meta Ref</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getMetaRef()
      * @generated
@@ -204,7 +204,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa
     /**
      * The meta object literal for the '<em><b>EPackage Ref</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference META_REF__EPACKAGE_REF = eINSTANCE.getMetaRef_EPackageRef();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java
index 269f5705de..6837d39b32 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java
@@ -33,7 +33,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl#getClass2 <em>Class2</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class Class1Impl extends EObjectImpl implements Class1
@@ -41,7 +41,7 @@ public class Class1Impl extends EObjectImpl implements Class1
   /**
    * The cached value of the '{@link #getClass2() <em>Class2</em>}' reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getClass2()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class Class1Impl extends EObjectImpl implements Class1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected Class1Impl()
@@ -60,7 +60,7 @@ public class Class1Impl extends EObjectImpl implements Class1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -71,7 +71,7 @@ public class Class1Impl extends EObjectImpl implements Class1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<Class2> getClass2()
@@ -86,7 +86,7 @@ public class Class1Impl extends EObjectImpl implements Class1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetClass2()
@@ -97,7 +97,7 @@ public class Class1Impl extends EObjectImpl implements Class1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetClass2()
@@ -107,7 +107,7 @@ public class Class1Impl extends EObjectImpl implements Class1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -124,7 +124,7 @@ public class Class1Impl extends EObjectImpl implements Class1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -140,7 +140,7 @@ public class Class1Impl extends EObjectImpl implements Class1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -156,7 +156,7 @@ public class Class1Impl extends EObjectImpl implements Class1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -175,7 +175,7 @@ public class Class1Impl extends EObjectImpl implements Class1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -192,7 +192,7 @@ public class Class1Impl extends EObjectImpl implements Class1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java
index 55ab26fe16..34596e57e4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java
@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl#getEPackageRef <em>EPackage Ref</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class MetaRefImpl extends EObjectImpl implements MetaRef
@@ -36,7 +36,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
   /**
    * The cached value of the '{@link #getEPackageRef() <em>EPackage Ref</em>}' reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getEPackageRef()
    * @generated
    * @ordered
@@ -45,7 +45,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected MetaRefImpl()
@@ -55,7 +55,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -66,7 +66,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EPackage getEPackageRef()
@@ -87,7 +87,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EPackage basicGetEPackageRef()
@@ -97,7 +97,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setEPackageRef(EPackage newEPackageRef)
@@ -111,7 +111,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -129,7 +129,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -146,7 +146,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -163,7 +163,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3FactoryImpl.java
index 6d38ab830c..7edb3bf774 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3FactoryImpl.java
@@ -23,14 +23,14 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory
 {
   /**
    * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated NOT
    */
   public static Model3Factory init()
@@ -53,7 +53,7 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory
 
   /**
    * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Model3FactoryImpl()
@@ -63,7 +63,7 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -82,7 +82,7 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Class1 createClass1()
@@ -93,7 +93,7 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public MetaRef createMetaRef()
@@ -104,7 +104,7 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Model3Package getModel3Package()
@@ -114,7 +114,7 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java
index 04c09bcbad..be3b93e3be 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java
@@ -25,21 +25,21 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class Model3PackageImpl extends EPackageImpl implements Model3Package
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass class1EClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass metaRefEClass = null;
@@ -51,7 +51,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package#eNS_URI
    * @see #init()
@@ -64,7 +64,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private static boolean isInited = false;
@@ -75,7 +75,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
    * This method is used to initialize {@link Model3Package#eINSTANCE} when that field is accessed. Clients should not
    * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -119,7 +119,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getClass1()
@@ -129,7 +129,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getClass1_Class2()
@@ -139,7 +139,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getMetaRef()
@@ -149,7 +149,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getMetaRef_EPackageRef()
@@ -159,7 +159,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Model3Factory getModel3Factory()
@@ -169,7 +169,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private boolean isCreated = false;
@@ -177,7 +177,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   /**
    * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
    * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void createPackageContents()
@@ -196,7 +196,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private boolean isInitialized = false;
@@ -204,7 +204,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   /**
    * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
    * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void initializePackageContents()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackageFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackageFactory.java
index f05f9fa80e..c4a9936633 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackageFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackageFactory.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage
  * @generated
  */
@@ -23,14 +23,14 @@ public interface SubpackageFactory extends org.eclipse.emf.cdo.tests.model3.subp
 {
   /**
    * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   SubpackageFactory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackageFactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>Class2</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Class2</em>'.
    * @generated
    */
@@ -38,7 +38,7 @@ public interface SubpackageFactory extends org.eclipse.emf.cdo.tests.model3.subp
 
   /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackagePackage.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackagePackage.java
index b7d551a973..d68bcf649f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackagePackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackagePackage.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackageFactory
  * @model kind="package"
  * @generated
@@ -31,28 +31,28 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp
 {
   /**
    * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   String eNAME = "subpackage";
 
   /**
    * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated NOT
    */
   String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/subpackage/1.0.0";
 
   /**
    * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   String eNS_PREFIX = "subpackage";
 
   /**
    * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   SubpackagePackage eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackagePackageImpl.init();
@@ -60,7 +60,7 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl
    * <em>Class2</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl
    * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackagePackageImpl#getClass2()
    * @generated
@@ -69,7 +69,7 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp
 
   /**
    * The feature id for the '<em><b>Class1</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -77,7 +77,7 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp
 
   /**
    * The number of structural features of the '<em>Class2</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -86,7 +86,7 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2
    * <em>Class2</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Class2</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2
    * @generated
@@ -97,7 +97,7 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2#getClass1 <em>Class1</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference list '<em>Class1</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2#getClass1()
    * @see #getClass2()
@@ -107,7 +107,7 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp
 
   /**
    * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -122,7 +122,7 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   interface Literals
@@ -130,7 +130,7 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl
      * <em>Class2</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl
      * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackagePackageImpl#getClass2()
      * @generated
@@ -140,7 +140,7 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp
     /**
      * The meta object literal for the '<em><b>Class1</b></em>' reference list feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference CLASS2__CLASS1 = eINSTANCE.getClass2_Class1();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/Class2Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/Class2Impl.java
index def981aa0a..de2e45241f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/Class2Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/Class2Impl.java
@@ -33,7 +33,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl#getClass1 <em>Class1</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class Class2Impl extends EObjectImpl implements Class2
@@ -41,7 +41,7 @@ public class Class2Impl extends EObjectImpl implements Class2
   /**
    * The cached value of the '{@link #getClass1() <em>Class1</em>}' reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getClass1()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class Class2Impl extends EObjectImpl implements Class2
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected Class2Impl()
@@ -60,7 +60,7 @@ public class Class2Impl extends EObjectImpl implements Class2
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -71,7 +71,7 @@ public class Class2Impl extends EObjectImpl implements Class2
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<Class1> getClass1()
@@ -86,7 +86,7 @@ public class Class2Impl extends EObjectImpl implements Class2
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -103,7 +103,7 @@ public class Class2Impl extends EObjectImpl implements Class2
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -119,7 +119,7 @@ public class Class2Impl extends EObjectImpl implements Class2
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -135,7 +135,7 @@ public class Class2Impl extends EObjectImpl implements Class2
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -154,7 +154,7 @@ public class Class2Impl extends EObjectImpl implements Class2
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -171,7 +171,7 @@ public class Class2Impl extends EObjectImpl implements Class2
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackageFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackageFactoryImpl.java
index 4a3ec86b60..0b93779c7b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackageFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackageFactoryImpl.java
@@ -22,14 +22,14 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFactory
 {
   /**
    * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated NOT
    */
   public static SubpackageFactory init()
@@ -52,7 +52,7 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac
 
   /**
    * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public SubpackageFactoryImpl()
@@ -62,7 +62,7 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -79,7 +79,7 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Class2 createClass2()
@@ -90,7 +90,7 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public SubpackagePackage getSubpackagePackage()
@@ -100,7 +100,7 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java
index df375c4f8b..4abf86e2df 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java
@@ -24,14 +24,14 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass class2EClass = null;
@@ -43,7 +43,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage#eNS_URI
    * @see #init()
@@ -56,7 +56,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private static boolean isInited = false;
@@ -67,7 +67,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
    * This method is used to initialize {@link SubpackagePackage#eINSTANCE} when that field is accessed. Clients should
    * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -111,7 +111,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getClass2()
@@ -121,7 +121,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getClass2_Class1()
@@ -131,7 +131,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public SubpackageFactory getSubpackageFactory()
@@ -141,7 +141,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private boolean isCreated = false;
@@ -149,7 +149,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
   /**
    * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
    * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void createPackageContents()
@@ -165,7 +165,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private boolean isInitialized = false;
@@ -173,7 +173,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
   /**
    * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
    * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void initializePackageContents()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java
index 22af9241c4..1a240438ea 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage
  * @generated
  */
@@ -29,14 +29,14 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl
 {
   /**
    * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected static SubpackagePackage modelPackage;
 
   /**
    * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public SubpackageAdapterFactory()
@@ -51,7 +51,7 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl
    * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   *
+   * 
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -71,7 +71,7 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl
 
   /**
    * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected SubpackageSwitch<Adapter> modelSwitch = new SubpackageSwitch<Adapter>()
@@ -91,7 +91,7 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl
 
   /**
    * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @param target
    *          the object to adapt.
    * @return the adapter for the <code>target</code>.
@@ -107,7 +107,7 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2
    * <em>Class2</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.legacy.model3.subpackage.Class2
    * @generated
@@ -120,7 +120,7 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl
   /**
    * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   *
+   * 
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java
index 4e6212063b..173208ba4f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java
@@ -23,7 +23,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage
  * @generated
  */
@@ -31,14 +31,14 @@ public class SubpackageSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected static SubpackagePackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public SubpackageSwitch()
@@ -52,7 +52,7 @@ public class SubpackageSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -64,7 +64,7 @@ public class SubpackageSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -84,7 +84,7 @@ public class SubpackageSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -108,7 +108,7 @@ public class SubpackageSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Class2</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>Class2</em>'.
@@ -124,7 +124,7 @@ public class SubpackageSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   *
+   * 
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java
index ec632ade75..8f5ef64722 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package
  * @generated
  */
@@ -30,14 +30,14 @@ public class Model3AdapterFactory extends AdapterFactoryImpl
 {
   /**
    * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected static Model3Package modelPackage;
 
   /**
    * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Model3AdapterFactory()
@@ -52,7 +52,7 @@ public class Model3AdapterFactory extends AdapterFactoryImpl
    * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   *
+   * 
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -72,7 +72,7 @@ public class Model3AdapterFactory extends AdapterFactoryImpl
 
   /**
    * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected Model3Switch<Adapter> modelSwitch = new Model3Switch<Adapter>()
@@ -98,7 +98,7 @@ public class Model3AdapterFactory extends AdapterFactoryImpl
 
   /**
    * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @param target
    *          the object to adapt.
    * @return the adapter for the <code>target</code>.
@@ -114,7 +114,7 @@ public class Model3AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1
    * <em>Class1</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.legacy.model3.Class1
    * @generated
@@ -128,7 +128,7 @@ public class Model3AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef
    * <em>Meta Ref</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.legacy.model3.MetaRef
    * @generated
@@ -141,7 +141,7 @@ public class Model3AdapterFactory extends AdapterFactoryImpl
   /**
    * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   *
+   * 
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java
index c8ec87c2a2..ec6bdb5cad 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java
@@ -24,7 +24,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package
  * @generated
  */
@@ -32,14 +32,14 @@ public class Model3Switch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected static Model3Package modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Model3Switch()
@@ -53,7 +53,7 @@ public class Model3Switch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -65,7 +65,7 @@ public class Model3Switch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -85,7 +85,7 @@ public class Model3Switch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -117,7 +117,7 @@ public class Model3Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Class1</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>Class1</em>'.
@@ -132,7 +132,7 @@ public class Model3Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Meta Ref</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>Meta Ref</em>'.
@@ -148,7 +148,7 @@ public class Model3Switch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   *
+   * 
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java
index ed8b06aa1e..0952d8f409 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java
@@ -32,7 +32,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapNonContained
@@ -40,7 +40,7 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN
   /**
    * The cached value of the '{@link #getElements() <em>Elements</em>}' map. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -49,7 +49,7 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected GenRefMapNonContainedImpl()
@@ -59,7 +59,7 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -70,7 +70,7 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EMap<String, EObject> getElements()
@@ -85,7 +85,7 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -101,7 +101,7 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -120,7 +120,7 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -137,7 +137,7 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -154,7 +154,7 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java
index b338ca3f99..8060cc8fec 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java
@@ -33,7 +33,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class GenRefMultiContainedImpl extends EObjectImpl implements GenRefMultiContained
@@ -41,7 +41,7 @@ public class GenRefMultiContainedImpl extends EObjectImpl implements GenRefMulti
   /**
    * The cached value of the '{@link #getElements() <em>Elements</em>}' containment reference list. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class GenRefMultiContainedImpl extends EObjectImpl implements GenRefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected GenRefMultiContainedImpl()
@@ -60,7 +60,7 @@ public class GenRefMultiContainedImpl extends EObjectImpl implements GenRefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -71,7 +71,7 @@ public class GenRefMultiContainedImpl extends EObjectImpl implements GenRefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<EObject> getElements()
@@ -86,7 +86,7 @@ public class GenRefMultiContainedImpl extends EObjectImpl implements GenRefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -102,7 +102,7 @@ public class GenRefMultiContainedImpl extends EObjectImpl implements GenRefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -118,7 +118,7 @@ public class GenRefMultiContainedImpl extends EObjectImpl implements GenRefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -137,7 +137,7 @@ public class GenRefMultiContainedImpl extends EObjectImpl implements GenRefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -154,7 +154,7 @@ public class GenRefMultiContainedImpl extends EObjectImpl implements GenRefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java
index 7f012ad763..e8d241881d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java
@@ -30,7 +30,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class GenRefMultiNUNonContainedImpl extends EObjectImpl implements GenRefMultiNUNonContained
@@ -38,7 +38,7 @@ public class GenRefMultiNUNonContainedImpl extends EObjectImpl implements GenRef
   /**
    * The cached value of the '{@link #getElements() <em>Elements</em>}' reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -47,7 +47,7 @@ public class GenRefMultiNUNonContainedImpl extends EObjectImpl implements GenRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected GenRefMultiNUNonContainedImpl()
@@ -57,7 +57,7 @@ public class GenRefMultiNUNonContainedImpl extends EObjectImpl implements GenRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -68,7 +68,7 @@ public class GenRefMultiNUNonContainedImpl extends EObjectImpl implements GenRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<EObject> getElements()
@@ -82,7 +82,7 @@ public class GenRefMultiNUNonContainedImpl extends EObjectImpl implements GenRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -98,7 +98,7 @@ public class GenRefMultiNUNonContainedImpl extends EObjectImpl implements GenRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -117,7 +117,7 @@ public class GenRefMultiNUNonContainedImpl extends EObjectImpl implements GenRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -134,7 +134,7 @@ public class GenRefMultiNUNonContainedImpl extends EObjectImpl implements GenRef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java
index 3d89df4d34..395c21ea7c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java
@@ -30,7 +30,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class GenRefMultiNonContainedImpl extends EObjectImpl implements GenRefMultiNonContained
@@ -38,7 +38,7 @@ public class GenRefMultiNonContainedImpl extends EObjectImpl implements GenRefMu
   /**
    * The cached value of the '{@link #getElements() <em>Elements</em>}' reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -47,7 +47,7 @@ public class GenRefMultiNonContainedImpl extends EObjectImpl implements GenRefMu
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected GenRefMultiNonContainedImpl()
@@ -57,7 +57,7 @@ public class GenRefMultiNonContainedImpl extends EObjectImpl implements GenRefMu
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -68,7 +68,7 @@ public class GenRefMultiNonContainedImpl extends EObjectImpl implements GenRefMu
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<EObject> getElements()
@@ -83,7 +83,7 @@ public class GenRefMultiNonContainedImpl extends EObjectImpl implements GenRefMu
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -99,7 +99,7 @@ public class GenRefMultiNonContainedImpl extends EObjectImpl implements GenRefMu
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -118,7 +118,7 @@ public class GenRefMultiNonContainedImpl extends EObjectImpl implements GenRefMu
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -135,7 +135,7 @@ public class GenRefMultiNonContainedImpl extends EObjectImpl implements GenRefMu
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java
index a35e8accd4..fdd2cf59cc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSingleContained
@@ -38,7 +38,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
   /**
    * The cached value of the '{@link #getElement() <em>Element</em>}' containment reference. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getElement()
    * @generated
    * @ordered
@@ -47,7 +47,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected GenRefSingleContainedImpl()
@@ -57,7 +57,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -68,7 +68,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EObject getElement()
@@ -78,7 +78,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetElement(EObject newElement, NotificationChain msgs)
@@ -99,7 +99,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setElement(EObject newElement)
@@ -124,7 +124,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -140,7 +140,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -156,7 +156,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -173,7 +173,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -190,7 +190,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java
index 4508172b61..42abbd16b2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java
@@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefSingleNonContained
@@ -37,7 +37,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
   /**
    * The cached value of the '{@link #getElement() <em>Element</em>}' reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getElement()
    * @generated
    * @ordered
@@ -46,7 +46,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected GenRefSingleNonContainedImpl()
@@ -56,7 +56,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -67,7 +67,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EObject getElement()
@@ -88,7 +88,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EObject basicGetElement()
@@ -98,7 +98,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setElement(EObject newElement)
@@ -112,7 +112,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -130,7 +130,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -147,7 +147,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -164,7 +164,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java
index e136cff1b0..7dc23be114 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java
@@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplContainedElementNPL
@@ -37,7 +37,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -46,7 +46,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -55,7 +55,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected ImplContainedElementNPLImpl()
@@ -65,7 +65,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -76,7 +76,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getName()
@@ -86,7 +86,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -100,7 +100,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -116,7 +116,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -133,7 +133,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -150,7 +150,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -166,7 +166,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -187,7 +187,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -208,7 +208,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java
index 38baef4d86..2ebc58771a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java
@@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImplMultiRefContainedElementImpl extends EObjectImpl implements ImplMultiRefContainedElement
@@ -41,7 +41,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -59,7 +59,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected ImplMultiRefContainedElementImpl()
@@ -69,7 +69,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -80,7 +80,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public IMultiRefContainer getParent()
@@ -92,7 +92,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetParent(IMultiRefContainer newParent, NotificationChain msgs)
@@ -103,7 +103,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setParent(IMultiRefContainer newParent)
@@ -130,7 +130,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getName()
@@ -140,7 +140,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -154,7 +154,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -172,7 +172,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -188,7 +188,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -205,7 +205,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -223,7 +223,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -243,7 +243,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -263,7 +263,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -281,7 +281,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java
index 8e2ed2c349..9f9f057148 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java
@@ -34,7 +34,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiRefContainer
@@ -42,7 +42,7 @@ public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiR
   /**
    * The cached value of the '{@link #getElements() <em>Elements</em>}' containment reference list. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -51,7 +51,7 @@ public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiR
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected ImplMultiRefContainerImpl()
@@ -61,7 +61,7 @@ public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiR
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -72,7 +72,7 @@ public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiR
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<IMultiRefContainedElement> getElements()
@@ -88,7 +88,7 @@ public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiR
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -105,7 +105,7 @@ public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiR
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -121,7 +121,7 @@ public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiR
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -137,7 +137,7 @@ public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiR
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -156,7 +156,7 @@ public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiR
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -173,7 +173,7 @@ public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiR
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java
index 7ace24554a..6f4bca81c7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java
@@ -33,7 +33,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImplMultiRefContainerNPLImpl extends EObjectImpl implements ImplMultiRefContainerNPL
@@ -41,7 +41,7 @@ public class ImplMultiRefContainerNPLImpl extends EObjectImpl implements ImplMul
   /**
    * The cached value of the '{@link #getElements() <em>Elements</em>}' containment reference list. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class ImplMultiRefContainerNPLImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected ImplMultiRefContainerNPLImpl()
@@ -60,7 +60,7 @@ public class ImplMultiRefContainerNPLImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -71,7 +71,7 @@ public class ImplMultiRefContainerNPLImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<IContainedElementNoParentLink> getElements()
@@ -86,7 +86,7 @@ public class ImplMultiRefContainerNPLImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -102,7 +102,7 @@ public class ImplMultiRefContainerNPLImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -118,7 +118,7 @@ public class ImplMultiRefContainerNPLImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -137,7 +137,7 @@ public class ImplMultiRefContainerNPLImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -154,7 +154,7 @@ public class ImplMultiRefContainerNPLImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java
index 0d37306227..914dd5b51b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java
@@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements ImplMultiRefNonContainedElement
@@ -41,7 +41,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
   /**
    * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getParent()
    * @generated
    * @ordered
@@ -51,7 +51,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -60,7 +60,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -69,7 +69,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected ImplMultiRefNonContainedElementImpl()
@@ -79,7 +79,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -90,7 +90,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public IMultiRefNonContainer getParent()
@@ -111,7 +111,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public IMultiRefNonContainer basicGetParent()
@@ -121,7 +121,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetParent(IMultiRefNonContainer newParent, NotificationChain msgs)
@@ -142,7 +142,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setParent(IMultiRefNonContainer newParent)
@@ -167,7 +167,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getName()
@@ -177,7 +177,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -191,7 +191,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -210,7 +210,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -226,7 +226,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -246,7 +246,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -266,7 +266,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -286,7 +286,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -304,7 +304,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java
index 17f355938c..85f40da3eb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java
@@ -34,7 +34,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMultiRefNonContainer
@@ -42,7 +42,7 @@ public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMul
   /**
    * The cached value of the '{@link #getElements() <em>Elements</em>}' reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -51,7 +51,7 @@ public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected ImplMultiRefNonContainerImpl()
@@ -61,7 +61,7 @@ public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -72,7 +72,7 @@ public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<IMultiRefNonContainedElement> getElements()
@@ -88,7 +88,7 @@ public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -105,7 +105,7 @@ public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -121,7 +121,7 @@ public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -137,7 +137,7 @@ public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -156,7 +156,7 @@ public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -173,7 +173,7 @@ public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMul
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java
index 8576dd47e0..091086b4b2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java
@@ -31,7 +31,7 @@ import java.util.Collection;
  * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImplMultiRefNonContainerNPLImpl extends EObjectImpl implements ImplMultiRefNonContainerNPL
@@ -39,7 +39,7 @@ public class ImplMultiRefNonContainerNPLImpl extends EObjectImpl implements Impl
   /**
    * The cached value of the '{@link #getElements() <em>Elements</em>}' reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -48,7 +48,7 @@ public class ImplMultiRefNonContainerNPLImpl extends EObjectImpl implements Impl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected ImplMultiRefNonContainerNPLImpl()
@@ -58,7 +58,7 @@ public class ImplMultiRefNonContainerNPLImpl extends EObjectImpl implements Impl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -69,7 +69,7 @@ public class ImplMultiRefNonContainerNPLImpl extends EObjectImpl implements Impl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<IContainedElementNoParentLink> getElements()
@@ -84,7 +84,7 @@ public class ImplMultiRefNonContainerNPLImpl extends EObjectImpl implements Impl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -100,7 +100,7 @@ public class ImplMultiRefNonContainerNPLImpl extends EObjectImpl implements Impl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -119,7 +119,7 @@ public class ImplMultiRefNonContainerNPLImpl extends EObjectImpl implements Impl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -136,7 +136,7 @@ public class ImplMultiRefNonContainerNPLImpl extends EObjectImpl implements Impl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java
index 98e66a68b3..3485d971f0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java
@@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImplSingleRefContainedElementImpl extends EObjectImpl implements ImplSingleRefContainedElement
@@ -41,7 +41,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -59,7 +59,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected ImplSingleRefContainedElementImpl()
@@ -69,7 +69,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -80,7 +80,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ISingleRefContainer getParent()
@@ -92,7 +92,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetParent(ISingleRefContainer newParent, NotificationChain msgs)
@@ -103,7 +103,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setParent(ISingleRefContainer newParent)
@@ -130,7 +130,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getName()
@@ -140,7 +140,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -154,7 +154,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -172,7 +172,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -188,7 +188,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -205,7 +205,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -223,7 +223,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -243,7 +243,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -263,7 +263,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -281,7 +281,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java
index f2189196d5..a6874d33b6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java
@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingleRefContainer
@@ -39,7 +39,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
   /**
    * The cached value of the '{@link #getElement() <em>Element</em>}' containment reference. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getElement()
    * @generated
    * @ordered
@@ -48,7 +48,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected ImplSingleRefContainerImpl()
@@ -58,7 +58,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -69,7 +69,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ISingleRefContainedElement getElement()
@@ -79,7 +79,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetElement(ISingleRefContainedElement newElement, NotificationChain msgs)
@@ -100,7 +100,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setElement(ISingleRefContainedElement newElement)
@@ -125,7 +125,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -144,7 +144,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -160,7 +160,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -176,7 +176,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -193,7 +193,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -210,7 +210,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java
index 109585e44b..3d94e68386 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSingleRefContainerNPL
@@ -38,7 +38,7 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
   /**
    * The cached value of the '{@link #getElement() <em>Element</em>}' containment reference. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getElement()
    * @generated
    * @ordered
@@ -47,7 +47,7 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected ImplSingleRefContainerNPLImpl()
@@ -57,7 +57,7 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -68,7 +68,7 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public IContainedElementNoParentLink getElement()
@@ -78,7 +78,7 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetElement(IContainedElementNoParentLink newElement, NotificationChain msgs)
@@ -99,7 +99,7 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setElement(IContainedElementNoParentLink newElement)
@@ -124,7 +124,7 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -140,7 +140,7 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -156,7 +156,7 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -173,7 +173,7 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -190,7 +190,7 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java
index 21e555e113..3252e5a704 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java
@@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements ImplSingleRefNonContainedElement
@@ -41,7 +41,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
   /**
    * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getParent()
    * @generated
    * @ordered
@@ -51,7 +51,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -60,7 +60,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -69,7 +69,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected ImplSingleRefNonContainedElementImpl()
@@ -79,7 +79,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -90,7 +90,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ISingleRefNonContainer getParent()
@@ -111,7 +111,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ISingleRefNonContainer basicGetParent()
@@ -121,7 +121,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetParent(ISingleRefNonContainer newParent, NotificationChain msgs)
@@ -142,7 +142,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setParent(ISingleRefNonContainer newParent)
@@ -167,7 +167,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getName()
@@ -177,7 +177,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -191,7 +191,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -210,7 +210,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -226,7 +226,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -246,7 +246,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -266,7 +266,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -286,7 +286,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -304,7 +304,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java
index c4ea300487..b19c555535 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java
@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSingleRefNonContainer
@@ -39,7 +39,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
   /**
    * The cached value of the '{@link #getElement() <em>Element</em>}' reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getElement()
    * @generated
    * @ordered
@@ -48,7 +48,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected ImplSingleRefNonContainerImpl()
@@ -58,7 +58,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -69,7 +69,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ISingleRefNonContainedElement getElement()
@@ -90,7 +90,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ISingleRefNonContainedElement basicGetElement()
@@ -100,7 +100,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetElement(ISingleRefNonContainedElement newElement, NotificationChain msgs)
@@ -121,7 +121,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setElement(ISingleRefNonContainedElement newElement)
@@ -148,7 +148,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -168,7 +168,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -184,7 +184,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -202,7 +202,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -219,7 +219,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -236,7 +236,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java
index 3d6b9b2430..3cdf9e3eb8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * </li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements ImplSingleRefNonContainerNPL
@@ -38,7 +38,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
   /**
    * The cached value of the '{@link #getElement() <em>Element</em>}' reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getElement()
    * @generated
    * @ordered
@@ -47,7 +47,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected ImplSingleRefNonContainerNPLImpl()
@@ -57,7 +57,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -68,7 +68,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public IContainedElementNoParentLink getElement()
@@ -89,7 +89,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public IContainedElementNoParentLink basicGetElement()
@@ -99,7 +99,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setElement(IContainedElementNoParentLink newElement)
@@ -113,7 +113,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -131,7 +131,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -148,7 +148,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -165,7 +165,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java
index 4c18da8114..b710191e0c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java
@@ -32,7 +32,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class MultiContainedElementImpl extends EObjectImpl implements MultiContainedElement
@@ -40,7 +40,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -49,7 +49,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -58,7 +58,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected MultiContainedElementImpl()
@@ -68,7 +68,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -79,7 +79,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getName()
@@ -89,7 +89,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -102,7 +102,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefMultiContained getParent()
@@ -114,7 +114,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetParent(RefMultiContained newParent, NotificationChain msgs)
@@ -125,7 +125,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setParent(RefMultiContained newParent)
@@ -152,7 +152,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -170,7 +170,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -186,7 +186,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -203,7 +203,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -221,7 +221,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -241,7 +241,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -261,7 +261,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -279,7 +279,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java
index 75d911cd12..043d2c92df 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java
@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNonContainedElement
@@ -39,7 +39,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -48,7 +48,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -58,7 +58,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
   /**
    * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getParent()
    * @generated
    * @ordered
@@ -67,7 +67,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected MultiNonContainedElementImpl()
@@ -77,7 +77,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -88,7 +88,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getName()
@@ -98,7 +98,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -112,7 +112,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefMultiNonContained getParent()
@@ -133,7 +133,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefMultiNonContained basicGetParent()
@@ -143,7 +143,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetParent(RefMultiNonContained newParent, NotificationChain msgs)
@@ -164,7 +164,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setParent(RefMultiNonContained newParent)
@@ -189,7 +189,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -208,7 +208,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -224,7 +224,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -244,7 +244,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -264,7 +264,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -284,7 +284,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -302,7 +302,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedUnsettableElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedUnsettableElementImpl.java
index 58eb4229ef..3996619481 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedUnsettableElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedUnsettableElementImpl.java
@@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implements MultiNonContainedUnsettableElement
@@ -41,7 +41,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -60,7 +60,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
   /**
    * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getParent()
    * @generated
    * @ordered
@@ -69,7 +69,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * This is true if the Parent reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -77,7 +77,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected MultiNonContainedUnsettableElementImpl()
@@ -87,7 +87,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -98,7 +98,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getName()
@@ -108,7 +108,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -122,7 +122,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefMultiNonContainedUnsettable getParent()
@@ -143,7 +143,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefMultiNonContainedUnsettable basicGetParent()
@@ -153,7 +153,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetParent(RefMultiNonContainedUnsettable newParent, NotificationChain msgs)
@@ -176,7 +176,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setParent(RefMultiNonContainedUnsettable newParent)
@@ -206,7 +206,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicUnsetParent(NotificationChain msgs)
@@ -229,7 +229,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetParent()
@@ -255,7 +255,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetParent()
@@ -265,7 +265,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -284,7 +284,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -300,7 +300,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -320,7 +320,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -340,7 +340,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -360,7 +360,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -378,7 +378,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java
index 977c1ccb4a..dd93abbc52 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java
@@ -33,7 +33,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContained
@@ -41,7 +41,7 @@ public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContai
   /**
    * The cached value of the '{@link #getElements() <em>Elements</em>}' containment reference list. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContai
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected RefMultiContainedImpl()
@@ -60,7 +60,7 @@ public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContai
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -71,7 +71,7 @@ public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContai
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<MultiContainedElement> getElements()
@@ -86,7 +86,7 @@ public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContai
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -103,7 +103,7 @@ public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContai
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -119,7 +119,7 @@ public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContai
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -135,7 +135,7 @@ public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContai
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -154,7 +154,7 @@ public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContai
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -171,7 +171,7 @@ public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContai
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java
index f5e8077db2..91393bb0d9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java
@@ -33,7 +33,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RefMultiContainedNPLImpl extends EObjectImpl implements RefMultiContainedNPL
@@ -41,7 +41,7 @@ public class RefMultiContainedNPLImpl extends EObjectImpl implements RefMultiCon
   /**
    * The cached value of the '{@link #getElements() <em>Elements</em>}' containment reference list. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class RefMultiContainedNPLImpl extends EObjectImpl implements RefMultiCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected RefMultiContainedNPLImpl()
@@ -60,7 +60,7 @@ public class RefMultiContainedNPLImpl extends EObjectImpl implements RefMultiCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -71,7 +71,7 @@ public class RefMultiContainedNPLImpl extends EObjectImpl implements RefMultiCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<ContainedElementNoOpposite> getElements()
@@ -86,7 +86,7 @@ public class RefMultiContainedNPLImpl extends EObjectImpl implements RefMultiCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -102,7 +102,7 @@ public class RefMultiContainedNPLImpl extends EObjectImpl implements RefMultiCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -118,7 +118,7 @@ public class RefMultiContainedNPLImpl extends EObjectImpl implements RefMultiCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -137,7 +137,7 @@ public class RefMultiContainedNPLImpl extends EObjectImpl implements RefMultiCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -154,7 +154,7 @@ public class RefMultiContainedNPLImpl extends EObjectImpl implements RefMultiCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java
index b224fc0044..092f778fbe 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java
@@ -33,7 +33,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RefMultiNonContainedImpl extends EObjectImpl implements RefMultiNonContained
@@ -41,7 +41,7 @@ public class RefMultiNonContainedImpl extends EObjectImpl implements RefMultiNon
   /**
    * The cached value of the '{@link #getElements() <em>Elements</em>}' reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class RefMultiNonContainedImpl extends EObjectImpl implements RefMultiNon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected RefMultiNonContainedImpl()
@@ -60,7 +60,7 @@ public class RefMultiNonContainedImpl extends EObjectImpl implements RefMultiNon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -71,7 +71,7 @@ public class RefMultiNonContainedImpl extends EObjectImpl implements RefMultiNon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<MultiNonContainedElement> getElements()
@@ -86,7 +86,7 @@ public class RefMultiNonContainedImpl extends EObjectImpl implements RefMultiNon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -103,7 +103,7 @@ public class RefMultiNonContainedImpl extends EObjectImpl implements RefMultiNon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -119,7 +119,7 @@ public class RefMultiNonContainedImpl extends EObjectImpl implements RefMultiNon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -135,7 +135,7 @@ public class RefMultiNonContainedImpl extends EObjectImpl implements RefMultiNon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -154,7 +154,7 @@ public class RefMultiNonContainedImpl extends EObjectImpl implements RefMultiNon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -171,7 +171,7 @@ public class RefMultiNonContainedImpl extends EObjectImpl implements RefMultiNon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java
index 7524a325bd..560ed18dbd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java
@@ -30,7 +30,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RefMultiNonContainedNPLImpl extends EObjectImpl implements RefMultiNonContainedNPL
@@ -38,7 +38,7 @@ public class RefMultiNonContainedNPLImpl extends EObjectImpl implements RefMulti
   /**
    * The cached value of the '{@link #getElements() <em>Elements</em>}' reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -47,7 +47,7 @@ public class RefMultiNonContainedNPLImpl extends EObjectImpl implements RefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected RefMultiNonContainedNPLImpl()
@@ -57,7 +57,7 @@ public class RefMultiNonContainedNPLImpl extends EObjectImpl implements RefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -68,7 +68,7 @@ public class RefMultiNonContainedNPLImpl extends EObjectImpl implements RefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<ContainedElementNoOpposite> getElements()
@@ -83,7 +83,7 @@ public class RefMultiNonContainedNPLImpl extends EObjectImpl implements RefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -99,7 +99,7 @@ public class RefMultiNonContainedNPLImpl extends EObjectImpl implements RefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -118,7 +118,7 @@ public class RefMultiNonContainedNPLImpl extends EObjectImpl implements RefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -135,7 +135,7 @@ public class RefMultiNonContainedNPLImpl extends EObjectImpl implements RefMulti
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedUnsettableImpl.java
index e9184defbe..0f9bf33b13 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedUnsettableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedUnsettableImpl.java
@@ -34,7 +34,7 @@ import java.util.Collection;
  * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements RefMultiNonContainedUnsettable
@@ -42,7 +42,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R
   /**
    * The cached value of the '{@link #getElements() <em>Elements</em>}' reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -51,7 +51,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected RefMultiNonContainedUnsettableImpl()
@@ -61,7 +61,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -72,7 +72,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EList<MultiNonContainedUnsettableElement> getElements()
@@ -88,7 +88,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void unsetElements()
@@ -99,7 +99,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public boolean isSetElements()
@@ -109,7 +109,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -126,7 +126,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -142,7 +142,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -158,7 +158,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -177,7 +177,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -194,7 +194,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java
index b3071224f4..b7e79e8305 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RefSingleContainedImpl extends EObjectImpl implements RefSingleContained
@@ -38,7 +38,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
   /**
    * The cached value of the '{@link #getElement() <em>Element</em>}' containment reference. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getElement()
    * @generated
    * @ordered
@@ -47,7 +47,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected RefSingleContainedImpl()
@@ -57,7 +57,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -68,7 +68,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public SingleContainedElement getElement()
@@ -78,7 +78,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetElement(SingleContainedElement newElement, NotificationChain msgs)
@@ -99,7 +99,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setElement(SingleContainedElement newElement)
@@ -124,7 +124,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -143,7 +143,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -159,7 +159,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -175,7 +175,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -192,7 +192,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -209,7 +209,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java
index a36247ca50..0e96f3e771 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleContainedNPL
@@ -38,7 +38,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
   /**
    * The cached value of the '{@link #getElement() <em>Element</em>}' containment reference. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #getElement()
    * @generated
    * @ordered
@@ -47,7 +47,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected RefSingleContainedNPLImpl()
@@ -57,7 +57,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -68,7 +68,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ContainedElementNoOpposite getElement()
@@ -78,7 +78,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetElement(ContainedElementNoOpposite newElement, NotificationChain msgs)
@@ -99,7 +99,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setElement(ContainedElementNoOpposite newElement)
@@ -124,7 +124,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -140,7 +140,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -156,7 +156,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -173,7 +173,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -190,7 +190,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java
index 51eafb24d6..8b08ae6133 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleNonContained
@@ -38,7 +38,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
   /**
    * The cached value of the '{@link #getElement() <em>Element</em>}' reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getElement()
    * @generated
    * @ordered
@@ -47,7 +47,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected RefSingleNonContainedImpl()
@@ -57,7 +57,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -68,7 +68,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public SingleNonContainedElement getElement()
@@ -89,7 +89,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public SingleNonContainedElement basicGetElement()
@@ -99,7 +99,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetElement(SingleNonContainedElement newElement, NotificationChain msgs)
@@ -120,7 +120,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setElement(SingleNonContainedElement newElement)
@@ -145,7 +145,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -164,7 +164,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -180,7 +180,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -198,7 +198,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -215,7 +215,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -232,7 +232,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java
index 8cd15ec432..135cb11dd9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java
@@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSingleNonContainedNPL
@@ -37,7 +37,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
   /**
    * The cached value of the '{@link #getElement() <em>Element</em>}' reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getElement()
    * @generated
    * @ordered
@@ -46,7 +46,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected RefSingleNonContainedNPLImpl()
@@ -56,7 +56,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -67,7 +67,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ContainedElementNoOpposite getElement()
@@ -88,7 +88,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ContainedElementNoOpposite basicGetElement()
@@ -98,7 +98,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setElement(ContainedElementNoOpposite newElement)
@@ -112,7 +112,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -130,7 +130,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -147,7 +147,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -164,7 +164,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java
index ad3d9cde67..7a7422703a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java
@@ -32,7 +32,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SingleContainedElementImpl extends EObjectImpl implements SingleContainedElement
@@ -40,7 +40,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -49,7 +49,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -58,7 +58,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected SingleContainedElementImpl()
@@ -68,7 +68,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -79,7 +79,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getName()
@@ -89,7 +89,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -102,7 +102,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefSingleContained getParent()
@@ -114,7 +114,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetParent(RefSingleContained newParent, NotificationChain msgs)
@@ -125,7 +125,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setParent(RefSingleContained newParent)
@@ -152,7 +152,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -170,7 +170,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -186,7 +186,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -203,7 +203,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -221,7 +221,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -241,7 +241,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -261,7 +261,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -279,7 +279,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java
index c28f73eb92..beffbf5fa7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java
@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SingleNonContainedElementImpl extends EObjectImpl implements SingleNonContainedElement
@@ -39,7 +39,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -48,7 +48,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see #getName()
    * @generated
    * @ordered
@@ -58,7 +58,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
   /**
    * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getParent()
    * @generated
    * @ordered
@@ -67,7 +67,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected SingleNonContainedElementImpl()
@@ -77,7 +77,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -88,7 +88,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getName()
@@ -98,7 +98,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -112,7 +112,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefSingleNonContained getParent()
@@ -133,7 +133,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefSingleNonContained basicGetParent()
@@ -143,7 +143,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public NotificationChain basicSetParent(RefSingleNonContained newParent, NotificationChain msgs)
@@ -164,7 +164,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setParent(RefSingleNonContained newParent)
@@ -189,7 +189,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -208,7 +208,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -224,7 +224,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -244,7 +244,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -264,7 +264,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -284,7 +284,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -302,7 +302,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java
index f48856bb43..3c296f5f84 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl#getTypedValue <em>Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<String, EObject>
@@ -38,7 +38,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
   /**
    * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -48,7 +48,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
   /**
    * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -58,7 +58,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
   /**
    * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @see #getTypedValue()
    * @generated
    * @ordered
@@ -67,7 +67,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected StringToEObjectImpl()
@@ -77,7 +77,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -88,7 +88,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getTypedKey()
@@ -98,7 +98,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setTypedKey(String newKey)
@@ -111,7 +111,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EObject getTypedValue()
@@ -121,7 +121,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setTypedValue(EObject newValue)
@@ -134,7 +134,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -152,7 +152,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -172,7 +172,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -192,7 +192,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -210,7 +210,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -228,14 +228,14 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected int hash = -1;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public int getHash()
@@ -250,7 +250,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setHash(int hash)
@@ -260,7 +260,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public String getKey()
@@ -270,7 +270,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void setKey(String key)
@@ -280,7 +280,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EObject getValue()
@@ -290,7 +290,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EObject setValue(EObject value)
@@ -302,7 +302,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4FactoryImpl.java
index 22d1c4c5f7..d3e051ef94 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4FactoryImpl.java
@@ -57,14 +57,14 @@ import java.util.Map;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 {
   /**
    * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated NOT
    */
   public static model4Factory init()
@@ -87,7 +87,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public model4FactoryImpl()
@@ -97,7 +97,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   @Override
@@ -182,7 +182,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefSingleContained createRefSingleContained()
@@ -193,7 +193,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public SingleContainedElement createSingleContainedElement()
@@ -204,7 +204,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefSingleNonContained createRefSingleNonContained()
@@ -215,7 +215,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public SingleNonContainedElement createSingleNonContainedElement()
@@ -226,7 +226,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefMultiContained createRefMultiContained()
@@ -237,7 +237,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public MultiContainedElement createMultiContainedElement()
@@ -248,7 +248,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefMultiNonContained createRefMultiNonContained()
@@ -259,7 +259,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public MultiNonContainedElement createMultiNonContainedElement()
@@ -270,7 +270,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefMultiNonContainedUnsettable createRefMultiNonContainedUnsettable()
@@ -281,7 +281,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public MultiNonContainedUnsettableElement createMultiNonContainedUnsettableElement()
@@ -292,7 +292,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefSingleContainedNPL createRefSingleContainedNPL()
@@ -303,7 +303,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefSingleNonContainedNPL createRefSingleNonContainedNPL()
@@ -314,7 +314,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefMultiContainedNPL createRefMultiContainedNPL()
@@ -325,7 +325,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public RefMultiNonContainedNPL createRefMultiNonContainedNPL()
@@ -336,7 +336,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ContainedElementNoOpposite createContainedElementNoOpposite()
@@ -347,7 +347,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public GenRefSingleContained createGenRefSingleContained()
@@ -358,7 +358,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public GenRefSingleNonContained createGenRefSingleNonContained()
@@ -369,7 +369,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public GenRefMultiContained createGenRefMultiContained()
@@ -380,7 +380,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public GenRefMultiNonContained createGenRefMultiNonContained()
@@ -391,7 +391,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ImplSingleRefContainer createImplSingleRefContainer()
@@ -402,7 +402,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ImplSingleRefContainedElement createImplSingleRefContainedElement()
@@ -413,7 +413,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ImplSingleRefNonContainer createImplSingleRefNonContainer()
@@ -424,7 +424,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ImplSingleRefNonContainedElement createImplSingleRefNonContainedElement()
@@ -435,7 +435,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ImplMultiRefNonContainer createImplMultiRefNonContainer()
@@ -446,7 +446,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ImplMultiRefNonContainedElement createImplMultiRefNonContainedElement()
@@ -457,7 +457,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ImplMultiRefContainer createImplMultiRefContainer()
@@ -468,7 +468,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ImplMultiRefContainedElement createImplMultiRefContainedElement()
@@ -479,7 +479,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ImplSingleRefContainerNPL createImplSingleRefContainerNPL()
@@ -490,7 +490,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ImplSingleRefNonContainerNPL createImplSingleRefNonContainerNPL()
@@ -501,7 +501,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ImplMultiRefContainerNPL createImplMultiRefContainerNPL()
@@ -512,7 +512,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ImplMultiRefNonContainerNPL createImplMultiRefNonContainerNPL()
@@ -523,7 +523,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public ImplContainedElementNPL createImplContainedElementNPL()
@@ -534,7 +534,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public GenRefMultiNUNonContained createGenRefMultiNUNonContained()
@@ -545,7 +545,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public GenRefMapNonContained createGenRefMapNonContained()
@@ -556,7 +556,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public Map.Entry<String, EObject> createStringToEObject()
@@ -567,7 +567,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public model4Package getmodel4Package()
@@ -577,7 +577,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java
index a58aa27626..b919b1a3ef 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java
@@ -58,252 +58,252 @@ import java.util.Map;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class model4PackageImpl extends EPackageImpl implements model4Package
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass refSingleContainedEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass singleContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass refSingleNonContainedEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass singleNonContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass refMultiContainedEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass multiContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass refMultiNonContainedEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass multiNonContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass refMultiNonContainedUnsettableEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass multiNonContainedUnsettableElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass refSingleContainedNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass refSingleNonContainedNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass refMultiContainedNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass refMultiNonContainedNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass containedElementNoOppositeEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass genRefSingleContainedEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass genRefSingleNonContainedEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass genRefMultiContainedEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass genRefMultiNonContainedEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass implSingleRefContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass implSingleRefContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass implSingleRefNonContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass implSingleRefNonContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass implMultiRefNonContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass implMultiRefNonContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass implMultiRefContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass implMultiRefContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass implSingleRefContainerNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass implSingleRefNonContainerNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass implMultiRefContainerNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass implMultiRefNonContainerNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass implContainedElementNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass genRefMultiNUNonContainedEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass genRefMapNonContainedEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private EClass stringToEObjectEClass = null;
@@ -315,7 +315,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#eNS_URI
    * @see #init()
@@ -328,7 +328,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private static boolean isInited = false;
@@ -339,7 +339,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
    * This method is used to initialize {@link model4Package#eINSTANCE} when that field is accessed. Clients should not
    * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -376,7 +376,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getRefSingleContained()
@@ -386,7 +386,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getRefSingleContained_Element()
@@ -396,7 +396,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getSingleContainedElement()
@@ -406,7 +406,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getSingleContainedElement_Name()
@@ -416,7 +416,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getSingleContainedElement_Parent()
@@ -426,7 +426,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getRefSingleNonContained()
@@ -436,7 +436,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getRefSingleNonContained_Element()
@@ -446,7 +446,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getSingleNonContainedElement()
@@ -456,7 +456,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getSingleNonContainedElement_Name()
@@ -466,7 +466,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getSingleNonContainedElement_Parent()
@@ -476,7 +476,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getRefMultiContained()
@@ -486,7 +486,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getRefMultiContained_Elements()
@@ -496,7 +496,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getMultiContainedElement()
@@ -506,7 +506,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getMultiContainedElement_Name()
@@ -516,7 +516,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getMultiContainedElement_Parent()
@@ -526,7 +526,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getRefMultiNonContained()
@@ -536,7 +536,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getRefMultiNonContained_Elements()
@@ -546,7 +546,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getMultiNonContainedElement()
@@ -556,7 +556,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getMultiNonContainedElement_Name()
@@ -566,7 +566,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getMultiNonContainedElement_Parent()
@@ -576,7 +576,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getRefMultiNonContainedUnsettable()
@@ -586,7 +586,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getRefMultiNonContainedUnsettable_Elements()
@@ -596,7 +596,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getMultiNonContainedUnsettableElement()
@@ -606,7 +606,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getMultiNonContainedUnsettableElement_Name()
@@ -616,7 +616,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getMultiNonContainedUnsettableElement_Parent()
@@ -626,7 +626,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getRefSingleContainedNPL()
@@ -636,7 +636,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getRefSingleContainedNPL_Element()
@@ -646,7 +646,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getRefSingleNonContainedNPL()
@@ -656,7 +656,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getRefSingleNonContainedNPL_Element()
@@ -666,7 +666,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getRefMultiContainedNPL()
@@ -676,7 +676,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getRefMultiContainedNPL_Elements()
@@ -686,7 +686,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getRefMultiNonContainedNPL()
@@ -696,7 +696,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getRefMultiNonContainedNPL_Elements()
@@ -706,7 +706,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getContainedElementNoOpposite()
@@ -716,7 +716,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getContainedElementNoOpposite_Name()
@@ -726,7 +726,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getGenRefSingleContained()
@@ -736,7 +736,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getGenRefSingleContained_Element()
@@ -746,7 +746,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getGenRefSingleNonContained()
@@ -756,7 +756,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getGenRefSingleNonContained_Element()
@@ -766,7 +766,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getGenRefMultiContained()
@@ -776,7 +776,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getGenRefMultiContained_Elements()
@@ -786,7 +786,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getGenRefMultiNonContained()
@@ -796,7 +796,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getGenRefMultiNonContained_Elements()
@@ -806,7 +806,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getImplSingleRefContainer()
@@ -816,7 +816,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getImplSingleRefContainedElement()
@@ -826,7 +826,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getImplSingleRefContainedElement_Name()
@@ -836,7 +836,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getImplSingleRefNonContainer()
@@ -846,7 +846,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getImplSingleRefNonContainedElement()
@@ -856,7 +856,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getImplSingleRefNonContainedElement_Name()
@@ -866,7 +866,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getImplMultiRefNonContainer()
@@ -876,7 +876,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getImplMultiRefNonContainedElement()
@@ -886,7 +886,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getImplMultiRefNonContainedElement_Name()
@@ -896,7 +896,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getImplMultiRefContainer()
@@ -906,7 +906,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getImplMultiRefContainedElement()
@@ -916,7 +916,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getImplMultiRefContainedElement_Name()
@@ -926,7 +926,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getImplSingleRefContainerNPL()
@@ -936,7 +936,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getImplSingleRefNonContainerNPL()
@@ -946,7 +946,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getImplMultiRefContainerNPL()
@@ -956,7 +956,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getImplMultiRefNonContainerNPL()
@@ -966,7 +966,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getImplContainedElementNPL()
@@ -976,7 +976,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getGenRefMultiNUNonContained()
@@ -986,7 +986,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getGenRefMultiNUNonContained_Elements()
@@ -996,7 +996,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getGenRefMapNonContained()
@@ -1006,7 +1006,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getGenRefMapNonContained_Elements()
@@ -1016,7 +1016,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EClass getStringToEObject()
@@ -1026,7 +1026,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EAttribute getStringToEObject_Key()
@@ -1036,7 +1036,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public EReference getStringToEObject_Value()
@@ -1046,7 +1046,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public model4Factory getmodel4Factory()
@@ -1056,7 +1056,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private boolean isCreated = false;
@@ -1064,7 +1064,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
   /**
    * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
    * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void createPackageContents()
@@ -1179,7 +1179,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   private boolean isInitialized = false;
@@ -1187,7 +1187,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
   /**
    * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
    * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public void initializePackageContents()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Factory.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Factory.java
index 52d8403652..d0875e5485 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Factory.java
@@ -48,7 +48,7 @@ import org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package
  * @generated
  */
@@ -56,14 +56,14 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 {
   /**
    * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   model4Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model4.impl.model4FactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>Ref Single Contained</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Ref Single Contained</em>'.
    * @generated
    */
@@ -71,7 +71,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Single Contained Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Single Contained Element</em>'.
    * @generated
    */
@@ -79,7 +79,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Ref Single Non Contained</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Ref Single Non Contained</em>'.
    * @generated
    */
@@ -88,7 +88,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Single Non Contained Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @return a new object of class '<em>Single Non Contained Element</em>'.
    * @generated
    */
@@ -96,7 +96,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Ref Multi Contained</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Ref Multi Contained</em>'.
    * @generated
    */
@@ -104,7 +104,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Multi Contained Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Multi Contained Element</em>'.
    * @generated
    */
@@ -112,7 +112,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Ref Multi Non Contained</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Ref Multi Non Contained</em>'.
    * @generated
    */
@@ -120,7 +120,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Multi Non Contained Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Multi Non Contained Element</em>'.
    * @generated
    */
@@ -129,7 +129,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Ref Multi Non Contained Unsettable</em>'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Ref Multi Non Contained Unsettable</em>'.
    * @generated
    */
@@ -138,7 +138,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Multi Non Contained Unsettable Element</em>'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Multi Non Contained Unsettable Element</em>'.
    * @generated
    */
@@ -146,7 +146,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Ref Single Contained NPL</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Ref Single Contained NPL</em>'.
    * @generated
    */
@@ -155,7 +155,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Ref Single Non Contained NPL</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @return a new object of class '<em>Ref Single Non Contained NPL</em>'.
    * @generated
    */
@@ -163,7 +163,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Ref Multi Contained NPL</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Ref Multi Contained NPL</em>'.
    * @generated
    */
@@ -171,7 +171,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Ref Multi Non Contained NPL</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Ref Multi Non Contained NPL</em>'.
    * @generated
    */
@@ -180,7 +180,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Contained Element No Opposite</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @return a new object of class '<em>Contained Element No Opposite</em>'.
    * @generated
    */
@@ -188,7 +188,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Gen Ref Single Contained</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Gen Ref Single Contained</em>'.
    * @generated
    */
@@ -197,7 +197,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Gen Ref Single Non Contained</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @return a new object of class '<em>Gen Ref Single Non Contained</em>'.
    * @generated
    */
@@ -205,7 +205,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Gen Ref Multi Contained</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Gen Ref Multi Contained</em>'.
    * @generated
    */
@@ -213,7 +213,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Gen Ref Multi Non Contained</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Gen Ref Multi Non Contained</em>'.
    * @generated
    */
@@ -221,7 +221,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Impl Single Ref Container</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Impl Single Ref Container</em>'.
    * @generated
    */
@@ -230,7 +230,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Impl Single Ref Contained Element</em>'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Impl Single Ref Contained Element</em>'.
    * @generated
    */
@@ -239,7 +239,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Impl Single Ref Non Container</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @return a new object of class '<em>Impl Single Ref Non Container</em>'.
    * @generated
    */
@@ -248,7 +248,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Impl Single Ref Non Contained Element</em>'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Impl Single Ref Non Contained Element</em>'.
    * @generated
    */
@@ -257,7 +257,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Impl Multi Ref Non Container</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @return a new object of class '<em>Impl Multi Ref Non Container</em>'.
    * @generated
    */
@@ -266,7 +266,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Impl Multi Ref Non Contained Element</em>'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Impl Multi Ref Non Contained Element</em>'.
    * @generated
    */
@@ -274,7 +274,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Impl Multi Ref Container</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Impl Multi Ref Container</em>'.
    * @generated
    */
@@ -283,7 +283,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Impl Multi Ref Contained Element</em>'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Impl Multi Ref Contained Element</em>'.
    * @generated
    */
@@ -292,7 +292,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Impl Single Ref Container NPL</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @return a new object of class '<em>Impl Single Ref Container NPL</em>'.
    * @generated
    */
@@ -301,7 +301,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Impl Single Ref Non Container NPL</em>'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Impl Single Ref Non Container NPL</em>'.
    * @generated
    */
@@ -310,7 +310,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Impl Multi Ref Container NPL</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @return a new object of class '<em>Impl Multi Ref Container NPL</em>'.
    * @generated
    */
@@ -319,7 +319,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Impl Multi Ref Non Container NPL</em>'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Impl Multi Ref Non Container NPL</em>'.
    * @generated
    */
@@ -327,7 +327,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Impl Contained Element NPL</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Impl Contained Element NPL</em>'.
    * @generated
    */
@@ -336,7 +336,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
   /**
    * Returns a new object of class '<em>Gen Ref Multi NU Non Contained</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @return a new object of class '<em>Gen Ref Multi NU Non Contained</em>'.
    * @generated
    */
@@ -344,7 +344,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns a new object of class '<em>Gen Ref Map Non Contained</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return a new object of class '<em>Gen Ref Map Non Contained</em>'.
    * @generated
    */
@@ -352,7 +352,7 @@ public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Fa
 
   /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java
index 948cc9f544..3d7d1f0abd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Factory
  * @model kind="package"
  * @generated
@@ -34,28 +34,28 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 {
   /**
    * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   String eNAME = "model4";
 
   /**
    * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated NOT
    */
   String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model4/1.0.0";
 
   /**
    * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   String eNS_PREFIX = "model4";
 
   /**
    * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   model4Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl.init();
@@ -63,7 +63,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl
    * <em>Ref Single Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleContained()
    * @generated
@@ -73,7 +73,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -82,7 +82,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Ref Single Contained</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -91,7 +91,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl
    * <em>Single Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getSingleContainedElement()
    * @generated
@@ -100,7 +100,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -108,7 +108,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -117,7 +117,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Single Contained Element</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -126,7 +126,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl
    * <em>Ref Single Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleNonContained()
    * @generated
@@ -135,7 +135,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Element</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -144,7 +144,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Ref Single Non Contained</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -153,7 +153,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl
    * <em>Single Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getSingleNonContainedElement()
    * @generated
@@ -162,7 +162,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -170,7 +170,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -179,7 +179,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Single Non Contained Element</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -188,7 +188,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl
    * <em>Ref Multi Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiContained()
    * @generated
@@ -198,7 +198,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -207,7 +207,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Ref Multi Contained</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -216,7 +216,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl
    * <em>Multi Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiContainedElement()
    * @generated
@@ -225,7 +225,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -233,7 +233,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -242,7 +242,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Multi Contained Element</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -251,7 +251,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl
    * <em>Ref Multi Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContained()
    * @generated
@@ -260,7 +260,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -269,7 +269,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Ref Multi Non Contained</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -278,7 +278,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl
    * <em>Multi Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiNonContainedElement()
    * @generated
@@ -287,7 +287,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -295,7 +295,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -304,7 +304,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Multi Non Contained Element</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -313,7 +313,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedUnsettableImpl
    * <em>Ref Multi Non Contained Unsettable</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedUnsettableImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContainedUnsettable()
    * @generated
@@ -322,7 +322,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -331,7 +331,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Ref Multi Non Contained Unsettable</em>' class. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -341,7 +341,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * The meta object id for the '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedUnsettableElementImpl
    * <em>Multi Non Contained Unsettable Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedUnsettableElementImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiNonContainedUnsettableElement()
    * @generated
@@ -350,7 +350,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -358,7 +358,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -367,7 +367,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Multi Non Contained Unsettable Element</em>' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -376,7 +376,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl
    * <em>Ref Single Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleContainedNPL()
    * @generated
@@ -386,7 +386,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -395,7 +395,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Ref Single Contained NPL</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -404,7 +404,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl
    * <em>Ref Single Non Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleNonContainedNPL()
    * @generated
@@ -413,7 +413,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Element</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -422,7 +422,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Ref Single Non Contained NPL</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -431,7 +431,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl
    * <em>Ref Multi Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiContainedNPL()
    * @generated
@@ -441,7 +441,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -450,7 +450,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Ref Multi Contained NPL</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -459,7 +459,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl
    * <em>Ref Multi Non Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContainedNPL()
    * @generated
@@ -468,7 +468,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -477,7 +477,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Ref Multi Non Contained NPL</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -486,7 +486,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl
    * <em>Contained Element No Opposite</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getContainedElementNoOpposite()
    * @generated
@@ -495,7 +495,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -504,7 +504,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Contained Element No Opposite</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -513,7 +513,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl
    * <em>Gen Ref Single Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefSingleContained()
    * @generated
@@ -523,7 +523,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -532,7 +532,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Gen Ref Single Contained</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -541,7 +541,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl
    * <em>Gen Ref Single Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefSingleNonContained()
    * @generated
@@ -550,7 +550,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Element</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -559,7 +559,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Gen Ref Single Non Contained</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -568,7 +568,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl
    * <em>Gen Ref Multi Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiContained()
    * @generated
@@ -578,7 +578,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -587,7 +587,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Gen Ref Multi Contained</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -596,7 +596,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl
    * <em>Gen Ref Multi Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiNonContained()
    * @generated
@@ -605,7 +605,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -614,7 +614,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Gen Ref Multi Non Contained</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -623,7 +623,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl
    * <em>Impl Single Ref Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainer()
    * @generated
@@ -633,7 +633,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -642,7 +642,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Impl Single Ref Container</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -651,7 +651,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl
    * <em>Impl Single Ref Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainedElement()
    * @generated
@@ -660,7 +660,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -668,7 +668,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -677,7 +677,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Impl Single Ref Contained Element</em>' class. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -686,7 +686,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl
    * <em>Impl Single Ref Non Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainer()
    * @generated
@@ -695,7 +695,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Element</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -704,7 +704,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Impl Single Ref Non Container</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -714,7 +714,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * The meta object id for the '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl
    * <em>Impl Single Ref Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainedElement()
    * @generated
@@ -723,7 +723,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -731,7 +731,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -740,7 +740,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Impl Single Ref Non Contained Element</em>' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -749,7 +749,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl
    * <em>Impl Multi Ref Non Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainer()
    * @generated
@@ -758,7 +758,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -767,7 +767,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Impl Multi Ref Non Container</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -777,7 +777,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * The meta object id for the '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl
    * <em>Impl Multi Ref Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainedElement()
    * @generated
@@ -786,7 +786,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -794,7 +794,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -803,7 +803,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Impl Multi Ref Non Contained Element</em>' class. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -812,7 +812,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl
    * <em>Impl Multi Ref Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainer()
    * @generated
@@ -822,7 +822,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -831,7 +831,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Impl Multi Ref Container</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -840,7 +840,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl
    * <em>Impl Multi Ref Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainedElement()
    * @generated
@@ -849,7 +849,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -857,7 +857,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -866,7 +866,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Impl Multi Ref Contained Element</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -875,7 +875,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl
    * <em>Impl Single Ref Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainerNPL()
    * @generated
@@ -885,7 +885,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -894,7 +894,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Impl Single Ref Container NPL</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -903,7 +903,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl
    * <em>Impl Single Ref Non Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainerNPL()
    * @generated
@@ -912,7 +912,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Element</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -921,7 +921,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Impl Single Ref Non Container NPL</em>' class. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -930,7 +930,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl
    * <em>Impl Multi Ref Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainerNPL()
    * @generated
@@ -940,7 +940,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -949,7 +949,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Impl Multi Ref Container NPL</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -958,7 +958,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl
    * <em>Impl Multi Ref Non Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainerNPL()
    * @generated
@@ -967,7 +967,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -976,7 +976,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Impl Multi Ref Non Container NPL</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -985,7 +985,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl
    * <em>Impl Contained Element NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplContainedElementNPL()
    * @generated
@@ -994,7 +994,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -1003,7 +1003,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Impl Contained Element NPL</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -1012,7 +1012,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl
    * <em>Gen Ref Multi NU Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiNUNonContained()
    * @generated
@@ -1021,7 +1021,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -1030,7 +1030,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Gen Ref Multi NU Non Contained</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -1039,7 +1039,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl
    * <em>Gen Ref Map Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMapNonContained()
    * @generated
@@ -1048,7 +1048,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Elements</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -1057,7 +1057,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>Gen Ref Map Non Contained</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -1066,7 +1066,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl
    * <em>String To EObject</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getStringToEObject()
    * @generated
@@ -1075,7 +1075,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -1083,7 +1083,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * The feature id for the '<em><b>Value</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -1092,7 +1092,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * The number of structural features of the '<em>String To EObject</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @generated
    * @ordered
    */
@@ -1101,7 +1101,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained
    * <em>Ref Single Contained</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Ref Single Contained</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained
    * @generated
@@ -1112,7 +1112,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the containment reference '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained#getElement <em>Element</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the containment reference '<em>Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained#getElement()
    * @see #getRefSingleContained()
@@ -1123,7 +1123,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement
    * <em>Single Contained Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Single Contained Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement
    * @generated
@@ -1134,7 +1134,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement#getName <em>Name</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement#getName()
    * @see #getSingleContainedElement()
@@ -1146,7 +1146,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the container reference '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement#getParent <em>Parent</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the container reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement#getParent()
    * @see #getSingleContainedElement()
@@ -1157,7 +1157,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained
    * <em>Ref Single Non Contained</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Ref Single Non Contained</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained
    * @generated
@@ -1168,7 +1168,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the reference '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained#getElement <em>Element</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference '<em>Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained#getElement()
    * @see #getRefSingleNonContained()
@@ -1179,7 +1179,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement
    * <em>Single Non Contained Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Single Non Contained Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement
    * @generated
@@ -1190,7 +1190,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement#getName()
    * @see #getSingleNonContainedElement()
@@ -1202,7 +1202,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the reference '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement#getParent <em>Parent</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement#getParent()
    * @see #getSingleNonContainedElement()
@@ -1213,7 +1213,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained
    * <em>Ref Multi Contained</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Ref Multi Contained</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained
    * @generated
@@ -1224,7 +1224,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the containment reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained#getElements()
    * @see #getRefMultiContained()
@@ -1235,7 +1235,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement
    * <em>Multi Contained Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Multi Contained Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement
    * @generated
@@ -1246,7 +1246,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement#getName <em>Name</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement#getName()
    * @see #getMultiContainedElement()
@@ -1258,7 +1258,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the container reference '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement#getParent <em>Parent</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the container reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement#getParent()
    * @see #getMultiContainedElement()
@@ -1269,7 +1269,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained
    * <em>Ref Multi Non Contained</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Ref Multi Non Contained</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained
    * @generated
@@ -1280,7 +1280,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained#getElements()
    * @see #getRefMultiNonContained()
@@ -1291,7 +1291,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement
    * <em>Multi Non Contained Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Multi Non Contained Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement
    * @generated
@@ -1302,7 +1302,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement#getName()
    * @see #getMultiNonContainedElement()
@@ -1314,7 +1314,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the reference '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement#getParent <em>Parent</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement#getParent()
    * @see #getMultiNonContainedElement()
@@ -1325,7 +1325,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedUnsettable
    * <em>Ref Multi Non Contained Unsettable</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Ref Multi Non Contained Unsettable</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedUnsettable
    * @generated
@@ -1336,7 +1336,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedUnsettable#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedUnsettable#getElements()
    * @see #getRefMultiNonContainedUnsettable()
@@ -1348,7 +1348,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for class '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedUnsettableElement
    * <em>Multi Non Contained Unsettable Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Multi Non Contained Unsettable Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedUnsettableElement
    * @generated
@@ -1359,7 +1359,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedUnsettableElement#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedUnsettableElement#getName()
    * @see #getMultiNonContainedUnsettableElement()
@@ -1371,7 +1371,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the reference '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedUnsettableElement#getParent <em>Parent</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedUnsettableElement#getParent()
    * @see #getMultiNonContainedUnsettableElement()
@@ -1382,7 +1382,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL
    * <em>Ref Single Contained NPL</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Ref Single Contained NPL</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL
    * @generated
@@ -1393,7 +1393,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the containment reference '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL#getElement <em>Element</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the containment reference '<em>Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL#getElement()
    * @see #getRefSingleContainedNPL()
@@ -1404,7 +1404,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL
    * <em>Ref Single Non Contained NPL</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Ref Single Non Contained NPL</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL
    * @generated
@@ -1415,7 +1415,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the reference '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL#getElement <em>Element</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference '<em>Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL#getElement()
    * @see #getRefSingleNonContainedNPL()
@@ -1426,7 +1426,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL
    * <em>Ref Multi Contained NPL</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Ref Multi Contained NPL</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL
    * @generated
@@ -1437,7 +1437,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the containment reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL#getElements()
    * @see #getRefMultiContainedNPL()
@@ -1448,7 +1448,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedNPL
    * <em>Ref Multi Non Contained NPL</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Ref Multi Non Contained NPL</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedNPL
    * @generated
@@ -1459,7 +1459,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedNPL#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedNPL#getElements()
    * @see #getRefMultiNonContainedNPL()
@@ -1470,7 +1470,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite
    * <em>Contained Element No Opposite</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Contained Element No Opposite</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite
    * @generated
@@ -1481,7 +1481,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite#getName()
    * @see #getContainedElementNoOpposite()
@@ -1492,7 +1492,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained
    * <em>Gen Ref Single Contained</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Gen Ref Single Contained</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained
    * @generated
@@ -1503,7 +1503,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the containment reference '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained#getElement <em>Element</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the containment reference '<em>Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained#getElement()
    * @see #getGenRefSingleContained()
@@ -1514,7 +1514,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained
    * <em>Gen Ref Single Non Contained</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Gen Ref Single Non Contained</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained
    * @generated
@@ -1525,7 +1525,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the reference '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained#getElement <em>Element</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference '<em>Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained#getElement()
    * @see #getGenRefSingleNonContained()
@@ -1536,7 +1536,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained
    * <em>Gen Ref Multi Contained</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Gen Ref Multi Contained</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained
    * @generated
@@ -1547,7 +1547,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the containment reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained#getElements()
    * @see #getGenRefMultiContained()
@@ -1558,7 +1558,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNonContained
    * <em>Gen Ref Multi Non Contained</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Gen Ref Multi Non Contained</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNonContained
    * @generated
@@ -1569,7 +1569,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNonContained#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNonContained#getElements()
    * @see #getGenRefMultiNonContained()
@@ -1580,7 +1580,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainer
    * <em>Impl Single Ref Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Impl Single Ref Container</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainer
    * @generated
@@ -1590,7 +1590,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement
    * <em>Impl Single Ref Contained Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Impl Single Ref Contained Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement
    * @generated
@@ -1601,7 +1601,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement#getName()
    * @see #getImplSingleRefContainedElement()
@@ -1612,7 +1612,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainer
    * <em>Impl Single Ref Non Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Impl Single Ref Non Container</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainer
    * @generated
@@ -1622,7 +1622,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement
    * <em>Impl Single Ref Non Contained Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Impl Single Ref Non Contained Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement
    * @generated
@@ -1633,7 +1633,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement#getName()
    * @see #getImplSingleRefNonContainedElement()
@@ -1644,7 +1644,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainer
    * <em>Impl Multi Ref Non Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Impl Multi Ref Non Container</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainer
    * @generated
@@ -1654,7 +1654,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement
    * <em>Impl Multi Ref Non Contained Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Impl Multi Ref Non Contained Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement
    * @generated
@@ -1665,7 +1665,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement#getName()
    * @see #getImplMultiRefNonContainedElement()
@@ -1676,7 +1676,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainer
    * <em>Impl Multi Ref Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Impl Multi Ref Container</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainer
    * @generated
@@ -1686,7 +1686,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement
    * <em>Impl Multi Ref Contained Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Impl Multi Ref Contained Element</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement
    * @generated
@@ -1697,7 +1697,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement#getName()
    * @see #getImplMultiRefContainedElement()
@@ -1708,7 +1708,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainerNPL
    * <em>Impl Single Ref Container NPL</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Impl Single Ref Container NPL</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainerNPL
    * @generated
@@ -1718,7 +1718,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainerNPL
    * <em>Impl Single Ref Non Container NPL</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Impl Single Ref Non Container NPL</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainerNPL
    * @generated
@@ -1728,7 +1728,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainerNPL
    * <em>Impl Multi Ref Container NPL</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Impl Multi Ref Container NPL</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainerNPL
    * @generated
@@ -1738,7 +1738,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainerNPL
    * <em>Impl Multi Ref Non Container NPL</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Impl Multi Ref Non Container NPL</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainerNPL
    * @generated
@@ -1748,7 +1748,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplContainedElementNPL
    * <em>Impl Contained Element NPL</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Impl Contained Element NPL</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplContainedElementNPL
    * @generated
@@ -1758,7 +1758,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained
    * <em>Gen Ref Multi NU Non Contained</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Gen Ref Multi NU Non Contained</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained
    * @generated
@@ -1769,7 +1769,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained#getElements()
    * @see #getGenRefMultiNUNonContained()
@@ -1780,7 +1780,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained
    * <em>Gen Ref Map Non Contained</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>Gen Ref Map Non Contained</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained
    * @generated
@@ -1791,7 +1791,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * Returns the meta object for the map '
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the map '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained#getElements()
    * @see #getGenRefMapNonContained()
@@ -1802,7 +1802,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for class '{@link java.util.Map.Entry <em>String To EObject</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for class '<em>String To EObject</em>'.
    * @see java.util.Map.Entry
    * @model keyDataType="org.eclipse.emf.ecore.EString" valueType="org.eclipse.emf.ecore.EObject"
@@ -1814,7 +1814,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   *
+   * 
    * @return the meta object for the attribute '<em>Key</em>'.
    * @see java.util.Map.Entry
    * @see #getStringToEObject()
@@ -1825,7 +1825,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
   /**
    * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   *
+   * 
    * @return the meta object for the reference '<em>Value</em>'.
    * @see java.util.Map.Entry
    * @see #getStringToEObject()
@@ -1835,7 +1835,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
 
   /**
    * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -1850,7 +1850,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   interface Literals
@@ -1858,7 +1858,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl
      * <em>Ref Single Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleContained()
      * @generated
@@ -1868,7 +1868,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Element</b></em>' containment reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference REF_SINGLE_CONTAINED__ELEMENT = eINSTANCE.getRefSingleContained_Element();
@@ -1876,7 +1876,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl
      * <em>Single Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getSingleContainedElement()
      * @generated
@@ -1886,7 +1886,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute SINGLE_CONTAINED_ELEMENT__NAME = eINSTANCE.getSingleContainedElement_Name();
@@ -1894,7 +1894,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference SINGLE_CONTAINED_ELEMENT__PARENT = eINSTANCE.getSingleContainedElement_Parent();
@@ -1902,7 +1902,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl
      * <em>Ref Single Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleNonContained()
      * @generated
@@ -1912,7 +1912,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Element</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference REF_SINGLE_NON_CONTAINED__ELEMENT = eINSTANCE.getRefSingleNonContained_Element();
@@ -1921,7 +1921,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl
      * <em>Single Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getSingleNonContainedElement()
      * @generated
@@ -1931,7 +1931,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute SINGLE_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getSingleNonContainedElement_Name();
@@ -1939,7 +1939,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Parent</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference SINGLE_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getSingleNonContainedElement_Parent();
@@ -1947,7 +1947,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl
      * <em>Ref Multi Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiContained()
      * @generated
@@ -1957,7 +1957,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference REF_MULTI_CONTAINED__ELEMENTS = eINSTANCE.getRefMultiContained_Elements();
@@ -1965,7 +1965,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl
      * <em>Multi Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiContainedElement()
      * @generated
@@ -1975,7 +1975,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute MULTI_CONTAINED_ELEMENT__NAME = eINSTANCE.getMultiContainedElement_Name();
@@ -1983,7 +1983,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference MULTI_CONTAINED_ELEMENT__PARENT = eINSTANCE.getMultiContainedElement_Parent();
@@ -1991,7 +1991,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl
      * <em>Ref Multi Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContained()
      * @generated
@@ -2001,7 +2001,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference REF_MULTI_NON_CONTAINED__ELEMENTS = eINSTANCE.getRefMultiNonContained_Elements();
@@ -2010,7 +2010,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl
      * <em>Multi Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiNonContainedElement()
      * @generated
@@ -2020,7 +2020,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute MULTI_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getMultiNonContainedElement_Name();
@@ -2028,7 +2028,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Parent</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference MULTI_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getMultiNonContainedElement_Parent();
@@ -2037,7 +2037,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedUnsettableImpl
      * <em>Ref Multi Non Contained Unsettable</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedUnsettableImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContainedUnsettable()
      * @generated
@@ -2047,7 +2047,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS = eINSTANCE.getRefMultiNonContainedUnsettable_Elements();
@@ -2056,7 +2056,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedUnsettableElementImpl
      * <em>Multi Non Contained Unsettable Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedUnsettableElementImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiNonContainedUnsettableElement()
      * @generated
@@ -2066,7 +2066,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME = eINSTANCE.getMultiNonContainedUnsettableElement_Name();
@@ -2074,7 +2074,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Parent</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT = eINSTANCE
@@ -2083,7 +2083,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl
      * <em>Ref Single Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleContainedNPL()
      * @generated
@@ -2093,7 +2093,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Element</b></em>' containment reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference REF_SINGLE_CONTAINED_NPL__ELEMENT = eINSTANCE.getRefSingleContainedNPL_Element();
@@ -2102,7 +2102,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl
      * <em>Ref Single Non Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleNonContainedNPL()
      * @generated
@@ -2112,7 +2112,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Element</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference REF_SINGLE_NON_CONTAINED_NPL__ELEMENT = eINSTANCE.getRefSingleNonContainedNPL_Element();
@@ -2120,7 +2120,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl
      * <em>Ref Multi Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiContainedNPL()
      * @generated
@@ -2130,7 +2130,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference REF_MULTI_CONTAINED_NPL__ELEMENTS = eINSTANCE.getRefMultiContainedNPL_Elements();
@@ -2138,7 +2138,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl
      * <em>Ref Multi Non Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContainedNPL()
      * @generated
@@ -2148,7 +2148,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference REF_MULTI_NON_CONTAINED_NPL__ELEMENTS = eINSTANCE.getRefMultiNonContainedNPL_Elements();
@@ -2157,7 +2157,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl
      * <em>Contained Element No Opposite</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getContainedElementNoOpposite()
      * @generated
@@ -2167,7 +2167,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute CONTAINED_ELEMENT_NO_OPPOSITE__NAME = eINSTANCE.getContainedElementNoOpposite_Name();
@@ -2175,7 +2175,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl
      * <em>Gen Ref Single Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefSingleContained()
      * @generated
@@ -2185,7 +2185,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Element</b></em>' containment reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference GEN_REF_SINGLE_CONTAINED__ELEMENT = eINSTANCE.getGenRefSingleContained_Element();
@@ -2194,7 +2194,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl
      * <em>Gen Ref Single Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefSingleNonContained()
      * @generated
@@ -2204,7 +2204,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Element</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference GEN_REF_SINGLE_NON_CONTAINED__ELEMENT = eINSTANCE.getGenRefSingleNonContained_Element();
@@ -2212,7 +2212,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl
      * <em>Gen Ref Multi Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiContained()
      * @generated
@@ -2222,7 +2222,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference GEN_REF_MULTI_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiContained_Elements();
@@ -2230,7 +2230,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl
      * <em>Gen Ref Multi Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiNonContained()
      * @generated
@@ -2240,7 +2240,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference GEN_REF_MULTI_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiNonContained_Elements();
@@ -2248,7 +2248,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl
      * <em>Impl Single Ref Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainer()
      * @generated
@@ -2259,7 +2259,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl
      * <em>Impl Single Ref Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainedElement()
      * @generated
@@ -2269,7 +2269,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplSingleRefContainedElement_Name();
@@ -2278,7 +2278,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl
      * <em>Impl Single Ref Non Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainer()
      * @generated
@@ -2289,7 +2289,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl
      * <em>Impl Single Ref Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainedElement()
      * @generated
@@ -2299,7 +2299,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplSingleRefNonContainedElement_Name();
@@ -2308,7 +2308,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl
      * <em>Impl Multi Ref Non Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainer()
      * @generated
@@ -2319,7 +2319,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl
      * <em>Impl Multi Ref Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainedElement()
      * @generated
@@ -2329,7 +2329,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplMultiRefNonContainedElement_Name();
@@ -2337,7 +2337,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl
      * <em>Impl Multi Ref Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainer()
      * @generated
@@ -2348,7 +2348,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl
      * <em>Impl Multi Ref Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainedElement()
      * @generated
@@ -2358,7 +2358,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplMultiRefContainedElement_Name();
@@ -2367,7 +2367,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl
      * <em>Impl Single Ref Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainerNPL()
      * @generated
@@ -2378,7 +2378,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl
      * <em>Impl Single Ref Non Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainerNPL()
      * @generated
@@ -2389,7 +2389,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl
      * <em>Impl Multi Ref Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainerNPL()
      * @generated
@@ -2400,7 +2400,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl
      * <em>Impl Multi Ref Non Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainerNPL()
      * @generated
@@ -2410,7 +2410,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl
      * <em>Impl Contained Element NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplContainedElementNPL()
      * @generated
@@ -2421,7 +2421,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
      * The meta object literal for the '
      * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl
      * <em>Gen Ref Multi NU Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiNUNonContained()
      * @generated
@@ -2431,7 +2431,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference GEN_REF_MULTI_NU_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiNUNonContained_Elements();
@@ -2439,7 +2439,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl
      * <em>Gen Ref Map Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMapNonContained()
      * @generated
@@ -2449,7 +2449,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Elements</b></em>' map feature. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     *
+     * 
      * @generated
      */
     EReference GEN_REF_MAP_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMapNonContained_Elements();
@@ -2457,7 +2457,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl
      * <em>String To EObject</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl
      * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getStringToEObject()
      * @generated
@@ -2467,7 +2467,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EAttribute STRING_TO_EOBJECT__KEY = eINSTANCE.getStringToEObject_Key();
@@ -2475,7 +2475,7 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa
     /**
      * The meta object literal for the '<em><b>Value</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     EReference STRING_TO_EOBJECT__VALUE = eINSTANCE.getStringToEObject_Value();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4AdapterFactory.java
index b91ed79895..f612d40f5b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4AdapterFactory.java
@@ -70,7 +70,7 @@ import java.util.Map;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package
  * @generated
  */
@@ -78,14 +78,14 @@ public class model4AdapterFactory extends AdapterFactoryImpl
 {
   /**
    * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected static model4Package modelPackage;
 
   /**
    * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   public model4AdapterFactory()
@@ -100,7 +100,7 @@ public class model4AdapterFactory extends AdapterFactoryImpl
    * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   *
+   * 
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -120,7 +120,7 @@ public class model4AdapterFactory extends AdapterFactoryImpl
 
   /**
    * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @generated
    */
   protected model4Switch<Adapter> modelSwitch = new model4Switch<Adapter>()
@@ -428,7 +428,7 @@ public class model4AdapterFactory extends AdapterFactoryImpl
 
   /**
    * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
+   * 
    * @param target
    *          the object to adapt.
    * @return the adapter for the <code>target</code>.
@@ -445,7 +445,7 @@ public class model4AdapterFactory extends AdapterFactoryImpl
    * <em>Ref Single Contained</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.legacy.model4.RefSingleContained
    * @generated
@@ -460,7 +460,7 @@ public class model4AdapterFactory extends AdapterFactoryImpl
    * {@link org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement <em>Single Contained Element</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.legacy.model4.SingleContainedElement
    * @generated
@@ -475,7 +475,7 @@ public class model4AdapterFactory extends AdapterFact
author	Eike Stepper	2010-02-03 10:38:13 +0000
committer	Eike Stepper	2010-02-03 10:38:13 +0000
commit	e05a518bfbe46e89accea237f1704892e7e5d66c (patch)
tree	2e68d3279c911227dca6394a974cff6dec77c805
parent	da0577de6aa1c8829e8da7d59a5875cfb076b30c (diff)
download	cdo-e05a518bfbe46e89accea237f1704892e7e5d66c.tar.gz cdo-e05a518bfbe46e89accea237f1704892e7e5d66c.tar.xz cdo-e05a518bfbe46e89accea237f1704892e7e5d66c.zip